X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=2702756dde54f33b39ec4ab453af5476036c9fc6;hb=a1d792172431297cb927aa3291ef132f372bd168;hp=8b1ccdead6ef1d5105aadf82c76c43d94d31b833;hpb=01248e3ac03a3f9b604e98c97157884bf4733a66;p=platal.git
diff --git a/modules/events.php b/modules/events.php
index 8b1ccde..2702756 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),
+ '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'),
@@ -43,9 +44,18 @@ class EventsModule extends PLModule
subscribe_nl($uid);
}
- function handler_ev(&$page, $action = 'list', $eid = null)
+ function handler_bug(&$page)
+ {
+ $this->handler_ev($page);
+ $page->assign('bug', 1);
+ }
+
+ function handler_ev(&$page, $action = 'list', $eid = null, $pound = null)
{
$page->changeTpl('login.tpl');
+
+ // 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'));
@@ -78,47 +88,48 @@ class EventsModule extends PLModule
$page->assign('geoloc_incitation', count($res));
// affichage de la boîte avec quelques liens
- require_once 'login.conf.php';
- $pub_nbElem = $pub_nbLig * $pub_nbCol ;
- if (count($pub_tjs) <= $pub_nbElem) {
- $publicite = array_slice($pub_tjs, 0, $pub_nbElem);
- } else {
- $publicite = $pub_tjs ;
- }
-
- $nbAlea = $pub_nbElem - count($publicite) ;
- if ($nbAlea > 0) {
- $choix = array_rand($pub_rnd,$nbAlea) ;
- foreach ($choix as $url) {
- $publicite[$url] = $pub_rnd[$url] ;
- }
+ /* Bandeau de publicité sur la page de login */
+ $publicite = array(
+ 'password' => 'Changer mon mot de passe' ,
+ 'Docs/Dons' => 'Faire un don à l\'association Polytechnique.org'
+ ) ;
+
+ // Liens apparaissant de façon aléatoire
+ $pub_rnd = array(
+ 'nl/show' => 'Afficher la dernière newsletter' ,
+ 'http://www.polytechnique.net/login' => 'Vers les autres sites polytechniciens' ,
+ "trombi/{$_SESSION["promo"]}" => "Voir le trombi de ma promo" ,
+ 'banana' => 'Un petit tour du côté des forums !!'
+ ) ;
+
+ $choix = array_rand($pub_rnd, 2);
+ foreach ($choix as $url) {
+ $publicite[$url] = $pub_rnd[$url] ;
}
- $publicite = array_chunk( $publicite , $pub_nbLig , true ) ;
- $page->assign_by_ref('publicite', $publicite);
+ $page->assign('publicite', array_chunk($publicite, 2, true));
// 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
if ($action == 'read' && $eid) {
- XDB::execute('DELETE FROM evenements_vus AS ev
- INNER JOIN evenements AS e ON e.id = ev.evt_id
- WHERE peremption < NOW)');
+ XDB::execute('DELETE evenements_vus.*
+ FROM evenements_vus AS ev
+ INNER JOIN evenements AS e ON e.id = ev.evt_id
+ WHERE peremption < NOW()');
XDB::execute('REPLACE INTO evenements_vus VALUES({?},{?})',
- $eid, S::v('uid'));
+ $eid, S::v('uid'));
+ pl_redirect('events#'.$pound);
}
if ($action == 'unread' && $eid) {
XDB::execute('DELETE FROM evenements_vus
- WHERE evt_id = {?} AND user_id = {?}',
+ WHERE evt_id = {?} AND user_id = {?}',
$eid, S::v('uid'));
+ pl_redirect('events#newsid'.$eid);
}
// affichage des evenements
@@ -165,8 +176,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);
@@ -174,10 +197,7 @@ class EventsModule extends PLModule
$page->assign('action', strtolower($action));
if ($action == 'Confirmer') {
- $texte = preg_replace('/((http|ftp)+(s)?:\/\/[^<>\s]+)/i',
- '\\0', $texte);
- $texte = preg_replace('/([^,\s]+@[^,\s]+)/i',
- '\\0', $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'));
@@ -216,7 +236,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')
@@ -231,7 +251,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');
}
}
@@ -263,11 +283,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') {
@@ -355,7 +385,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') {
@@ -371,10 +401,17 @@ 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->_title_mail= Post::v('title_mail');
+ $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')) {
@@ -384,7 +421,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'),
@@ -398,7 +435,6 @@ class EventsModule extends PLModule
$page->assign_by_ref('nl',$nl);
}
function handler_admin_nl_cat(&$page, $action = 'list', $id = null) {
- require_once('../classes/PLTableEditor.php');
$page->assign('xorg_title','Polytechnique.org - Administration - Newsletter : Catégories');
$page->assign('title', 'Gestion des catégories de la newsletter');
$table_editor = new PLTableEditor('admin/newsletter/categories','newsletter_cat','cid');