remove smarty {version} function, we have {#globals.version#} for it !!!

[platal.git] / modules / events.php

diff --git a/modules/events.php b/modules/events.php
index b244729..d5b9521 100644 (file)
--- a/modules/events.php
+++ b/modules/events.php
@@ -35,11 +35,9 @@ class EventsModule extends PLModule
 
     function handler_ev(&$page)
     {
-        global $globals;
-
         $page->changeTpl('login.tpl');
 
-        $res = $globals->xdb->query('SELECT date, naissance FROM auth_user_md5
+        $res = XDB::query('SELECT date, naissance FROM auth_user_md5
                                       WHERE user_id={?}', Session::getInt('uid'));
         list($date, $naissance) = $res->fetchOneRow();
 
@@ -60,7 +58,7 @@ class EventsModule extends PLModule
 
         // incitation à mettre une photo
 
-        $res = $globals->xdb->query('SELECT COUNT(*) FROM photo
+        $res = XDB::query('SELECT COUNT(*) FROM photo
                                       WHERE uid={?}', Session::getInt('uid'));
         $page->assign('photo_incitation', $res->fetchOneCell() == 0);
 
@@ -100,15 +98,15 @@ class EventsModule extends PLModule
 
         // cache les evenements lus et raffiche les evenements a relire
         if (Env::has('lu')){
-            $globals->xdb->execute('DELETE FROM evenements_vus AS ev 
+            XDB::execute('DELETE FROM evenements_vus AS ev 
                                      INNER JOIN evenements AS e ON e.id = ev.evt_id
                                           WHERE peremption < NOW)');
-            $globals->xdb->execute('REPLACE INTO evenements_vus VALUES({?},{?})',
+            XDB::execute('REPLACE INTO evenements_vus VALUES({?},{?})',
                                    Env::get('lu'), Session::getInt('uid'));
         }
 
         if (Env::has('nonlu')){
-            $globals->xdb->execute('DELETE FROM evenements_vus
+            XDB::execute('DELETE FROM evenements_vus
                                           WHERE evt_id = {?} AND user_id = {?}',
                                    Env::get('nonlu'), Session::getInt('uid'));
         }
@@ -118,17 +116,17 @@ class EventsModule extends PLModule
         // puis par dates croissantes d'expiration
         $promo = Session::getInt('promo');
         $sql = "SELECT  e.id,e.titre,e.texte,a.user_id,a.nom,a.prenom,a.promo,l.alias AS forlife
-                  FROM  evenements    AS e
-            INNER JOIN  auth_user_md5 AS a ON e.user_id=a.user_id
-            INNER JOIN  aliases       AS l ON ( a.user_id=l.id AND l.type='a_vie' )
-            LEFT JOIN   evenements_vus AS ev ON (e.id = ev.evt_id AND ev.user_id = {?})
+                  FROM  evenements     AS e
+            INNER JOIN  auth_user_md5  AS a ON e.user_id=a.user_id
+            INNER JOIN  aliases        AS l ON ( a.user_id=l.id AND l.type='a_vie' )
+             LEFT JOIN  evenements_vus AS ev ON (e.id = ev.evt_id AND ev.user_id = {?})
                  WHERE  FIND_IN_SET(e.flags, 'valide') AND peremption >= NOW()
                         AND (e.promo_min = 0 || e.promo_min <= {?})
                         AND (e.promo_max = 0 || e.promo_max >= {?})
                         AND ev.user_id IS NULL
               ORDER BY  (e.promo_min != 0 AND  e.promo_max != 0) DESC,  e.peremption";
         $page->assign('evenement',
-                      $globals->xdb->iterator($sql, Session::getInt('uid'),
+                      XDB::iterator($sql, Session::getInt('uid'),
                                               $promo, $promo)
                       );
 
@@ -140,16 +138,13 @@ class EventsModule extends PLModule
                         AND (e.promo_max = 0 || e.promo_max >= {?})
               ORDER BY  (e.promo_min != 0 AND  e.promo_max != 0) DESC,  e.peremption";
         $page->assign('evenement_summary',
-                      $globals->xdb->iterator($sql, Session::getInt('uid'),
+                      XDB::iterator($sql, Session::getInt('uid'),
                                               $promo, $promo)
                      );
-
-        return PL_OK;
     }
 
     function handler_ev_submit(&$page)
     {
-        global $globals;
         $page->changeTpl('evenements.tpl');
 
         $titre      = Post::get('titre');
@@ -195,8 +190,6 @@ class EventsModule extends PLModule
             $select .= "> $day / $month / $year</option>\n";
         }
         $page->assign('select',$select);
-
-        return PL_OK;
     }
 
     function handler_nl(&$page, $action = null)
@@ -214,8 +207,6 @@ class EventsModule extends PLModule
 
         $page->assign('nls', get_nl_state());
         $page->assign_by_ref('nl_list', get_nl_list());
-
-        return PL_OK;
     }
 
     function handler_nl_show(&$page, $nid = 'last')
@@ -232,8 +223,6 @@ class EventsModule extends PLModule
                         Session::get('bestalias'), Session::get('femme'),
                         Session::get('mail_fmt') != 'text');
         }
-
-        return PL_OK;
     }
 
     function handler_nl_submit(&$page)
@@ -252,8 +241,6 @@ class EventsModule extends PLModule
             $art->submit();
             $page->assign('submited', true);
         }
-
-        return PL_OK;
     }
 }