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

FIX Error in log for email sending with smtps was not complete

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-23 17:30:05 +01:00
parent b513ad90eb
commit 7ee37ddd3f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/smtps.class.php
View File

@ -506,9 +506,10 @@ class SMTPs
// The error here just means the ID/password combo doesn't work. // The error here just means the ID/password combo doesn't work.
// There is not a method to determine which is the problem, ID or password // There is not a method to determine which is the problem, ID or password
if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') ) if (! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') ) {
$this->_setErr(130, 'Invalid Authentication Credentials.'); $this->_setErr(130, 'Invalid Authentication Credentials.');
} }
}
else else
{ {
$this->_setErr(126, '"' . $host . '" does not support authenticated connections.'); $this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
@ -575,7 +576,11 @@ class SMTPs
// From this point onward most server response codes should be 250 // From this point onward most server response codes should be 250
// Specify who the mail is from.... // Specify who the mail is from....
// This has to be the raw email address, strip the "name" off // This has to be the raw email address, strip the "name" off
$this->socket_send_str('MAIL FROM: ' . $this->getFrom('addr'), '250'); $resultmailfrom = $this->socket_send_str('MAIL FROM: ' . $this->getFrom('addr'), '250');
if (! $resultmailfrom) {
fclose($this->socket);
return false;
}
// 'RCPT TO:' must be given a single address, so this has to loop // 'RCPT TO:' must be given a single address, so this has to loop
// through the list of addresses, regardless of TO, CC or BCC // through the list of addresses, regardless of TO, CC or BCC
@ -1786,6 +1791,7 @@ class SMTPs
$_retVal = false; $_retVal = false;
break; break;
} }
$this->log .= $server_response;
$limit++; $limit++;
} }