X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fmarketing.inc.php;h=f397ad0780c3af6b945f16c20535dcd9061ee769;hb=b8971a3ed64f3ba69becf1cd8f3b32ee2292026d;hp=699fb541250a78aaa1eca06cb6e57cada3f5b6fd;hpb=24490a67bad1c8975d26ab2e6e0b94be49007a1c;p=platal.git

diff --git a/include/marketing.inc.php b/include/marketing.inc.php
index 699fb54..f397ad0 100644
--- a/include/marketing.inc.php
+++ b/include/marketing.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -48,18 +48,17 @@ class Marketing
         $this->type   = $type;
         $this->data   = $data;
         $this->from   = $from;
-        $this->sender = $sender; 
+        $this->sender = $sender;
     }
 
     private function getUser($uid, $email)
     {
-        require_once("xorg.misc.inc.php");
         $res = XDB::query("SELECT  FIND_IN_SET('femme', flags) AS sexe, nom, prenom, promo
                              FROM  auth_user_md5
                             WHERE  user_id = {?}", $uid);
         if ($res->numRows() == 0) {
             return null;
-        } 
+        }
         $user            = $res->fetchOneAssoc();
         $user['id']      = $uid;
         $user['forlife'] = make_forlife($user['prenom'], $user['nom'], $user['promo']);
@@ -71,7 +70,7 @@ class Marketing
     private function getFrom($from, $sender)
     {
         global $globals;
-        
+
         if ($from == 'staff') {
             return '"L\'équipe de Polytechnique.org" <register@' . $globals->mail->domain . '>';
         } else {
@@ -143,7 +142,7 @@ class Marketing
         if ($valid) {
             require_once 'validations.inc.php';
             $valid = new MarkReq($this->sender, $this->user['id'], $this->user['mail'],
-                                 $this->from == 'user', $this->type, $this->data); 
+                                 $this->from == 'user', $this->type, $this->data);
             $valid->submit();
         }
         return true;
@@ -188,7 +187,7 @@ class Marketing
         if (!$email) {
             XDB::execute("DELETE FROM register_marketing WHERE uid = {?}", $uid);
         } else {
-            XDB::execute("DELETE FROM register_marketing WHERE uid = {?} AND email = {?}", $uid, $email);        
+            XDB::execute("DELETE FROM register_marketing WHERE uid = {?} AND email = {?}", $uid, $email);
         }
     }
 
@@ -200,7 +199,7 @@ class Marketing
             $res = XDB::query("SELECT COUNT(*) FROM auth_user_md5 WHERE deces=0");
             $nbx = $res->fetchOneCell();
         }
-    
+
         $res = XDB::query("SELECT  r.date, u.promo, u.nom, u.prenom, r.email, r.bestalias
                              FROM  register_pending AS r
                        INNER JOIN  auth_user_md5    AS u ON u.user_id = r.uid
@@ -208,14 +207,14 @@ class Marketing
         if (!list($date, $promo, $nom, $prenom, $email, $alias) = $res->fetchOneRow()) {
             return false;
         }
-    
+
         require_once('secure_hash.inc.php');
         $hash     = rand_url_id(12);
         $pass     = rand_pass();
         $pass_encrypted = hash_encrypt($pass);
         $fdate    = strftime('%d %B %Y', strtotime($date));
-    
-        $mymail = new PlMailer('marketing/mail.relance.tpl');
+
+        $mymail = new PlMailer('marketing/relance.mail.tpl');
         $mymail->assign('nbdix',      $nbx);
         $mymail->assign('fdate',      $fdate);
         $mymail->assign('lusername',  $alias);
@@ -240,7 +239,7 @@ interface MarketingEngine
     public function process(array $user);
 }
 
-// 
+//
 class AnnuaireMarketing implements MarketingEngine
 {
     protected $titre;
@@ -276,7 +275,7 @@ class AnnuaireMarketing implements MarketingEngine
         return $this->signature;
     }
 
-    protected function prepareText(PlatalPage &$page, array $user)
+    protected function prepareText(PlPage &$page, array $user)
     {
         $page->assign('intro', $this->getIntro());
         $page->assign('u', $user);
@@ -287,7 +286,8 @@ class AnnuaireMarketing implements MarketingEngine
 
     public function getText(array $user)
     {
-        $page = new XorgPage('marketing/mail.marketing.tpl', NO_SKIN);
+        $page = new XorgPage();
+        $page->changeTpl('marketing/marketing.mail.tpl', NO_SKIN);
         $this->prepareText($page, $user);
         return $page->raw();
     }