X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fmarketing.php;h=e6d3affc1394d12d677733ed868b32f36d4d67e9;hb=911075226546c6b058eca1e0b889097f79fa6232;hp=822b7aecba6ee45318a63377f6d8a5c31c7f5055;hpb=6bc4c6ef44c78ac6b9520ac1a8d9d4720a3828e2;p=platal.git

diff --git a/modules/marketing.php b/modules/marketing.php
index 822b7ae..e6d3aff 100644
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -261,8 +261,9 @@ class MarketingModule extends PLModule
         $page->assign('promo', $promo);
 
         $uf = new UserFilter(new PFC_And(new UFC_Promo('=', UserFilter::DISPLAY, $promo),
-                                            new PFC_Not(new UFC_Registered())),
-                                array(new UFO_Name(Profile::LASTNAME), new UFO_Name(Profile::FIRSTNAME)));
+                                         new PFC_Not(new UFC_Registered()),
+                                         new PFC_Not(new UFC_Dead())),
+                             array(new UFO_Name(Profile::LASTNAME), new UFO_Name(Profile::FIRSTNAME)));
         $users = $uf->getUsers();
         $page->assign('nonins', $users);
     }
@@ -315,8 +316,8 @@ class MarketingModule extends PLModule
             $market = new AnnuaireMarketing(null, true);
             $text = $market->getText(array(
                 'sexe'           => $user->isFemale(),
-                'forlife_email'  => $user->login() . '@' . $globals->mail->domain,
-                'forlife_email2' => $user->login() . '@' . $globals->mail->domain2
+                'forlife_email'  => $user->forlifeEmail(),
+                'forlife_email2' => $user->forlifeEmailAlternate()
             ));
             $text = str_replace('%%hash%%', '', $text);
             $text = str_replace('%%personal_notes%%', '<em id="personal_notes_display"></em>', $text);