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

Fix: ne sert que pour windows

Browse Source
This commit is contained in:
Regis Houssin 2007-06-06 15:38:33 +00:00
parent 71430a3d25
commit d6b3e8675d
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,9 +178,12 @@ class CMailFile
if (! $conf->global->MAIN_DISABLE_ALL_MAILS) if (! $conf->global->MAIN_DISABLE_ALL_MAILS)
{ {
if ($conf->global->MAIN_MAIL_SMTP_SERVER) ini_set('SMTP',$conf->global->MAIN_MAIL_SMTP_SERVER); if (isset($_SERVER["WINDIR"]))
if ($conf->global->MAIN_MAIL_SMTP_PORT) ini_set('smtp_port',$conf->global->MAIN_MAIL_SMTP_PORT); {
if (!ini_get('sendmail_from') && $this->addr_from) ini_set('sendmail_from',getValidAddress($this->addr_from,2)); if ($conf->global->MAIN_MAIL_SMTP_SERVER) ini_set('SMTP',$conf->global->MAIN_MAIL_SMTP_SERVER);
if ($conf->global->MAIN_MAIL_SMTP_PORT) ini_set('smtp_port',$conf->global->MAIN_MAIL_SMTP_PORT);
if ($this->addr_from) ini_set('sendmail_from',getValidAddress($this->addr_from,2));
}
$dest=getValidAddress($this->addr_to,2); $dest=getValidAddress($this->addr_to,2);
if (! $dest) if (! $dest)
@ -212,9 +215,12 @@ class CMailFile
dolibarr_syslog("CMailFile::sendfile: mail end success"); dolibarr_syslog("CMailFile::sendfile: mail end success");
} }
} }
if ($conf->global->MAIN_MAIL_SMTP_SERVER) ini_restore('SMTP'); if (isset($_SERVER["WINDIR"]))
if ($conf->global->MAIN_MAIL_SMTP_PORT) ini_restore('smtp_port'); {
ini_restore('sendmail_from'); if ($conf->global->MAIN_MAIL_SMTP_SERVER) ini_restore('SMTP');
if ($conf->global->MAIN_MAIL_SMTP_PORT) ini_restore('smtp_port');
ini_restore('sendmail_from');
}
} }
else else
{ {