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

Fix: add Return-Path for simplemail class for used the "error" mail or "form" mail to avoid feedback at www-data

Browse Source
This commit is contained in:
Regis Houssin 2009-09-23 17:48:43 +00:00
parent d69fc467b4
commit 36a09aef35
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/includes/simplemail/class.mail.php
View File

@ -339,8 +339,17 @@ class simplemail {
} }
foreach ($this->recipientlist as $key => $to) foreach ($this->recipientlist as $key => $to)
{ {
$bounce = '';
if ($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)
{
// DOLCHANGE LDR
// le return-path dans les header ne fonctionne pas avec tous les MTA
// Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
// La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse)
$bounce = $this->returnpath != '' ? "-f {$this->returnpath}" : "";
}
// $this->recipient = $to['mail']; DOLCHANGE LDR Fix the To in header was not filled // $this->recipient = $to['mail']; DOLCHANGE LDR Fix the To in header was not filled
if ( mail($to['mail'], $this->subject, $this->body, $this->makeheader() ) ) { if ( mail($to['mail'], $this->subject, $this->body, $this->makeheader() , $bounce ) ) {
$this->error_log("envoie vers {$to['nameplusmail']} reussi"); $this->error_log("envoie vers {$to['nameplusmail']} reussi");
} else { } else {
$this->error_log("envoie vers {$to['nameplusmail']} echoue"); $this->error_log("envoie vers {$to['nameplusmail']} echoue");