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

Fix: Send mail with some SMTP agent

Browse Source
This commit is contained in:
Laurent Destailleur 2010-07-18 11:47:55 +00:00
parent ec4a30897c
commit 8da6fee65c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/lib/CMailFile.class.php
View File

@ -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
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)
{ {