admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

C0ML: parameter email server, improve check for sendmail

Browse source
This commit is contained in:
sparkyx 2026-05-08 12:04:24 +02:00
parent f406064cdb
commit c6a34abb3e
5 changed files with 90 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

33
include/lib/mail_parameter.class.php
View file

@ -137,6 +137,31 @@ class Mail_Parameter
*/
function save()
{
if ( $this->smtp_replyto!="" && filter_var($this->smtp_replyto, FILTER_VALIDATE_EMAIL) == false)
{
throw new \Exception (_("adresse réponse invalide"),140); ;
}
if ( $this->smtp_from!="" && filter_var($this->smtp_from, FILTER_VALIDATE_EMAIL) == false)
{
throw new \Exception (_("adresse expéditeur invalide"),146);
}
if ( $this->smtp_type=="sendmail" && defined("ALLOWED_EMAIL_DOMAIN"))
{
$a_allowed=explode(",", ALLOWED_EMAIL_DOMAIN);
if ($this->smtp_replyto !="" ) {
list($m,$domain)=explode("@",$this->smtp_replyto);
if (!in_array($domain, $a_allowed)) {
throw new \Exception (_("adresse réponse invalide"),153);
}
}
if ($this->smtp_from !="" ) {
list($m,$domain)=explode("@",$this->smtp_from);
if (!in_array($domain, $a_allowed)) {
throw new \Exception (_("adresse expéditeur invalide"),160);
}
}
}
foreach (self::PARAMETER as $key)
{
$id = $this->cn->get_value("select pe_id from parm_mail_server
@ -235,13 +260,17 @@ class Mail_Parameter
$this->smtp_auth=1;
}
public static function Factory(\Database $cnx,$reply_to="", $blind_copy="")
public static function Factory(\Database $cnx,$reply_to="", $blind_copy="",$mail_setting=MAIL_SETTING_NOALYSS)
{
$mail_parameter=new Mail_Parameter($cnx,MAIL_SETTING_NOALYSS);
if ( $mail_parameter->smtp_type=="sendmail") {
return new \Sendmail($mail_parameter->smtp_replyto,$mail_parameter->smtp_replyto);
$mail=new \Sendmail();
$mail->setReplyTo($reply_to)->setBlindCopy($blind_copy);
return $mail;
} elseif ($mail_parameter->smtp_type=="smtp") {
$phpmail= new SMTPMail($mail_parameter);
$phpmail->setReplyTo($reply_to)->setBlindCopy($blind_copy);
return $phpmail;
}

35
include/lib/sendmail_core.class.php
View file

@ -74,7 +74,40 @@ class Sendmail_Core
$this->afile=[];
}
public function getSupplemental_param()
public function getMailto()
{
return $this->mailto;
}
public function getBlindCopy()
{
return $this->blind_copy;
}
public function getReplyTo()
{
return $this->reply_to;
}
public function setMailto($mailto)
{
$this->mailto = $mailto;
return $this;
}
public function setBlindCopy($blind_copy)
{
$this->blind_copy = $blind_copy;
return $this;
}
public function setReplyTo($reply_to)
{
$this->reply_to = $reply_to;
return $this;
}
public function getSupplemental_param()
{
return $this->supplemental_param;
}