X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=d584060737b5c871f7d7ab1e0f4fa63b0cca1c74;hb=d1c97e427c6766a1fbd57aa66ae3a9bf5999200a;hp=a070b5735b2880212cb28afab228b8061971e1f1;hpb=42a50827dc2ac2b13ddaf77ea16c0989cd8b960d;p=platal.git
diff --git a/modules/events.php b/modules/events.php
index a070b57..d584060 100644
--- a/modules/events.php
+++ b/modules/events.php
@@ -25,12 +25,17 @@ 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'),
+ 'ajax/tips' => $this->make_hook('tips', AUTH_COOKIE, '', NO_AUTH),
+ 'admin/tips' => $this->make_hook('admin_tips', AUTH_MDP, 'admin'),
+
'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'),
@@ -43,9 +48,50 @@ class EventsModule extends PLModule
subscribe_nl($uid);
}
+ function get_tips($exclude = null)
+ {
+ $exclude = is_null($exclude) ? '' : ' AND id != ' . $exclude . ' ';
+ $priority = rand(0, 510);
+ do {
+ $priority = (int)($priority/2);
+ $res = XDB::query("SELECT *
+ FROM tips
+ WHERE (peremption = '0000-00-00' OR peremption > CURDATE())
+ AND (promo_min = 0 OR promo_min <= {?})
+ AND (promo_max = 0 OR promo_max >= {?})
+ AND (priorite >= {?})
+ AND (state = 'active')
+ $exclude
+ ORDER BY RAND()
+ LIMIT 1",
+ S::i('promo'), S::i('promo'), $priority);
+ } while ($priority && !$res->numRows());
+ if (!$res->numRows()) {
+ return null;
+ }
+ return $res->fetchOneAssoc();
+ }
+
+ function handler_bug(&$page)
+ {
+ $page->changeTpl('bug.tpl',SIMPLE);
+ $page->addJsLink('close_on_esc.js');
+ if (Env::has('send')) {
+ $page->assign('bug_sent',1);
+ $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'));
+ $mymail->setTxtBody(Env::v('detailed_desc'));
+ $mymail->send();
+ }
+ }
+
function handler_ev(&$page, $action = 'list', $eid = null, $pound = null)
{
$page->changeTpl('login.tpl');
+ $page->addJsLink('ajax.js');
+ $page->assign('tips', $this->get_tips());
$res = XDB::query('SELECT date, naissance FROM auth_user_md5
WHERE user_id={?}', S::v('uid'));
@@ -77,34 +123,10 @@ class EventsModule extends PLModule
$res = localize_addresses(S::v('uid', -1));
$page->assign('geoloc_incitation', count($res));
- // affichage de la boîte avec quelques liens
- /* 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' => '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] ;
- }
- $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
@@ -157,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');
@@ -169,8 +209,20 @@ class EventsModule extends PLModule
$valid_mesg = Post::v('valid_mesg');
$action = Post::v('action');
+ 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)))
+ {
+ $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 +230,7 @@ class EventsModule extends PLModule
$page->assign('action', strtolower($action));
if ($action == 'Confirmer') {
- $texte = preg_replace('/((?:https?|ftp):\/\/(?:\.*,*[a-z@0-9~%$£µ&i#\-+=_\/\?])*)/i',
- '\\0', $texte);
- $texte = preg_replace('/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/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'));
@@ -206,6 +255,27 @@ class EventsModule extends PLModule
$page->assign('select',$select);
}
+ function handler_tips(&$page, $tips = null)
+ {
+ $page->changeTpl('include/tips.tpl', NO_SKIN);
+ $page->assign('tips', $this->get_tips($tips));
+ }
+
+ function handler_admin_tips(&$page, $action = 'list', $id = null)
+ {
+ $page->assign('xorg_title', 'Polytechnique.org - Administration - Astuces');
+ $page->assign('title', 'Gestion des Astuces');
+ $table_editor = new PLTableEditor('admin/tips', 'tips', 'id');
+ $table_editor->describe('peremption', 'date de péremption', true);
+ $table_editor->describe('promo_min', 'promo. min (0 aucune)', false);
+ $table_editor->describe('promo_max', 'promo. max (0 aucune)', false);
+ $table_editor->describe('titre', 'titre', true);
+ $table_editor->describe('state', 'actif', true);
+ $table_editor->describe('text', 'texte (html) de l\'astuce', false);
+ $table_editor->describe('priorite', 'priorité (0=min, 256=max)', false);
+ $table_editor->apply($page, $action, $id);
+ }
+
function handler_nl(&$page, $action = null)
{
require_once 'newsletter.inc.php';
@@ -220,7 +290,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 +305,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 +337,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 +439,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 +455,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')) {
@@ -388,7 +475,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'),