corrections des liens .php en lien pl

[platal.git] / modules / marketing.php

diff --git a/modules/marketing.php b/modules/marketing.php
index d2ede2a..68541b0 100644 (file)
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -37,8 +37,6 @@ class MarketingModule extends PLModule
 
     function handler_marketing(&$page)
     {
-        global $globals;
-
         $page->changeTpl('marketing/index.tpl');
 
         $page->assign('xorg_title','Polytechnique.org - Marketing');
@@ -80,8 +78,6 @@ class MarketingModule extends PLModule
     function handler_private(&$page, $uid = null,
                              $action = null, $value = null)
     {
-        global $globals;
-
         $page->changeTpl('marketing/private.tpl');
 
         if (is_null($uid)) {
@@ -126,9 +122,9 @@ class MarketingModule extends PLModule
 
         if ($action == 'relforce') {
             require_once('marketing.inc.php');
-            mark_send_mail($uid, $value, Post::get('from'), Post::get('to'),
-                           Post::get('title'), Post::get('message'));
-            $page->trig("Mail envoyé");
+            mark_send_mail($uid, $value, Post::v('from'), Post::v('to'),
+                           Post::v('title'), Post::v('message'));
+            $page->trig("Mail envoyé");
         }
 
         if ($action == 'insrel') {
@@ -143,7 +139,7 @@ class MarketingModule extends PLModule
                 "INSERT INTO register_marketing
                          SET uid = {?}, sender = {?}, email = {?},
                              date = NOW(), type = {?}",
-                $uid, Session::get('uid'), Post::get('email'), Post::get('type')); 
+                $uid, S::v('uid'), Post::v('email'), Post::v('type')); 
         }
 
         $res = XDB::iterator(
@@ -164,12 +160,10 @@ class MarketingModule extends PLModule
 
     function handler_promo(&$page, $promo = null)
     {
-        global $globals;
-
         $page->changeTpl('marketing/promo.tpl');
 
         if (is_null($promo)) {
-            $promo = Session::getInt('promo');
+            $promo = S::v('promo');
         }
         $page->assign('promo', $promo);
 
@@ -186,8 +180,6 @@ class MarketingModule extends PLModule
 
     function handler_public(&$page, $uid = null)
     {
-        global $globals;
-
         $page->changeTpl('marketing/public.tpl');
 
         if (is_null($uid)) {
@@ -205,7 +197,7 @@ class MarketingModule extends PLModule
             if (Post::has('valide')) {
                 require_once('xorg.misc.inc.php');
 
-                $email = trim(Post::get('mail'));
+                $email = trim(Post::v('mail'));
                 $res   = XDB::query('SELECT COUNT(*) FROM register_marketing
                                                 WHERE uid={?} AND email={?}', $uid, $email);
 
@@ -218,10 +210,10 @@ class MarketingModule extends PLModule
                     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'));
+                            $uid, S::v('uid'), $email, Post::v('origine'));
                     require_once('validations.inc.php');
-                    $req = new MarkReq(Session::getInt('uid'), $uid, $email,
-                                       Post::get('origine')=='user');
+                    $req = new MarkReq(S::v('uid'), $uid, $email,
+                                       Post::v('origine')=='user');
                     $req->submit();
                 }
             }
@@ -230,8 +222,6 @@ class MarketingModule extends PLModule
 
     function handler_week(&$page, $sorting = 'per_promo')
     {
-        global $globals;
-
         $page->changeTpl('marketing/this_week.tpl');
 
         $sort = $sorting == 'per_promo' ? 'promo' : 'date_ins';
@@ -246,8 +236,6 @@ class MarketingModule extends PLModule
 
     function handler_volontaire(&$page, $promo = null)
     {
-        global $globals;
-
         $page->changeTpl('marketing/volontaire.tpl');
 
         $res = XDB::query(
@@ -272,8 +260,6 @@ class MarketingModule extends PLModule
 
     function handler_relance(&$page)
     {
-        global $globals;
-
         $page->changeTpl('marketing/relance.tpl');
 
         if (Post::has('relancer')) {
@@ -285,7 +271,7 @@ class MarketingModule extends PLModule
             $sent  = Array();
             foreach (array_keys($_POST['relance']) as $uid) {
                 if ($tmp = relance($uid, $nbdix)) {
-                    $sent[] = $tmp.' a été relancé';
+                    $sent[] = $tmp.' a été relancé';
                 }
             }
             $page->assign('sent', $sent);