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

FIX Use of office365 TLS with SMTPs method.

Browse Source 
Conflicts:
	htdocs/core/class/smtps.class.php
This commit is contained in:
Laurent Destailleur 2020-07-01 17:00:52 +02:00
parent 1194c61857
commit d3c23428d5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,7 +428,7 @@ 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 ($usetls) $host='tls://'.$host; if ($usetls && ! empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;
$hosth = $host; $hosth = $host;
@ -555,6 +555,8 @@ 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 ($usetls && ! empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;
$hosth = $host; $hosth = $host;
if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))