Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice

Browse Source
This commit is contained in:
Laurent Destailleur
2017-12-03 20:08:53 +01:00
parent 9b5f7099f7
commit b41213f9a1
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -512,6 +512,8 @@ class SMTPs
*/ */
function sendMsg($_bolTestMsg = false, $_bolDebug = false) function sendMsg($_bolTestMsg = false, $_bolDebug = false)
{ {
global $conf;
/** /**
* Default return value * Default return value
*/ */
@@ -538,6 +540,15 @@ class SMTPs
$host=preg_replace('@ssl://@i','',$host); // Remove prefix $host=preg_replace('@ssl://@i','',$host); // Remove prefix
$host=preg_replace('@tls://@i','',$host); // Remove prefix $host=preg_replace('@tls://@i','',$host); // Remove prefix
if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
{
// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
$host = $this->getFrom('addr');
$host = preg_replace('/^.*</', '', $host);
$host = preg_replace('/>.*$/', '', $host);
$host = preg_replace('/.*@/', '', $host);
}
$_retVal = $this->socket_send_str('HELO ' . $host, '250'); $_retVal = $this->socket_send_str('HELO ' . $host, '250');
} }