X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=b4a36812d7dfed99711979bfe798c210ab24a332;hb=a5878ac19cc6ea75a753470cf68b7d2180d6cd51;hp=2ac6457827ab0100c49085072bd940096b3f1b19;hpb=02838718a24585bf72f3e4c26a8e4f1d19817dc9;p=platal.git diff --git a/modules/events.php b/modules/events.php index 2ac6457..b4a3681 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), + 'rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), 'events/preview' => $this->make_hook('preview', AUTH_PUBLIC, 'user', NO_AUTH), - 'events/photo' => $this->make_hook('photo', AUTH_COOKIE), + 'events/photo' => $this->make_hook('photo', AUTH_PUBLIC), 'events/submit' => $this->make_hook('ev_submit', AUTH_MDP), 'admin/events' => $this->make_hook('admin_events', AUTH_MDP, 'admin'), @@ -48,9 +48,10 @@ class EventsModule extends PLModule return array('id' => 0, 'titre' => 'Bienvenue sur la nouvelle version du site !', 'text' => 'Le site a été mis à jour depuis ta dernière visite vers la version ' . $globals->version - . '. Nous t\'invitons à en découvrir les nouveautés en te rendant sur ' - . 'nos forums ou en consultant ' - . 'la liste exhaustive des modifications', + . '.
Nous t\'invitons à faire un tour d\'horizon des ' + . 'nouveautés.

' + . 'Tu peux également retrouver ces informations sur ' + . 'les forums, ou sur la liste exhaustive des modifications.', 'priorite' => 255, 'promo_min' => 0, 'promo_max' => 0, @@ -76,45 +77,8 @@ class EventsModule extends PLModule } while ($priority && !$res->numRows()); if (!$res->numRows()) { return null; - } - return $res->fetchOneAssoc(); - } - - private function get_events($where, $order, array &$array, $name) - { - // affichage des evenements - // annonces promos triées par présence d'une limite sur les promos - // puis par dates croissantes d'expiration - $promo = S::v('promo'); - $uid = S::i('uid'); - $sql = "SELECT e.id,e.titre, ev.user_id IS NULL AS nonlu - FROM evenements AS e - LEFT JOIN evenements_vus AS ev ON (e.id = ev.evt_id AND ev.user_id = {?}) - WHERE FIND_IN_SET('valide', e.flags) AND peremption >= NOW() - AND (e.promo_min = 0 || e.promo_min <= {?}) - AND (e.promo_max = 0 || e.promo_max >= {?}) - AND $where - ORDER BY $order"; - $sum = XDB::iterator($sql, $uid, $promo, $promo); - if (!$sum->total()) { - return false; } - $sql = "SELECT e.id,e.titre,e.texte,a.user_id,a.nom,a.prenom,a.promo,l.alias AS forlife, - p.x, p.y, p.attach IS NOT NULL AS img - FROM evenements AS e - LEFT JOIN evenements_photo AS p ON (e.id = p.eid) - INNER JOIN auth_user_md5 AS a ON e.user_id=a.user_id - INNER JOIN aliases AS l ON ( a.user_id=l.id AND l.type='a_vie' ) - LEFT JOIN evenements_vus AS ev ON (e.id = ev.evt_id AND ev.user_id = {?}) - WHERE FIND_IN_SET('valide', e.flags) AND peremption >= NOW() - AND (e.promo_min = 0 || e.promo_min <= {?}) - AND (e.promo_max = 0 || e.promo_max >= {?}) - AND ev.user_id IS NULL - AND $where - ORDER BY $order"; - $evt = XDB::iterator($sql, $uid, $promo, $promo); - $array[$name] = array('events' => $evt, 'summary' => $sum); - return true; + return $res->fetchOneAssoc(); } private function upload_image(PlatalPage &$page, PlUpload &$upload) @@ -126,7 +90,7 @@ class EventsModule extends PLModule $page->trig('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->trig('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)) { @@ -181,7 +145,7 @@ class EventsModule extends PLModule // cache les evenements lus et raffiche les evenements a relire if ($action == 'read' && $eid) { XDB::execute('DELETE evenements_vus.* - FROM evenements_vus AS ev + 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({?},{?})', @@ -197,18 +161,41 @@ class EventsModule extends PLModule } $array = array(); - $this->get_events('FIND_IN_SET(\'important\', e.flags)', 'e.creation_date DESC', $array, 'important'); - $this->get_events('e.creation_date > DATE_SUB(CURDATE(), INTERVAL 2 DAY) - AND NOT FIND_IN_SET(\'important\', e.flags)', - 'e.creation_date DESC', $array, 'news'); - $this->get_events('e.peremption < DATE_ADD(CURDATE(), INTERVAL 2 DAY) - AND e.creation_date <= DATE_SUB(CURDATE(), INTERVAL 2 DAY) - AND NOT FIND_IN_SET(\'important\', e.flags)', - 'e.peremption, e.creation_date DESC', $array, 'end'); - $this->get_events('e.peremption >= DATE_ADD(CURDATE(), INTERVAL 2 DAY) - AND e.creation_date <= DATE_SUB(CURDATE(), INTERVAL 2 DAY) - AND NOT FIND_IN_SET(\'important\', e.flags)', - 'e.peremption, e.creation_date DESC', $array, 'body'); + $it = XDB::iterator("SELECT e.id,e.titre,e.texte,e.post_id,a.user_id,a.nom,a.prenom,a.promo,l.alias AS forlife, + p.x, p.y, p.attach IS NOT NULL AS img, FIND_IN_SET('wiki', e.flags) AS wiki, + FIND_IN_SET('important', e.flags) AS important, + e.creation_date > DATE_SUB(CURDATE(), INTERVAL 2 DAY) AS news, + e.peremption < DATE_ADD(CURDATE(), INTERVAL 2 DAY) AS end, + ev.user_id IS NULL AS nonlu + FROM evenements AS e + LEFT JOIN evenements_photo AS p ON (e.id = p.eid) + INNER JOIN auth_user_md5 AS a ON e.user_id=a.user_id + INNER JOIN aliases AS l ON ( a.user_id=l.id AND l.type='a_vie' ) + LEFT JOIN evenements_vus AS ev ON (e.id = ev.evt_id AND ev.user_id = {?}) + WHERE FIND_IN_SET('valide', e.flags) AND peremption >= NOW() + AND (e.promo_min = 0 || e.promo_min <= {?}) + AND (e.promo_max = 0 || e.promo_max >= {?}) + ORDER BY important DESC, news DESC, end DESC, e.peremption, e.creation_date DESC", + S::i('uid'), S::i('promo'), S::i('promo')); + $cats = array('important', 'news', 'end', 'body'); + $body = $it->next(); + foreach ($cats as $cat) { + $data = array(); + if (!$body) { + continue; + } + do { + if ($cat == 'body' || $body[$cat]) { + $data[] = $body; + } else { + break; + } + $body = $it->next(); + } while ($body); + if (!empty($data)) { + $array[$cat] = $data; + } + } $page->assign_by_ref('events', $array); } @@ -245,39 +232,37 @@ 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 + '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(e.flags, "valide") + WHERE u.user_id = {?} AND FIND_IN_SET("valide", e.flags) AND peremption >= NOW()', $uid); $page->assign('rss', $rss); } function handler_preview(&$page) { - require_once('url_catcher.inc.php'); $page->changeTpl('events/preview.tpl', NO_SKIN); $texte = Get::v('texte'); if (!is_utf8($texte)) { $texte = utf8_encode($texte); } - if (strpos($_SERVER['HTTP_REFERER'], 'admin') === false) { - $texte = url_catcher(pl_entities($texte)); - } $titre = Get::v('titre'); if (!is_utf8($titre)) { $titre = utf8_encode($titre); } - $page->assign('texte_html', $texte); + $page->assign('texte', $texte); $page->assign('titre', $titre); header('Content-Type: text/html; charset=utf-8'); } @@ -286,7 +271,7 @@ class EventsModule extends PLModule { $page->changeTpl('events/submit.tpl'); $page->addJsLink('ajax.js'); - + require_once('wiki.inc.php'); wiki_require_page('Xorg.Annonce'); @@ -308,12 +293,8 @@ class EventsModule extends PLModule $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); @@ -327,7 +308,6 @@ class EventsModule extends PLModule } elseif ($action && (!trim($texte) || !trim($titre))) { $page->trig("L'article doit avoir un titre et un contenu"); } elseif ($action) { - $texte = $texte_catch_url; require_once 'validations.inc.php'; $evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max, $peremption, $valid_mesg, S::v('uid'), $upload); @@ -336,22 +316,6 @@ class EventsModule extends PLModule } elseif (!Env::v('preview')) { $upload->rm(); } - - $select = ''; - for ($i = 1 ; $i < 30 ; $i++) { - $time = time() + 3600 * 24 * $i; - $p_stamp = date('Ymd', $time); - $year = date('Y', $time); - $month = date('m', $time); - $day = date('d', $time); - - $select .= "\n"; - } - $page->assign('select',$select); } function handler_tips(&$page, $tips = null) @@ -380,7 +344,7 @@ class EventsModule extends PLModule } } - function handler_admin_events(&$page, $action = 'list', $eid = null) + function handler_admin_events(&$page, $action = 'list', $eid = null) { $page->changeTpl('events/admin.tpl'); $page->addJsLink('ajax.js'); @@ -406,25 +370,26 @@ class EventsModule extends PLModule } elseif (Post::v('action') == "Proposer" && $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))) + 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"); $action = 'edit'; } else { $res = XDB::query('SELECT flags FROM evenements WHERE id = {?}', $eid); $flags = new FlagSet($res->fetchOneCell()); + $flags->addFlag('wiki'); if (Post::v('important')) { $flags->addFlag('important'); } else { $flags->rmFlag('important'); - } + } + XDB::execute('UPDATE evenements - SET creation_date = creation_date, + SET creation_date = creation_date, titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?}, flags = {?} - WHERE id = {?}', + WHERE id = {?}', Post::v('titre'), Post::v('texte'), Post::v('peremption'), Post::v('promo_min'), Post::v('promo_max'), $flags->flags(), $eid); @@ -434,7 +399,7 @@ class EventsModule extends PLModule $eid, $type, $x, $y, $upload->getContents()); $upload->rm(); } - } + } } if ($action == 'edit') { @@ -446,7 +411,6 @@ class EventsModule extends PLModule list($titre, $texte, $peremption, $promo_min, $promo_max, $important, $img) = $res->fetchOneRow(); $page->assign('titre',$titre); $page->assign('texte',$texte); - $page->assign('texte_html', pl_entity_decode($texte)); $page->assign('promo_min',$promo_min); $page->assign('promo_max',$promo_max); $page->assign('peremption',$peremption); @@ -462,7 +426,7 @@ class EventsModule extends PLModule $month=substr($p_stamp,4,2); $day=substr($p_stamp,6,2); - $select .= "\n"; } @@ -508,7 +472,8 @@ class EventsModule extends PLModule e.promo_min, e.promo_max, FIND_IN_SET('valide', e.flags) AS fvalide, FIND_IN_SET('archive', e.flags) AS farch, - u.promo, u.nom, u.prenom, a.alias AS forlife + u.promo, u.nom, u.prenom, a.alias AS forlife, + FIND_IN_SET('wiki', e.flags) AS wiki FROM evenements AS e INNER JOIN auth_user_md5 AS u ON(e.user_id = u.user_id) INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type='a_vie') @@ -518,7 +483,7 @@ class EventsModule extends PLModule } $page->assign('arch', $arch); $page->assign('admin_evts', true); - } + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: