fixes

[platal.git] / modules / marketing.php

diff --git a/modules/marketing.php b/modules/marketing.php
index 3684e33..6543e97 100644 (file)
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -75,8 +75,6 @@ class MarketingModule extends PLModule
         $res = $globals->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,
@@ -128,14 +126,13 @@ class MarketingModule extends PLModule
 
         if ($action == 'relforce') {
             require_once('marketing.inc.php');
-            mark_send_mail($uid, $value, Env::get('from'),
-                           Env::get('to'), Env::get('title'),
-                           Env::get('message'));
+            mark_send_mail($uid, $value, Post::get('from'), Post::get('to'),
+                           Post::get('title'), Post::get('message'));
             $page->trig("Mail envoyé");
         }
 
         if ($action == 'insrel') {
-            require_once('marketing.inc.php');
+            require_once 'marketing.inc.php';
             if (relance($uid)) {
                 $page->trig('relance faite');
             }
@@ -163,8 +160,6 @@ class MarketingModule extends PLModule
             $page->assign('pending', $pending);
             $page->assign('relance', $relance);
         }
-
-        return PL_OK;
     }
 
     function handler_promo(&$page, $promo = null)
@@ -187,8 +182,6 @@ class MarketingModule extends PLModule
               GROUP BY  u.user_id
               ORDER BY  nom, prenom";
         $page->assign('nonins', $globals->xdb->iterator($sql, $promo));
-
-        return PL_OK;
     }
 
     function handler_public(&$page, $uid = null)
@@ -209,10 +202,10 @@ class MarketingModule extends PLModule
             $page->assign('nom', $nom);
             $page->assign('promo', $promo);
 
-            if (Env::has('valide')) {
+            if (Post::has('valide')) {
                 require_once('xorg.misc.inc.php');
 
-                $email = trim(Env::get('mail'));
+                $email = trim(Post::get('mail'));
                 $res   = $globals->xdb->query('SELECT COUNT(*) FROM register_marketing
                                                 WHERE uid={?} AND email={?}', $uid, $email);
 
@@ -225,25 +218,23 @@ class MarketingModule extends PLModule
                     $globals->xdb->execute(
                             "INSERT INTO  register_marketing (uid,sender,email,date,last,nb,type,hash)
                                   VALUES  ({?}, {?}, {?}, NOW(), 0, 0, {?}, '')",
-                            $uid, Session::getInt('uid'), $email, Env::get('origine'));
+                            $uid, Session::getInt('uid'), $email, Post::get('origine'));
                     require_once('validations.inc.php');
                     $req = new MarkReq(Session::getInt('uid'), $uid, $email,
-                                       Env::get('origine')=='user');
+                                       Post::get('origine')=='user');
                     $req->submit();
                 }
             }
         }
-
-        return PL_OK;
     }
 
-    function handler_week(&$page)
+    function handler_week(&$page, $sorting = 'per_promo')
     {
         global $globals;
 
         $page->changeTpl('marketing/this_week.tpl');
 
-        $sort = Get::get('sort') == 'promo' ? 'promo' : 'date_ins';
+        $sort = $sorting == 'per_promo' ? 'promo' : 'date_ins';
 
         $sql = "SELECT  a.alias AS forlife, u.date_ins, u.promo, u.nom, u.prenom
                   FROM  auth_user_md5  AS u
@@ -251,11 +242,9 @@ class MarketingModule extends PLModule
                  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;
     }
 
-    function handler_volontaire(&$page)
+    function handler_volontaire(&$page, $promo = null)
     {
         global $globals;
 
@@ -270,17 +259,15 @@ class MarketingModule extends PLModule
         $page->assign('promos', $res->fetchColumn());
 
 
-        if (Env::has('promo')) {
+        if (!is_null($promo)) {
             $sql = "SELECT  a.nom, a.prenom, a.user_id,
                             m.email, sa.alias AS forlife
                       FROM  register_marketing AS m
                 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, Env::get('promo')));
+            $page->assign('addr', $globals->xdb->iterator($sql, $promo));
         }
-
-        return PL_OK;
     }
 
     function handler_relance(&$page)
@@ -290,6 +277,8 @@ class MarketingModule extends PLModule
         $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");
             $nbdix = $res->fetchOneCell();
 
@@ -308,8 +297,6 @@ class MarketingModule extends PLModule
                  WHERE  hash!='INSCRIT'
               ORDER BY  date DESC";
         $page->assign('relance', $globals->xdb->iterator($sql));
-
-        return PL_OK;
     }
 }