Skip to content
Snippets Groups Projects
Commit 8da6fee6 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: Send mail with some SMTP agent

parent ec4a3089
No related branches found
No related tags found
No related merge requests found
...@@ -334,7 +334,7 @@ class CMailFile ...@@ -334,7 +334,7 @@ class CMailFile
{ {
dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG); dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'), LOG_DEBUG);
$bounce = ''; $bounce = ''; // By default
if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F) if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)
{ {
// le return-path dans les header ne fonctionne pas avec tous les MTA // le return-path dans les header ne fonctionne pas avec tous les MTA
...@@ -347,7 +347,8 @@ class CMailFile ...@@ -347,7 +347,8 @@ class CMailFile
if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail(); if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
$res = mail($dest,$this->encodetorfc2822($this->subject),$this->message,$this->headers, $bounce); if (! empty($bounce)) $res = mail($dest,$this->encodetorfc2822($this->subject),$this->message,$this->headers, $bounce);
else $res = mail($dest,$this->encodetorfc2822($this->subject),$this->message,$this->headers);
if (! $res) if (! $res)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment