X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fmarketing.inc.php;h=d3148317a7e5704aee17dad79de3b1c1b6c2554e;hb=6d1125dfec33e5e827cb1643fc38459488619af2;hp=18f02a6388a82edc0dcbc83696eb1b184661e260;hpb=93d42b4fcc6f055a428c9b63e386ac62c918d08a;p=platal.git

diff --git a/include/marketing.inc.php b/include/marketing.inc.php
index 18f02a6..d314831 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-2014 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->hruid . "@" . $user->mainEmailDomain(),
+            'forlife_email2' => $user->hruid . "@" . $user->alternateEmailDomain()
         );
     }
 
@@ -77,7 +77,7 @@ class Marketing
         global $globals;
 
         if ($from == 'staff' || !($user = User::getSilent($sender))) {
-            return '"L\'équipe de Polytechnique.org" <register@' . $globals->mail->domain . '>';
+            return "\"L'équipe de Polytechnique.org\" <register@" . $globals->mail->domain . '>';
         }
         return '"' . $user->fullName() . '" <' . $user->bestEmail() . '>';
     }
@@ -116,7 +116,7 @@ class Marketing
         }
         $sender = substr($this->sender_mail, 1, strpos($this->sender_mail, '"', 2)-1);
         $text = str_replace(array('%%hash%%', '%%sender%%', '%%personal_notes%%'),
-                            array($this->hash, $this->sender_mail, ''), $text);
+                            array($this->hash, "Cordialement,\n-- \n" . $this->sender_mail, ''), $text);
         $mailer = new PlMailer();
         $mailer->setFrom($this->sender_mail);
         $mailer->addTo($this->user['mail']);
@@ -135,8 +135,8 @@ class Marketing
                     $this->type, $this->data, $this->personal_notes);
         $this->engine->process($this->user);
         if ($valid) {
-            require_once 'validations.inc.php';
-            $valid = new MarkReq(User::getSilent($this->sender), $this->user['user'], $this->user['mail'],
+            $sender = User::getSilent($this->sender);
+            $valid = new MarkReq($sender, $this->user['user'], $this->user['mail'],
                                  $this->from == 'user', $this->type, $this->data, $this->personal_notes);
             $valid->submit();
         }
@@ -173,7 +173,7 @@ class Marketing
         if ($res->numRows() == 0) {
             return null;
         }
-        list ($uid, $email, $type, $data, $from, $senderi, $personal_notes) = $res->fetchOneRow();
+        list ($uid, $email, $type, $data, $from, $sender, $personal_notes) = $res->fetchOneRow();
         return new Marketing($uid, $email, $type, $data, $from, $sender, $personal_notes);
     }
 
@@ -186,18 +186,12 @@ class Marketing
         }
     }
 
-    static public function getAliveUsersCount()
-    {
-        $uf = new UserFilter(new PFC_Not(new UFC_Dead()));
-        return $uf->getTotalCount();
-    }
-
-    static public function relance(PlUser &$user, $nbx = -1)
+    static public function relance(PlUser $user, $nbx = -1)
     {
         global $globals;
 
         if ($nbx < 0) {
-            $nbx = self::getAliveUsersCount();
+            $nbx = $globals->core->NbIns;
         }
 
         $res = XDB::fetchOneCell('SELECT  r.date, r.email, r.bestalias
@@ -223,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()
@@ -254,10 +248,12 @@ class AnnuaireMarketing implements MarketingEngine
                      . "Pour y figurer, il te suffit de visiter cette page ou de copier cette adresse "
                      . "dans la barre de ton navigateur :";
         if ($from === null) {
-            $this->signature = "L'équipe de Polytechnique.org,\n"
-                             . "Le portail des élèves & anciens élèves de l'École polytechnique";
+            $page = new XorgPage();
+            $page->changeTpl('include/signature.mail.tpl', NO_SKIN);
+            $page->assign('mail_part', 'text');
+            $this->signature = $page->raw();
         } else {
-            $this->signature = "%%sender%%";
+            $this->signature = '%%sender%%';
         }
         if (is_null($personal_notes) || $personal_notes == '') {
             $this->personal_notes = '%%personal_notes%%';
@@ -286,12 +282,11 @@ 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);
         $page->assign('sign', $this->getSignature());
-        $page->assign('num_users', Marketing::getAliveUsersCount());
         $page->assign('personal_notes', $this->getPersonalNotes());
     }
 
@@ -334,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);
     }
 }
 
@@ -364,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);
     }
 }
 
@@ -375,5 +370,5 @@ class DefaultMarketing extends AnnuaireMarketing
 {
 }
 
-// vim:set et sw=4 sts=4 sws=4 enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 fenc=utf-8:
 ?>