lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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:15:04 +01:00
parent b41213f9a1
commit 58edc06ac3
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -427,7 +427,18 @@ class SMTPs
if ($usetls) $host='tls://'.$host; if ($usetls) $host='tls://'.$host;
if ( $_retVal = $this->socket_send_str('EHLO ' . $host, '250') ) $hostehlo = $host;
if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
{
// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
$hostehlo = $this->getFrom('addr');
$hostehlo = preg_replace('/^.*</', '', $host);
$hostehlo = preg_replace('/>.*$/', '', $host);
$hostehlo = preg_replace('/.*@/', '', $host);
}
if ( $_retVal = $this->socket_send_str('EHLO ' . $hostehlo, '250') )
{ {
if ($usetls) if ($usetls)
{ {
@ -540,16 +551,18 @@ 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
$hosthelo = $host;
if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
{ {
// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com' // If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
$host = $this->getFrom('addr'); $hosthelo = $this->getFrom('addr');
$host = preg_replace('/^.*</', '', $host); $hosthelo = preg_replace('/^.*</', '', $host);
$host = preg_replace('/>.*$/', '', $host); $hosthelo = preg_replace('/>.*$/', '', $host);
$host = preg_replace('/.*@/', '', $host); $hosthelo = preg_replace('/.*@/', '', $host);
} }
$_retVal = $this->socket_send_str('HELO ' . $host, '250'); $_retVal = $this->socket_send_str('HELO ' . $hosthelo, '250');
} }
// Well, did we get to the server? // Well, did we get to the server?