X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=38244aa3a687cedc3576fe89393ac7ca2cff79fb;hb=39fd8f508829b3b5b27a1bd580e2dd1857602294;hp=af01c70f3cd38df9ee19c6d2f915c2bf81cd5ab1;hpb=f78bc355e0e2f3af09467e40cf3bba34f57d40c1;p=platal.git
diff --git a/modules/events.php b/modules/events.php
index af01c70..38244aa 100644
--- a/modules/events.php
+++ b/modules/events.php
@@ -1,6 +1,6 @@
$this->make_hook('ev', AUTH_COOKIE),
+ 'rss' => $this->make_hook('rss', AUTH_PUBLIC),
'events/submit' => $this->make_hook('ev_submit', AUTH_MDP),
'admin/events' => $this->make_hook('admin_events', 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),
- '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'),
+ 'ajax/tips' => $this->make_hook('tips', AUTH_COOKIE, '', NO_AUTH),
+ 'admin/tips' => $this->make_hook('admin_tips', AUTH_MDP, 'admin'),
);
}
- function on_subscribe($forlife, $uid, $promo, $password)
+ function get_tips($exclude = null)
{
- require_once 'newsletter.inc.php';
- subscribe_nl($uid);
+ $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_ev(&$page, $action = 'list', $eid = null)
+ function handler_ev(&$page, $action = 'list', $eid = null, $pound = null)
{
- $page->changeTpl('login.tpl');
+ $page->changeTpl('events/index.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 +94,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
@@ -114,13 +107,15 @@ class EventsModule extends PLModule
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 = {?}',
$eid, S::v('uid'));
+ pl_redirect('events#newsid'.$eid);
}
// affichage des evenements
@@ -155,9 +150,27 @@ class EventsModule extends PLModule
);
}
+ function handler_rss(&$page, $user = null, $hash = null)
+ {
+ require_once 'rss.inc.php';
+
+ $uid = init_rss('events/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');
+ $page->changeTpl('events/submit.tpl');
$titre = Post::v('titre');
$texte = Post::v('texte');
@@ -167,19 +180,30 @@ 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);
$page->assign('valid_mesg', $valid_mesg);
$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);
+ if ($action && (!trim($texte) || !trim($titre))) {
+ $page->trig("L'article doit avoir un titre et un contenu");
+ } elseif ($action == 'Confirmer') {
+ $texte = $texte_catch_url;
require_once 'validations.inc.php';
$evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max,
$peremption, $valid_mesg, S::v('uid'));
@@ -204,60 +228,34 @@ class EventsModule extends PLModule
$page->assign('select',$select);
}
- function handler_nl(&$page, $action = null)
+ function handler_tips(&$page, $tips = null)
{
- require_once 'newsletter.inc.php';
-
- $page->changeTpl('newsletter/index.tpl');
- $page->assign('xorg_title','Polytechnique.org - Lettres mensuelles');
-
- switch ($action) {
- case 'out': unsubscribe_nl(); break;
- case 'in': subscribe_nl(); break;
- default: ;
- }
-
- $page->assign('nls', get_nl_state());
- $page->assign_by_ref('nl_list', get_nl_list());
+ header('Content-Type: text/html; charset="ISO-8859-15"');
+ $page->changeTpl('include/tips.tpl', NO_SKIN);
+ $page->assign('tips', $this->get_tips($tips));
}
- function handler_nl_show(&$page, $nid = 'last')
+ function handler_admin_tips(&$page, $action = 'list', $id = null)
{
- $page->changeTpl('newsletter/show.tpl');
-
- require_once 'newsletter.inc.php';
-
- $nl = new NewsLetter($nid);
- $page->assign_by_ref('nl', $nl);
-
- if (Post::has('send')) {
- $nl->sendTo(S::v('prenom'), S::v('nom'),
- S::v('bestalias'), S::v('femme'),
- S::v('mail_fmt') != 'text');
- }
- }
-
- function handler_nl_submit(&$page)
- {
- $page->changeTpl('newsletter/submit.tpl');
-
- require_once 'newsletter.inc.php';
-
- if (Post::has('see')) {
- $art = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'));
- $page->assign('art', $art);
- } elseif (Post::has('valid')) {
- require_once('validations.inc.php');
- $art = new NLReq(S::v('uid'), Post::v('title'),
- Post::v('body'), Post::v('append'));
- $art->submit();
- $page->assign('submited', true);
+ $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);
+ if ($action == 'edit' && !is_null($id)) {
+ $page->changeTpl('events/admin_tips.tpl');
}
}
function handler_admin_events(&$page, $action = 'list', $eid = null)
{
- $page->changeTpl('admin/evenements.tpl');
+ $page->changeTpl('events/admin.tpl');
$page->assign('xorg_title','Polytechnique.org - Administration - Evenements');
$page->register_modifier('hde', 'html_entity_decode');
@@ -265,11 +263,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') {
@@ -345,70 +353,7 @@ class EventsModule extends PLModule
$page->assign('evs', XDB::iterator($sql));
}
$page->assign('arch', $arch);
- }
-
- function handler_admin_nl(&$page, $new = false) {
- $page->changeTpl('newsletter/admin.tpl');
- $page->assign('xorg_title','Polytechnique.org - Administration - Newsletter : liste');
- require_once("newsletter.inc.php");
-
- if($new) {
- insert_new_nl();
- pl_redirect("admin/newsletter");
- }
-
- $page->assign_by_ref('nl_list', get_nl_slist());
- }
-
- function handler_admin_nl_edit(&$page, $nid = 'last', $aid = null, $action = 'edit') {
- $page->changeTpl('newsletter/edit.tpl');
- $page->assign('xorg_title','Polytechnique.org - Administration - Newsletter : Edition');
- require_once("newsletter.inc.php");
-
- $nl = new NewsLetter($nid);
-
- if($action == 'delete') {
- $nl->delArticle($aid);
- pl_redirect("admin/newsletter/edit/$nid");
- }
-
- if($aid == 'update') {
- $nl->_title = Post::v('title');
- $nl->_date = Post::v('date');
- $nl->_head = Post::v('head');
- $nl->save();
- }
-
- if(Post::v('save')) {
- $art = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'),
- $aid, Post::v('cid'), Post::v('pos'));
- $nl->saveArticle($art);
- pl_redirect("admin/newsletter/edit/$nid");
- }
-
- if($action == 'edit') {
- $eaid = $aid;
- if(Post::has('title')) {
- $art = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'),
- $eaid, Post::v('cid'), Post::v('pos'));
- } else {
- $art = ($eaid == 'new') ? new NLArticle() : $nl->getArt($eaid);
- }
- $page->assign('art', $art);
- }
-
- $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');
- $table_editor->describe('titre','intitulé',true);
- $table_editor->describe('pos','position',true);
- $table_editor->apply($page, $action, $id);
- }
-
+ }
}
?>