X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fmarketing.php;h=1046574f78c25ac7d95e3b053ef739c685d49efa;hb=a3a049fc80d3707bcc76903ab89f73974c470c0c;hp=29474723818e9c9d921e4e4850be2cdb28608ec8;hpb=fcf2e33e7e0fac9ccfc0fbe5f98e4f04e89c2b48;p=platal.git

diff --git a/modules/marketing.php b/modules/marketing.php
index 2947472..1046574 100644
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -37,15 +37,13 @@ class MarketingModule extends PLModule
 
     function handler_marketing(&$page)
     {
-        global $globals;
-
         $page->changeTpl('marketing/index.tpl');
 
         $page->assign('xorg_title','Polytechnique.org - Marketing');
 
         // Quelques statistiques
 
-        $res   = $globals->xdb->query(
+        $res   = XDB::query(
                   "SELECT COUNT(*) AS vivants,
                           COUNT(NULLIF(perms='admin' OR perms='user', 0)) AS inscrits,
                           100*COUNT(NULLIF(perms='admin' OR perms='user', 0))/COUNT(*) AS ins_rate,
@@ -62,28 +60,24 @@ class MarketingModule extends PLModule
         $stats = $res->fetchOneAssoc();
         $page->assign('stats', $stats);
 
-        $res   = $globals->xdb->query("SELECT count(*) FROM auth_user_md5 WHERE date_ins > ".
+        $res   = XDB::query("SELECT count(*) FROM auth_user_md5 WHERE date_ins > ".
                                       date('Ymd000000', strtotime('1 week ago')));
         $page->assign('nbInsSem', $res->fetchOneCell());
 
-        $res = $globals->xdb->query("SELECT count(*) FROM register_pending WHERE hash != 'INSCRIT'");
+        $res = XDB::query("SELECT count(*) FROM register_pending WHERE hash != 'INSCRIT'");
         $page->assign('nbInsEnCours', $res->fetchOneCell());
 
-        $res = $globals->xdb->query("SELECT count(*) FROM register_marketing");
+        $res = XDB::query("SELECT count(*) FROM register_marketing");
         $page->assign('nbInsMarket', $res->fetchOneCell());
 
-        $res = $globals->xdb->query("SELECT count(*) FROM register_mstats
+        $res = XDB::query("SELECT count(*) FROM register_mstats
                                       WHERE TO_DAYS(NOW()) - TO_DAYS(success) <= 7");
         $page->assign('nbInsMarkOK', $res->fetchOneCell());
-
-        return PL_OK;
     }
 
     function handler_private(&$page, $uid = null,
                              $action = null, $value = null)
     {
-        global $globals;
-
         $page->changeTpl('marketing/private.tpl');
 
         if (is_null($uid)) {
@@ -92,7 +86,7 @@ class MarketingModule extends PLModule
 
         $page->assign('path', 'marketing/private/'.$uid);
 
-        $res = $globals->xdb->query("SELECT nom, prenom, promo, matricule
+        $res = XDB::query("SELECT nom, prenom, promo, matricule
                                        FROM auth_user_md5
                                       WHERE user_id={?} AND perms='pending'", $uid);
 
@@ -109,7 +103,7 @@ class MarketingModule extends PLModule
         }
 
         if ($action == 'del') {
-            $globals->xdb->execute('DELETE FROM register_marketing WHERE uid={?} AND email={?}',
+            XDB::execute('DELETE FROM register_marketing WHERE uid={?} AND email={?}',
                                    $uid, $value);
         }
 
@@ -141,14 +135,14 @@ class MarketingModule extends PLModule
         }
 
         if ($action == 'add' && Post::has('email') && Post::has('type')) {
-            $globals->xdb->execute(
+            XDB::execute(
                 "INSERT INTO register_marketing
                          SET uid = {?}, sender = {?}, email = {?},
                              date = NOW(), type = {?}",
                 $uid, Session::get('uid'), Post::get('email'), Post::get('type')); 
         }
 
-        $res = $globals->xdb->iterator(
+        $res = XDB::iterator(
                 "SELECT  r.*, a.alias
                    FROM  register_marketing AS r
              INNER JOIN  aliases            AS a ON (r.sender=a.id AND a.type = 'a_vie')
@@ -156,20 +150,16 @@ class MarketingModule extends PLModule
                ORDER BY  date", $uid);
         $page->assign('addr', $res);
 
-        $res = $globals->xdb->query("SELECT date, relance FROM register_pending
+        $res = XDB::query("SELECT date, relance FROM register_pending
                                       WHERE uid = {?}", $uid);
         if (list($pending, $relance) = $res->fetchOneCell()) {
             $page->assign('pending', $pending);
             $page->assign('relance', $relance);
         }
-
-        return PL_OK;
     }
 
     function handler_promo(&$page, $promo = null)
     {
-        global $globals;
-
         $page->changeTpl('marketing/promo.tpl');
 
         if (is_null($promo)) {
@@ -185,22 +175,18 @@ class MarketingModule extends PLModule
                  WHERE  u.promo = {?} AND u.deces = 0 AND u.perms='pending'
               GROUP BY  u.user_id
               ORDER BY  nom, prenom";
-        $page->assign('nonins', $globals->xdb->iterator($sql, $promo));
-
-        return PL_OK;
+        $page->assign('nonins', XDB::iterator($sql, $promo));
     }
 
     function handler_public(&$page, $uid = null)
     {
-        global $globals;
-
         $page->changeTpl('marketing/public.tpl');
 
         if (is_null($uid)) {
             return PL_NOT_FOUND;
         }
 
-        $res = $globals->xdb->query("SELECT nom, prenom, promo FROM auth_user_md5
+        $res = XDB::query("SELECT nom, prenom, promo FROM auth_user_md5
                                       WHERE user_id={?} AND perms='pending'", $uid);
 
         if (list($nom, $prenom, $promo) = $res->fetchOneRow()) {
@@ -212,7 +198,7 @@ class MarketingModule extends PLModule
                 require_once('xorg.misc.inc.php');
 
                 $email = trim(Post::get('mail'));
-                $res   = $globals->xdb->query('SELECT COUNT(*) FROM register_marketing
+                $res   = XDB::query('SELECT COUNT(*) FROM register_marketing
                                                 WHERE uid={?} AND email={?}', $uid, $email);
 
                 if (!isvalid_email_redirection($email)) {
@@ -221,7 +207,7 @@ class MarketingModule extends PLModule
                     $page->assign('already', true);
                 } else {
                     $page->assign('ok', true);
-                    $globals->xdb->execute(
+                    XDB::execute(
                             "INSERT INTO  register_marketing (uid,sender,email,date,last,nb,type,hash)
                                   VALUES  ({?}, {?}, {?}, NOW(), 0, 0, {?}, '')",
                             $uid, Session::getInt('uid'), $email, Post::get('origine'));
@@ -232,14 +218,10 @@ class MarketingModule extends PLModule
                 }
             }
         }
-
-        return PL_OK;
     }
 
     function handler_week(&$page, $sorting = 'per_promo')
     {
-        global $globals;
-
         $page->changeTpl('marketing/this_week.tpl');
 
         $sort = $sorting == 'per_promo' ? 'promo' : 'date_ins';
@@ -249,18 +231,14 @@ class MarketingModule extends PLModule
             INNER JOIN  aliases        AS a ON (u.user_id = a.id AND a.type='a_vie')
                  WHERE  u.date_ins > ".date("Ymd000000", strtotime ('1 week ago'))."
               ORDER BY  u.$sort DESC";
-        $page->assign('ins', $globals->xdb->iterator($sql));
-
-        return PL_OK;
+        $page->assign('ins', XDB::iterator($sql));
     }
 
     function handler_volontaire(&$page, $promo = null)
     {
-        global $globals;
-
         $page->changeTpl('marketing/volontaire.tpl');
 
-        $res = $globals->xdb->query(
+        $res = XDB::query(
                 "SELECT
                DISTINCT  a.promo
                    FROM  register_marketing AS m
@@ -276,22 +254,18 @@ class MarketingModule extends PLModule
                 INNER JOIN  auth_user_md5      AS a  ON a.user_id = m.uid AND a.promo = {?}
                 INNER JOIN  aliases            AS sa ON (m.sender = sa.id AND sa.type='a_vie')
                   ORDER BY  a.nom";
-            $page->assign('addr', $globals->xdb->iterator($sql, $promo));
+            $page->assign('addr', XDB::iterator($sql, $promo));
         }
-
-        return PL_OK;
     }
 
     function handler_relance(&$page)
     {
-        global $globals;
-
         $page->changeTpl('marketing/relance.tpl');
 
         if (Post::has('relancer')) {
             require_once 'marketing.inc.php';
 
-            $res   = $globals->xdb->query("SELECT COUNT(*) FROM auth_user_md5 WHERE deces=0");
+            $res   = XDB::query("SELECT COUNT(*) FROM auth_user_md5 WHERE deces=0");
             $nbdix = $res->fetchOneCell();
 
             $sent  = Array();
@@ -308,9 +282,7 @@ class MarketingModule extends PLModule
             INNER JOIN  auth_user_md5    AS u ON r. uid = u.user_id
                  WHERE  hash!='INSCRIT'
               ORDER BY  date DESC";
-        $page->assign('relance', $globals->xdb->iterator($sql));
-
-        return PL_OK;
+        $page->assign('relance', XDB::iterator($sql));
     }
 }