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

Better error management for SMTPS sending method

Browse Source
This commit is contained in:
Laurent Destailleur 2021-04-17 13:53:52 +02:00
parent c929c05dc5
commit 4abf7d1c91
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -533,6 +533,10 @@ class SMTPs
// Send Authentication to Server // Send Authentication to Server
// Check for errors along the way // Check for errors along the way
switch ($conf->global->MAIL_SMTP_AUTH_TYPE) { switch ($conf->global->MAIL_SMTP_AUTH_TYPE) {
case 'NONE':
// Do not send the 'AUTH type' message. For test purpose, if you don't need authentication, it is better to not enter login/pass into setup.
$_retVal = true;
break;
case 'PLAIN': case 'PLAIN':
$this->socket_send_str('AUTH PLAIN', '334'); $this->socket_send_str('AUTH PLAIN', '334');
// The error here just means the ID/password combo doesn't work. // The error here just means the ID/password combo doesn't work.
@ -540,12 +544,16 @@ class SMTPs
break; break;
case 'LOGIN': // most common case case 'LOGIN': // most common case
default: default:
$this->socket_send_str('AUTH LOGIN', '334'); $_retVal = $this->socket_send_str('AUTH LOGIN', '334');
if (!$_retVal) {
$this->_setErr(130, 'Error when asking for AUTH LOGIN');
} else {
// User name will not return any error, server will take anything we give it. // User name will not return any error, server will take anything we give it.
$this->socket_send_str(base64_encode($this->_smtpsID), '334'); $this->socket_send_str(base64_encode($this->_smtpsID), '334');
// 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
$_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235'); $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235');
}
break; break;
} }
if (!$_retVal) { if (!$_retVal) {