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:18:00 +01:00
parent 58edc06ac3
commit d2adec01b0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -427,18 +427,18 @@ class SMTPs
if ($usetls) $host='tls://'.$host; if ($usetls) $host='tls://'.$host;
$hostehlo = $host; $hosth = $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'
$hostehlo = $this->getFrom('addr'); $hosth = $this->getFrom('addr');
$hostehlo = preg_replace('/^.*</', '', $host); $hosth = preg_replace('/^.*</', '', $hosth);
$hostehlo = preg_replace('/>.*$/', '', $host); $hosth = preg_replace('/>.*$/', '', $hosth);
$hostehlo = preg_replace('/.*@/', '', $host); $hosth = preg_replace('/.*@/', '', $hosth);
} }
if ( $_retVal = $this->socket_send_str('EHLO ' . $hostehlo, '250') ) if ( $_retVal = $this->socket_send_str('EHLO ' . $hosth, '250') )
{ {
if ($usetls) if ($usetls)
{ {
@ -551,18 +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; $hosth = $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'
$hosthelo = $this->getFrom('addr'); $hosth = $this->getFrom('addr');
$hosthelo = preg_replace('/^.*</', '', $host); $hosth = preg_replace('/^.*</', '', $hosth);
$hosthelo = preg_replace('/>.*$/', '', $host); $hosth = preg_replace('/>.*$/', '', $hosth);
$hosthelo = preg_replace('/.*@/', '', $host); $hosth = preg_replace('/.*@/', '', $hosth);
} }
$_retVal = $this->socket_send_str('HELO ' . $hosthelo, '250'); $_retVal = $this->socket_send_str('HELO ' . $hosth, '250');
} }
// Well, did we get to the server? // Well, did we get to the server?