X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=24b0a4bd6ed549277fa4cb37e026647fe20c1192;hb=532c06cf78d430c5278df7006335df2921fa98d4;hp=b4a36812d7dfed99711979bfe798c210ab24a332;hpb=c700d16b2402b1d246383097f6f22f716e294eaf;p=platal.git diff --git a/modules/events.php b/modules/events.php index b4a3681..24b0a4b 100644 --- a/modules/events.php +++ b/modules/events.php @@ -59,7 +59,7 @@ class EventsModule extends PLModule 'special' => true); } - $exclude = is_null($exclude) ? '' : ' AND id != ' . $exclude . ' '; + $exclude = is_null($exclude) ? '' : ' AND id != ' . intval($exclude) . ' '; $priority = rand(0, 510); do { $priority = (int)($priority/2); @@ -81,20 +81,20 @@ class EventsModule extends PLModule return $res->fetchOneAssoc(); } - private function upload_image(PlatalPage &$page, PlUpload &$upload) + private function upload_image(PlPage &$page, PlUpload &$upload) { if (@!$_FILES['image']['tmp_name'] && !Env::v('image_url')) { return true; } if (!$upload->upload($_FILES['image']) && !$upload->download(Env::v('image_url'))) { - $page->trig('Impossible de télécharger l\'image'); + $page->trigError('Impossible de télécharger l\'image'); return false; } elseif (!$upload->isType('image')) { - $page->trig('Le fichier n\'est pas une image valide au format JPEG, GIF ou PNG.'); + $page->trigError('Le fichier n\'est pas une image valide au format JPEG, GIF ou PNG.'); $upload->rm(); return false; } elseif (!$upload->resizeImage(200, 300, 100, 100, 32284)) { - $page->trig('Impossible de retraiter l\'image'); + $page->trigError('Impossible de retraiter l\'image'); return false; } return true; @@ -137,14 +137,14 @@ class EventsModule extends PLModule $page->assign('geoloc_incitation', count($res)); // ajout du lien RSS - if (S::has('core_rss_hash')) { + if (S::rssActivated()) { $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 evenements_vus.* + XDB::execute('DELETE ev.* FROM evenements_vus AS ev INNER JOIN evenements AS e ON e.id = ev.evt_id WHERE peremption < NOW()'); @@ -218,7 +218,7 @@ class EventsModule extends PLModule exit; } } else { - $upload = new PlUpload(S::v('forlife'), 'event'); + $upload = new PlUpload(S::user()->login(), 'event'); if ($upload->exists() && $upload->isType('image')) { header('Content-Type: ' . $upload->contentType()); echo $upload->getContents(); @@ -233,22 +233,9 @@ 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, e.post_id, p.attachmime IS NOT NULL AS photo, - IF(u2.nom_usage = "", u2.nom, u2.nom_usage) AS nom, u2.prenom, u2.promo, - FIND_IN_SET(\'wiki\', e.flags) AS wiki - 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) ) - LEFT JOIN evenements_photo AS p ON (p.eid = e.id) - INNER JOIN auth_user_md5 AS u2 ON (u2.user_id = e.user_id) - WHERE u.user_id = {?} AND FIND_IN_SET("valide", e.flags) - AND peremption >= NOW()', $uid); - $page->assign('rss', $rss); + $this->load('feed.inc.php'); + $feed = new EventFeed(); + return $feed->run($page, $user, $hash); } function handler_preview(&$page) @@ -272,8 +259,8 @@ class EventsModule extends PLModule $page->changeTpl('events/submit.tpl'); $page->addJsLink('ajax.js'); - require_once('wiki.inc.php'); - wiki_require_page('Xorg.Annonce'); + $wp = new PlWikiPage('Xorg.Annonce'); + $wp->buildCache(); $titre = Post::v('titre'); $texte = Post::v('texte'); @@ -282,14 +269,14 @@ class EventsModule extends PLModule $peremption = Post::i('peremption'); $valid_mesg = Post::v('valid_mesg'); $action = Post::v('action'); - $upload = new PlUpload(S::v('forlife'), 'event'); + $upload = new PlUpload(S::user()->login(), 'event'); $this->upload_image($page, $upload); 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"); + $page->trigError("L'intervalle de promotions n'est pas valide"); $action = null; } @@ -306,11 +293,13 @@ class EventsModule extends PLModule $upload->rm(); $page->assign('action', false); } elseif ($action && (!trim($texte) || !trim($titre))) { - $page->trig("L'article doit avoir un titre et un contenu"); + $page->trigError("L'article doit avoir un titre et un contenu"); } elseif ($action) { + S::assert_xsrf_token(); + require_once 'validations.inc.php'; $evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max, - $peremption, $valid_mesg, S::v('uid'), $upload); + $peremption, $valid_mesg, S::user(), $upload); $evtreq->submit(); $page->assign('ok', true); } elseif (!Env::v('preview')) { @@ -327,7 +316,7 @@ class EventsModule extends PLModule function handler_admin_tips(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title', 'Polytechnique.org - Administration - Astuces'); + $page->setTitle('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); @@ -348,36 +337,39 @@ class EventsModule extends PLModule { $page->changeTpl('events/admin.tpl'); $page->addJsLink('ajax.js'); - $page->assign('xorg_title','Polytechnique.org - Administration - Evenements'); + $page->setTitle('Administration - Evenements'); $page->register_modifier('hde', 'html_entity_decode'); $arch = $action == 'archives'; $page->assign('action', $action); - $upload = new PlUpload(S::v('forlife'), 'event'); + $upload = new PlUpload(S::user()->login(), 'event'); if ((Env::has('preview') || Post::v('action') == "Proposer") && $eid) { $action = 'edit'; $this->upload_image($page, $upload); } if (Post::v('action') == 'Pas d\'image' && $eid) { + S::assert_xsrf_token(); $upload->rm(); XDB::execute("DELETE FROM evenements_photo WHERE eid = {?}", $eid); $action = 'edit'; } elseif (Post::v('action') == 'Supprimer l\'image' && $eid) { + S::assert_xsrf_token(); $upload->rm(); $action = 'edit'; } elseif (Post::v('action') == "Proposer" && $eid) { + S::assert_xsrf_token(); $promo_min = Post::i('promo_min'); $promo_max = Post::i('promo_max'); if (($promo_min != 0 && ($promo_min <= 1900 || $promo_min >= 2020)) || ($promo_max != 0 && ($promo_max <= 1900 || $promo_max >= 2020 || $promo_max < $promo_min))) { - $page->trig("L'intervalle de promotions $promo_min -> $promo_max n'est pas valide"); + $page->trigError("L'intervalle de promotions $promo_min -> $promo_max n'est pas valide"); $action = 'edit'; } else { $res = XDB::query('SELECT flags FROM evenements WHERE id = {?}', $eid); - $flags = new FlagSet($res->fetchOneCell()); + $flags = new PlFlagSet($res->fetchOneCell()); $flags->addFlag('wiki'); if (Post::v('important')) { $flags->addFlag('important'); @@ -392,7 +384,7 @@ class EventsModule extends PLModule WHERE id = {?}', Post::v('titre'), Post::v('texte'), Post::v('peremption'), Post::v('promo_min'), Post::v('promo_max'), - $flags->flags(), $eid); + $flags, $eid); if ($upload->exists() && list($x, $y, $type) = $upload->imageInfo()) { XDB::execute('REPLACE INTO evenements_photo SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}', @@ -434,17 +426,20 @@ class EventsModule extends PLModule } else { switch ($action) { case 'delete': + S::assert_xsrf_token(); XDB::execute('DELETE from evenements WHERE id = {?}', $eid); break; case "archive": + S::assert_xsrf_token(); XDB::execute('UPDATE evenements SET creation_date = creation_date, flags = CONCAT(flags,",archive") WHERE id = {?}', $eid); break; case "unarchive": + S::assert_xsrf_token(); XDB::execute('UPDATE evenements SET creation_date = creation_date, flags = REPLACE(flags,"archive","") WHERE id = {?}', $eid); @@ -453,12 +448,14 @@ class EventsModule extends PLModule break; case "valid": + S::assert_xsrf_token(); XDB::execute('UPDATE evenements SET creation_date = creation_date, flags = CONCAT(flags,",valide") WHERE id = {?}', $eid); break; case "unvalid": + S::assert_xsrf_token(); XDB::execute('UPDATE evenements SET creation_date = creation_date, flags = REPLACE(flags,"valide", "") WHERE id = {?}', $eid);