X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fmarketing.inc.php;h=e91b730054aee1d07747321aeb5c4bdede36f6e9;hb=30e6bbe345c7eafc85a7896ad82c15b88aa6ddec;hp=18a3fe999f71db8926b76d03a5d08b265e4a51fe;hpb=1c4a1d0a32c52851e9ffbbf585bb206c9a472dc9;p=platal.git

diff --git a/include/marketing.inc.php b/include/marketing.inc.php
index 18a3fe9..e91b730 100644
--- a/include/marketing.inc.php
+++ b/include/marketing.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -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);
@@ -329,9 +329,9 @@ class ListMarketing extends AnnuaireMarketing
 
     public function process(array $user)
     {
-        return XDB::execute("REPLACE INTO  register_subs (uid, type, sub, domain)
-            VALUES  ({?}, 'list', {?}, {?})",
-                $user['id'], $this->name, $this->domain);
+        return XDB::execute("INSERT IGNORE INTO  register_subs (uid, type, sub, domain)
+                                         VALUES  ({?}, 'list', {?}, {?})",
+                            $user['id'], $this->name, $this->domain);
     }
 }
 
@@ -359,9 +359,9 @@ class GroupMarketing extends AnnuaireMarketing
 
     public function process(array $user)
     {
-        return XDB::execute("REPLACE INTO  register_subs (uid, type, sub, domain)
-            VALUES  ({?}, 'group', {?}, '')",
-                $user['id'], $this->group);
+        return XDB::execute("INSERT IGNORE INTO  register_subs (uid, type, sub, domain)
+                                         VALUES  ({?}, 'group', {?}, '')",
+                            $user['id'], $this->group);
     }
 }