X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fmassmailer.inc.php;h=19996fe4befd2ba660f7a288165fe00f184160c4;hb=08d7cc452e666835373023f2ca8416e75e2cb9c5;hp=93f661d6bf1e4b1e2f6f9ab457d8b0becf9b53bd;hpb=39337e2d8e5357597a6e14a5e0ba91521f1e2c21;p=platal.git

diff --git a/include/massmailer.inc.php b/include/massmailer.inc.php
index 93f661d..19996fe 100644
--- a/include/massmailer.inc.php
+++ b/include/massmailer.inc.php
@@ -164,9 +164,13 @@ abstract class MassMailer
         global $globals;
         $alias = $login;
         if (strpos($login, '@') === false) {
-            $alias = $login;
             $login = "$login@{$globals->mail->domain}";
         }
+        require_once('user.func.inc.php');
+        $forlife = get_user_forlife($login, '_silent_user_callback');
+        if ($forlife) {
+            $alias = $forlife;
+        }
         if (strpos($alias, '@') === false && (is_null($hash) || $hash == 0)) {
 
             $hash = $this->createHash(array($prenom, $nom, $login, $sexe, $html, rand(), "X.org rulez"));
@@ -185,6 +189,8 @@ abstract class MassMailer
         $mailer->assign('sexe',    $sexe);
         $mailer->assign('prefix',  null);
         $mailer->assign('hash',    $hash);
+        $mailer->assign('email',   $login);
+        $mailer->assign('alias',   $alias);
         $mailer->addTo("\"$prenom $nom\" <$login>");
         $mailer->send($html);
     }