X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fmassmailer.inc.php;h=19996fe4befd2ba660f7a288165fe00f184160c4;hb=26d21e6866e122512c79c15e1d6851455d162c5b;hp=8b01b50bfc7a07d923ce0069c779d545f19b8df1;hpb=e0e77c5a55e92d873accf3fe735042eb8b088e34;p=platal.git

diff --git a/include/massmailer.inc.php b/include/massmailer.inc.php
index 8b01b50..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"));