Fix: sous windows lorsqu'on dfinissait la constante MAIN_MAIL_SMTP_SERVER le mail ne partait pas car la variable php "sendmail_from" n'tait pas dfinie

This commit is contained in:
Regis Houssin
2007-06-06 14:53:31 +00:00
parent 5198eac7fd
commit 71430a3d25

View File

@@ -180,6 +180,7 @@ class CMailFile
{ {
if ($conf->global->MAIN_MAIL_SMTP_SERVER) ini_set('SMTP',$conf->global->MAIN_MAIL_SMTP_SERVER); 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 ($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));
$dest=getValidAddress($this->addr_to,2); $dest=getValidAddress($this->addr_to,2);
if (! $dest) if (! $dest)
@@ -213,6 +214,7 @@ class CMailFile
} }
if ($conf->global->MAIN_MAIL_SMTP_SERVER) ini_restore('SMTP'); if ($conf->global->MAIN_MAIL_SMTP_SERVER) ini_restore('SMTP');
if ($conf->global->MAIN_MAIL_SMTP_PORT) ini_restore('smtp_port'); if ($conf->global->MAIN_MAIL_SMTP_PORT) ini_restore('smtp_port');
ini_restore('sendmail_from');
} }
else else
{ {