X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=d584060737b5c871f7d7ab1e0f4fa63b0cca1c74;hb=1f53925a716bf5cb97ed624a6787a8319eb2bcff;hp=89dcfa8b94dc36e0832963ea0a2d52f60c67329a;hpb=c0d230b0444016cbb248c81c2c50688e77c84a57;p=platal.git

diff --git a/modules/events.php b/modules/events.php
index 89dcfa8..d584060 100644
--- a/modules/events.php
+++ b/modules/events.php
@@ -25,6 +25,7 @@ class EventsModule extends PLModule
     {
         return array(
             'events'         => $this->make_hook('ev',        AUTH_COOKIE),
+            'rss'            => $this->make_hook('rss', AUTH_PUBLIC),
             'send_bug'       => $this->make_hook('bug', AUTH_COOKIE),
             'events/submit'  => $this->make_hook('ev_submit', AUTH_MDP),
             'admin/events'   => $this->make_hook('admin_events',     AUTH_MDP, 'admin'),
@@ -34,7 +35,7 @@ class EventsModule extends PLModule
 
             'nl'             => $this->make_hook('nl',        AUTH_COOKIE),
             'nl/show'        => $this->make_hook('nl_show',   AUTH_COOKIE),
-            'nl/submit'      => $this->make_hook('nl_submit', AUTH_COOKIE),
+            'nl/submit'      => $this->make_hook('nl_submit', AUTH_MDP),
             'admin/newsletter'             => $this->make_hook('admin_nl', AUTH_MDP, 'admin'),
             'admin/newsletter/categories'  => $this->make_hook('admin_nl_cat', AUTH_MDP, 'admin'),
             'admin/newsletter/edit'        => $this->make_hook('admin_nl_edit', AUTH_MDP, 'admin'),
@@ -77,8 +78,7 @@ class EventsModule extends PLModule
         $page->addJsLink('close_on_esc.js');
         if (Env::has('send')) {
             $page->assign('bug_sent',1);
-            require_once "diogenes/diogenes.hermes.inc.php";
-            $mymail = new HermesMailer();
+            $mymail = new PlMailer();
             $mymail->setFrom('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@polytechnique.org>');
             $mymail->addTo('support+platal@polytechnique.org');
             $mymail->setSubject('Plat/al '.Env::v('task_type').' : '.Env::v('item_summary'));
@@ -93,9 +93,6 @@ class EventsModule extends PLModule
         $page->addJsLink('ajax.js');
         $page->assign('tips', $this->get_tips());
 
-        // donne la derniere date de session
-        $page->assign('lastlogin', strftime("%Y%m%d%H%M%S",S::i('lastlogin')));
-
         $res = XDB::query('SELECT date, naissance FROM auth_user_md5
                                       WHERE user_id={?}', S::v('uid'));
         list($date, $naissance) = $res->fetchOneRow();
@@ -182,6 +179,24 @@ class EventsModule extends PLModule
                      );
     }
 
+    function handler_rss(&$page, $user = null, $hash = null)
+    {       
+        require_once 'rss.inc.php';
+            
+        $uid = init_rss('rss.tpl', $user, $hash);
+            
+        $rss = XDB::iterator(
+                'SELECT  e.id, e.titre, e.texte, e.creation_date,
+                         IF(u2.nom_usage = "", u2.nom, u2.nom_usage) AS nom, u2.prenom, u2.promo
+                   FROM  auth_user_md5   AS u
+             INNER JOIN  evenements      AS e ON ( (e.promo_min = 0 || e.promo_min <= u.promo)
+                                                 AND (e.promo_max = 0 || e.promo_max >= u.promo) )
+             INNER JOIN  auth_user_md5   AS u2 ON (u2.user_id = e.user_id)
+                  WHERE  u.user_id = {?} AND FIND_IN_SET(e.flags, "valide")
+                                         AND peremption >= NOW()', $uid);
+        $page->assign('rss', $rss);
+    }   
+
     function handler_ev_submit(&$page)
     {
         $page->changeTpl('evenements.tpl');
@@ -194,7 +209,7 @@ class EventsModule extends PLModule
         $valid_mesg = Post::v('valid_mesg');
         $action     = Post::v('action');
 
-        if ($promo_min > $promo_max ||
+        if (($promo_min > $promo_max && $promo_max != 0)||
             ($promo_min != 0 && ($promo_min <= 1900 || $promo_min >= 2020)) ||
             ($promo_max != 0 && ($promo_max <= 1900 || $promo_max >= 2020)))
         {