X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fmarketing.inc.php;h=e91b730054aee1d07747321aeb5c4bdede36f6e9;hb=9f3f87bc8e2fc21c6b160f0db67bfd1b52d40007;hp=994349995748e1ae7c4e3653a4845a7053ac82e9;hpb=a1c554a92888e0b017ba362817a67cc2849a9154;p=platal.git

diff --git a/include/marketing.inc.php b/include/marketing.inc.php
index 9943499..e91b730 100644
--- a/include/marketing.inc.php
+++ b/include/marketing.inc.php
@@ -67,8 +67,8 @@ class Marketing
             'sexe'           => $user->isFemale(),
             'mail'           => $email,
             'to'             => '"' . $user->fullName() . '" <' . $email . '>',
-            'forlife_email'  => $user->login() . '@' . $globals->mail->domain,
-            'forlife_email2' => $user->login() . '@' . $globals->mail->domain2,
+            'forlife_email'  => $user->forlifeEmail(),
+            'forlife_email2' => $user->forlifeEmailAlternate()
         );
     }
 
@@ -186,7 +186,7 @@ class Marketing
         }
     }
 
-    static public function relance(PlUser &$user, $nbx = -1)
+    static public function relance(PlUser $user, $nbx = -1)
     {
         global $globals;
 
@@ -217,7 +217,7 @@ class Marketing
         $mymail->assign('baseurl',    $globals->baseurl);
         $mymail->assign('lins_id',    $hash);
         $mymail->assign('lemail',     $email);
-        $mymail->assign('subj',       $alias.'@'.$globals->mail->domain);
+        $mymail->assign('subj',       ucfirst($globals->mail->domain) . ' : ' . $alias);
         $mymail->send();
         XDB::execute('UPDATE  register_pending
                          SET  hash={?}, password={?}, relance=NOW()
@@ -282,7 +282,7 @@ class AnnuaireMarketing implements MarketingEngine
         return $this->personal_notes;
     }
 
-    protected function prepareText(PlPage &$page, array $user)
+    protected function prepareText(PlPage $page, array $user)
     {
         $page->assign('intro', $this->getIntro());
         $page->assign('u', $user);