Check promotion range for x.org events

[platal.git] / modules / events.php

diff --git a/modules/events.php b/modules/events.php
index a070b57..0adde06 100644 (file)
--- a/modules/events.php
+++ b/modules/events.php
@@ -100,11 +100,8 @@ class EventsModule extends PLModule
 
         // ajout du lien RSS
         if (S::has('core_rss_hash')) {
-            $page->assign('xorg_rss',
-                          array('title' => 'Polytechnique.org :: News',
-                                'href' => '/rss/'.S::v('forlife')
-                                         .'/'.S::v('core_rss_hash').'/rss.xml')
-            );
+            $page->setRssLink('Polytechnique.org :: News',
+                              '/rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml');
         }
 
         // cache les evenements lus et raffiche les evenements a relire
@@ -169,8 +166,20 @@ class EventsModule extends PLModule
         $valid_mesg = Post::v('valid_mesg');
         $action     = Post::v('action');
 
+        if ($promo_min > $promo_max ||
+            ($promo_min != 0 && ($promo_min <= 1900 || $promo_min >= 2020)) ||
+            ($promo_max != 0 && ($promo_max <= 1900 || $promo_max >= 2020)))
+        {
+            $page->trig("L'intervalle de promotions n'est pas valide");
+            $action = null;
+        }
+
+       require_once('url_catcher.inc.php');
+               $texte_catch_url = url_catcher($texte);
+               
         $page->assign('titre', $titre);
         $page->assign('texte', $texte);
+        $page->assign('texte_html', $texte_catch_url);
         $page->assign('promo_min', $promo_min);
         $page->assign('promo_max', $promo_max);
         $page->assign('peremption', $peremption);
@@ -178,10 +187,7 @@ class EventsModule extends PLModule
         $page->assign('action', strtolower($action));
 
         if ($action == 'Confirmer') {
-            $texte = preg_replace('/((?:https?|ftp):\/\/(?:\.*,*[a-z@0-9~%$£µ&i#\-+=_\/\?])*)/i',
-                                  '<a href="\\0">\\0</a>', $texte);
-            $texte = preg_replace('/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i',
-                                  '<a href="mailto:\\0">\\0</a>', $texte);
+               $texte = $texte_catch_url;
             require_once 'validations.inc.php';
             $evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max,
                                  $peremption, $valid_mesg, S::v('uid'));
@@ -220,7 +226,7 @@ class EventsModule extends PLModule
         }
 
         $page->assign('nls', get_nl_state());
-        $page->assign_by_ref('nl_list', get_nl_list());
+        $page->assign('nl_list', get_nl_list());
     }
 
     function handler_nl_show(&$page, $nid = 'last')
@@ -235,7 +241,7 @@ class EventsModule extends PLModule
         if (Post::has('send')) {
             $nl->sendTo(S::v('prenom'), S::v('nom'),
                         S::v('bestalias'), S::v('femme'),
-                        S::v('mail_fmt') != 'text');
+                        S::v('mail_fmt') != 'texte');
         }
     }
 
@@ -267,11 +273,21 @@ class EventsModule extends PLModule
         $page->assign('action', $action);
  
         if (Post::v('action') == "Proposer" && $eid) {
-            XDB::execute('UPDATE evenements
-                             SET titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?}
-                           WHERE id = {?}', 
-                          Post::v('titre'), Post::v('texte'), Post::v('peremption'),
-                          Post::v('promo_min'), Post::v('promo_max'), $eid);
+            $promo_min = Post::i('promo_min');
+            $promo_max = Post::i('promo_max');
+            if ($promo_min > $promo_max ||
+                ($promo_min != 0 && ($promo_min <= 1900 || $promo_min >= 2020)) ||
+                ($promo_max != 0 && ($promo_max <= 1900 || $promo_max >= 2020)))
+            {
+                $page->trig("L'intervalle de promotions $promo_min -> $promo_max n'est pas valide");
+                $action = 'edit';
+            } else {
+                XDB::execute('UPDATE evenements
+                                 SET titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?}
+                               WHERE id = {?}', 
+                              Post::v('titre'), Post::v('texte'), Post::v('peremption'),
+                              Post::v('promo_min'), Post::v('promo_max'), $eid);
+            }    
         }
 
         if ($action == 'edit') {
@@ -359,7 +375,7 @@ class EventsModule extends PLModule
            pl_redirect("admin/newsletter");
         }
         
-        $page->assign_by_ref('nl_list', get_nl_slist());
+        $page->assign('nl_list', get_nl_slist());
     }
     
     function handler_admin_nl_edit(&$page, $nid = 'last', $aid = null, $action = 'edit') {
@@ -375,10 +391,16 @@ class EventsModule extends PLModule
         }
         
         if($aid == 'update') {
-            $nl->_title = Post::v('title');
-            $nl->_date  = Post::v('date');
-            $nl->_head  = Post::v('head');
-            $nl->save();
+            $nl->_title     = Post::v('title');
+            $nl->_date      = Post::v('date');
+            $nl->_head      = Post::v('head');
+            $nl->_shortname = strlen(Post::v('shortname')) ? Post::v('shortname') : null;
+            if (preg_match('/^[-a-z0-9]*$/i', $nl->_shortname) && !is_numeric($nl->_shortname)) {
+                $nl->save();
+            } else {
+                $page->trig('Le nom de la NL n\'est pas valide');
+                pl_redirect('admin/newsletter/edit/' . $nl->_id);
+            }
         }
         
         if(Post::v('save')) {
@@ -388,7 +410,7 @@ class EventsModule extends PLModule
             pl_redirect("admin/newsletter/edit/$nid");
         }
         
-        if($action == 'edit') {
+        if($action == 'edit' && $aid != 'update') {
             $eaid = $aid;
             if(Post::has('title')) {
                 $art  = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'),