Add a default identity when using banana to send a message on a ML

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1338 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/classes/plmailer.php b/classes/plmailer.php
index 29d9ca9..dd5f81d 100644 (file)
--- a/classes/plmailer.php
+++ b/classes/plmailer.php
@@ -254,7 +254,8 @@ class PlMailer extends Mail_Mime {
     {
         $this->processPage($with_html);
         if (S::v('forlife')) {
-            $this->addHeader('X-Org-Mail', S::v('forlife') . '@polytechnique.org');
+            global $globals;
+            $this->addHeader('X-Org-Mail', S::v('forlife') . '@' . $globals->mail->domain);
         }
         $addrs = Array();
         foreach(Array('To', 'Cc', 'Bcc') as $hdr) {

diff --git a/include/banana/ml.inc.php b/include/banana/ml.inc.php
index 1c0e068..99f77a5 100644 (file)
--- a/include/banana/ml.inc.php
+++ b/include/banana/ml.inc.php
@@ -39,7 +39,7 @@ class MLBanana extends Banana
         Banana::$spool_boxlist = false;
         Banana::$msgedit_canattach = true;
         array_push(Banana::$msgparse_headers, 'x-org-id', 'x-org-mail');
-        
+         
         MLBanana::$listname = $params['listname'];
         MLBanana::$domain   = $params['domain'];
         $params['group'] = $params['listname'] . '@' . $params['domain'];
@@ -50,6 +50,17 @@ class MLBanana extends Banana
     {
         global $platal, $globals;
 
+        $nom  = S::v('prenom') . ' ' . S::v('nom');
+        $mail = S::v('bestalias') . '@' . $globals->mail->domain;
+        $sig  = $nom . ' (' . S::v('promo') . ')';
+        Banana::$msgedit_headers['X-Org-Mail'] = S::v('forlife') . '@' . $globals->mail->domain;
+
+        // Build user profile
+        Banana::$profile['headers']['From']         = utf8_encode("$nom <$mail>");
+        Banana::$profile['headers']['Organization'] = 'Utilisateur de Polytechnique.org';
+        Banana::$profile['signature']               = utf8_encode($sig);
+        
+        // Page design
         Banana::$page->killPage('forums');
         Banana::$page->killPage('subscribe');