From d6b3e8675dc07995417cec8a9976bd12b5949208 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 6 Jun 2007 15:38:33 +0000 Subject: [PATCH] Fix: ne sert que pour windows --- htdocs/lib/CMailFile.class.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 3b7681404d0..4383973b5d8 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -178,9 +178,12 @@ class CMailFile if (! $conf->global->MAIN_DISABLE_ALL_MAILS) { - 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 (!ini_get('sendmail_from') && $this->addr_from) ini_set('sendmail_from',getValidAddress($this->addr_from,2)); + if (isset($_SERVER["WINDIR"])) + { + 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); if (! $dest) @@ -212,9 +215,12 @@ class CMailFile dolibarr_syslog("CMailFile::sendfile: mail end success"); } } - 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'); + if (isset($_SERVER["WINDIR"])) + { + 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 {