lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression in sending emails

Browse Source
This commit is contained in:
Laurent Destailleur 2020-08-07 17:06:12 +02:00
parent e69616110d
commit bd5c4603e3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/CMailFile.class.php
View File

@ -357,7 +357,7 @@ class CMailFile
$smtps->setSubject($subjecttouse); $smtps->setSubject($subjecttouse);
$smtps->setTO($this->getValidAddress($this->to, 0, 1)); $smtps->setTO($this->getValidAddress($this->to, 0, 1));
$smtps->setFrom($this->getValidAddress($this->from, 0, 1)); $smtps->setFrom($this->getValidAddress($this->addr_from, 0, 1));
$smtps->setTrackId($this->trackid); $smtps->setTrackId($this->trackid);
$smtps->setReplyTo($this->getValidAddress($this->replyto, 0, 1)); $smtps->setReplyTo($this->getValidAddress($this->replyto, 0, 1));
@ -781,14 +781,14 @@ class CMailFile
$from = $this->smtps->getFrom('org'); $from = $this->smtps->getFrom('org');
if ($res && !$from) if ($res && !$from)
{ {
$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid"; $this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport." - Sender address '$from' invalid";
dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR); dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
$res = false; $res = false;
} }
$dest = $this->smtps->getTo(); $dest = $this->smtps->getTo();
if ($res && !$dest) if ($res && !$dest)
{ {
$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid"; $this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport." - Recipient address '$dest' invalid";
dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR); dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
$res = false; $res = false;
} }
@ -811,7 +811,7 @@ class CMailFile
else else
{ {
if (empty($this->error)) $this->error = $result; if (empty($this->error)) $this->error = $result;
dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>".$this->error, LOG_ERR); dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport." - ".$this->error, LOG_ERR);
$res = false; $res = false;
} }
} }