backport

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.4--patch-17
   make falco happy : [NewsLetter] retpath ---> setting for return path

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-430

diff --git a/hooks/newsletter.inc.php b/hooks/newsletter.inc.php
index 0d9e1b4..b39ca76 100644 (file)
--- a/hooks/newsletter.inc.php
+++ b/hooks/newsletter.inc.php
@@ -27,6 +27,7 @@ class NLConfig
 {
     var $from    = "Lettre Mensuelle <null@example.org>";
     var $replyto = "";
+    var $retpath = "";
 }
 
 // }}}

diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php
index 57f9a00..63e0b2e 100644 (file)
--- a/include/newsletter.inc.php
+++ b/include/newsletter.inc.php
@@ -326,6 +326,9 @@ EOF;
         if (!empty($globals->newsletter->replyto)) {
             $mailer->addHeader('Reply-To',$globals->newsletter->replyto);
         }
+        if (!empty($globals->newsletter->retpath)) {
+            $mailer->addHeader('Return-Path',$globals->newsletter->retpath);
+        }
        $mailer->setTxtBody($this->toText($prenom,$nom,$sex));
        if ($html) {
            $mailer->setHTMLBody($this->toHtml($prenom,$nom,$sex,true));