X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=a9dc2d55c374379d5d959da1f5e7908dacd9b53c;hb=fe13bc1d7ba9f72d452ec07baf8538a74b7c67b8;hp=81dddc4695f92069c491dc357dfc9872f1f4fb8a;hpb=2553b7686e0678b8e27858a7c377e73ecb410aec;p=platal.git diff --git a/modules/events.php b/modules/events.php index 81dddc4..a9dc2d5 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, 'user', NO_HTTPS), - 'events/preview' => $this->make_hook('preview', AUTH_PUBLIC, 'user', NO_AUTH), - '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'), - - 'ajax/tips' => $this->make_hook('tips', AUTH_COOKIE, 'user', NO_AUTH), - 'admin/tips' => $this->make_hook('admin_tips', AUTH_MDP, 'admin'), + 'events' => $this->make_hook('ev', AUTH_COOKIE), + '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_PUBLIC), + '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, 'user', NO_AUTH), + 'admin/tips' => $this->make_hook('admin_tips', AUTH_MDP, 'admin'), ); } @@ -41,9 +41,9 @@ class EventsModule extends PLModule global $globals; // Add a new special tip when changing plat/al version if ($globals->version != S::v('last_version') && is_null($exclude)) { - XDB::execute('UPDATE auth_user_quick + XDB::execute('UPDATE accounts SET last_version = {?} - WHERE user_id = {?}', + WHERE uid = {?}', $globals->version, S::i('uid')); return array('id' => 0, 'titre' => 'Bienvenue sur la nouvelle version du site !', @@ -106,52 +106,43 @@ class EventsModule extends PLModule $page->addJsLink('ajax.js'); $page->assign('tips', $this->get_tips()); - // Profile update (appears when profile is > 400d old), and birthday - // oneboxes. - $res = XDB::query( - "SELECT date < DATE_SUB(NOW(), INTERVAL 400 DAY) AS is_profile_old, - MONTH(naissance) = MONTH(NOW()) AND DAYOFMONTH(naissance) = DAYOFMONTH(NOW()) AS is_birthday, - date AS profile_date, YEAR(NOW()) - YEAR(naissance) AS age - FROM auth_user_md5 - WHERE user_id = {?}", S::user()->id()); - list($is_profile_old, $is_birthday, $profile_date, $age) = $res->fetchOneRow(); - - if ($is_profile_old) { - $page->assign('fiche_incitation', $profile_date); + // Adds a reminder onebox to the page. + $user = S::user(); + require_once 'reminder.inc.php'; + if (($reminder = Reminder::GetCandidateReminder($user))) { + $reminder->Prepare($page); } - if ($is_birthday) { - $page->assign('birthday', $age); - } - - // No-photo onebox. - $res = XDB::query("SELECT COUNT(*) FROM photo WHERE uid = {?}", S::user()->id()); - $page->assign('photo_incitation', $res->fetchOneCell() == 0); - // Geo-location onebox. - require_once 'geoloc.inc.php'; - $res = localize_addresses(S::user()->id()); - $page->assign('geoloc_incitation', count($res)); + // Wishes "Happy birthday" when required + $profile = $user->profile(); + if (!is_null($profile)) { + if ($profile->next_birthday == date('Y-m-d')) { + $birthyear = (int)date('Y', strtotime($profile->birthdate)); + $curyear = (int)date('Y'); + $page->assign('birthday', $curyear - $birthyear); + } + } // Direct link to the RSS feed, when available. - if (S::rssActivated()) { + if (S::hasAuthToken()) { $page->setRssLink('Polytechnique.org :: News', - '/rss/'.S::v('hruid') .'/'.S::v('core_rss_hash').'/rss.xml'); + '/rss/'.S::v('hruid') .'/'.S::v('token').'/rss.xml'); } // Hide the read event, and reload the page to get to the next event. if ($action == 'read' && $eid) { XDB::execute('DELETE ev.* - FROM evenements_vus AS ev - INNER JOIN evenements AS e ON e.id = ev.evt_id + FROM announce_read AS ev + INNER JOIN announces AS e ON e.id = ev.evt_id WHERE peremption < NOW()'); - XDB::execute('REPLACE INTO evenements_vus VALUES({?},{?})', + XDB::execute('REPLACE INTO announce_read VALUES({?},{?})', $eid, S::v('uid')); pl_redirect('events#'.$pound); } // Unhide the requested event, and reload the page to display it. if ($action == 'unread' && $eid) { - XDB::execute('DELETE FROM evenements_vus + XDB::execute('DELETE FROM announce_read WHERE evt_id = {?} AND user_id = {?}', $eid, S::v('uid')); pl_redirect('events#newsid'.$eid); @@ -159,23 +150,23 @@ class EventsModule extends PLModule // Fetch the events to display, along with their metadata. $array = array(); - $it = XDB::iterator("SELECT e.id,e.titre,e.texte,e.post_id,a.user_id,a.nom,a.prenom,a.promo,a.hruid, + $it = XDB::iterator("SELECT e.id, e.titre, e.texte, e.post_id, e.user_id, 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 - LEFT JOIN evenements_vus AS ev ON (e.id = ev.evt_id AND ev.user_id = {?}) + ev.user_id IS NULL AS nonlu, e.promo_min, e.promo_max + FROM announces AS e + LEFT JOIN announce_photos AS p ON (e.id = p.eid) + LEFT JOIN announce_read 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')); + S::i('uid')); $cats = array('important', 'news', 'end', 'body'); - $body = $it->next(); + + $this->load('feed.inc.php'); + $user = S::user(); + $body = EventFeed::nextEvent($it, $user); foreach ($cats as $cat) { $data = array(); if (!$body) { @@ -187,22 +178,23 @@ class EventsModule extends PLModule } else { break; } - $body = $it->next(); + $body = EventFeed::nextEvent($it, $user); } while ($body); if (!empty($data)) { $array[$cat] = $data; } } + $page->assign_by_ref('events', $array); } function handler_photo(&$page, $eid = null, $valid = null) { if ($eid && $eid != 'valid') { - $res = XDB::query("SELECT * FROM evenements_photo WHERE eid = {?}", $eid); + $res = XDB::query("SELECT * FROM announce_photos WHERE eid = {?}", $eid); if ($res->numRows()) { $photo = $res->fetchOneAssoc(); - header('Content-Type: image/' . $photo['attachmime']); + pl_cached_dynamic_content_headers("image/" . $photo['attachmime']); echo $photo['attach']; exit; } @@ -210,20 +202,20 @@ class EventsModule extends PLModule require_once 'validations.inc.php'; $valid = Validate::get_request_by_id($valid); if ($valid && $valid->img) { - header('Content-Type: image/' . $valid->imgtype); + pl_cached_dynamic_content_headers("image/" . $valid->imgtype); echo $valid->img; exit; } } else { $upload = new PlUpload(S::user()->login(), 'event'); if ($upload->exists() && $upload->isType('image')) { - header('Content-Type: ' . $upload->contentType()); + pl_cached_dynamic_content_headers($upload->contentType()); echo $upload->getContents(); exit; } } global $globals; - header('Content-Type: image/png'); + pl_cached_dynamic_content_headers("image/png"); echo file_get_contents($globals->spoolroot . '/htdocs/images/logo.png'); exit; } @@ -248,7 +240,7 @@ class EventsModule extends PLModule } $page->assign('texte', $texte); $page->assign('titre', $titre); - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); } function handler_ev_submit(&$page) @@ -306,7 +298,7 @@ class EventsModule extends PLModule function handler_tips(&$page, $tips = null) { - header('Content-Type: text/html; charset="UTF-8"'); + pl_content_headers("text/html"); $page->changeTpl('include/tips.tpl', NO_SKIN); $page->assign('tips', $this->get_tips($tips)); } @@ -349,7 +341,7 @@ class EventsModule extends PLModule if (Post::v('action') == 'Pas d\'image' && $eid) { S::assert_xsrf_token(); $upload->rm(); - XDB::execute("DELETE FROM evenements_photo WHERE eid = {?}", $eid); + XDB::execute("DELETE FROM announce_photos WHERE eid = {?}", $eid); $action = 'edit'; } elseif (Post::v('action') == 'Supprimer l\'image' && $eid) { S::assert_xsrf_token(); @@ -365,7 +357,7 @@ class EventsModule extends PLModule $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); + $res = XDB::query('SELECT flags FROM announces WHERE id = {?}', $eid); $flags = new PlFlagSet($res->fetchOneCell()); $flags->addFlag('wiki'); if (Post::v('important')) { @@ -374,7 +366,7 @@ class EventsModule extends PLModule $flags->rmFlag('important'); } - XDB::execute('UPDATE evenements + XDB::execute('UPDATE announces SET creation_date = creation_date, titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?}, flags = {?} @@ -383,7 +375,7 @@ class EventsModule extends PLModule Post::v('promo_min'), Post::v('promo_max'), $flags, $eid); if ($upload->exists() && list($x, $y, $type) = $upload->imageInfo()) { - XDB::execute('REPLACE INTO evenements_photo + XDB::execute('REPLACE INTO announce_photos SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}', $eid, $type, $x, $y, $upload->getContents()); $upload->rm(); @@ -394,8 +386,8 @@ class EventsModule extends PLModule if ($action == 'edit') { $res = XDB::query('SELECT titre, texte, peremption, promo_min, promo_max, FIND_IN_SET(\'important\', flags), attach IS NOT NULL - FROM evenements AS e - LEFT JOIN evenements_photo AS p ON(e.id = p.eid) + FROM announces AS e + LEFT JOIN announce_photos AS p ON(e.id = p.eid) WHERE id={?}', $eid); list($titre, $texte, $peremption, $promo_min, $promo_max, $important, $img) = $res->fetchOneRow(); $page->assign('titre',$titre); @@ -424,20 +416,20 @@ class EventsModule extends PLModule switch ($action) { case 'delete': S::assert_xsrf_token(); - XDB::execute('DELETE from evenements + XDB::execute('DELETE from announces WHERE id = {?}', $eid); break; case "archive": S::assert_xsrf_token(); - XDB::execute('UPDATE evenements + XDB::execute('UPDATE announces SET creation_date = creation_date, flags = CONCAT(flags,",archive") WHERE id = {?}', $eid); break; case "unarchive": S::assert_xsrf_token(); - XDB::execute('UPDATE evenements + XDB::execute('UPDATE announces SET creation_date = creation_date, flags = REPLACE(flags,"archive","") WHERE id = {?}', $eid); $action = 'archives'; @@ -446,30 +438,28 @@ class EventsModule extends PLModule case "valid": S::assert_xsrf_token(); - XDB::execute('UPDATE evenements + XDB::execute('UPDATE announces SET creation_date = creation_date, flags = CONCAT(flags,",valide") WHERE id = {?}', $eid); break; case "unvalid": S::assert_xsrf_token(); - XDB::execute('UPDATE evenements + XDB::execute('UPDATE announces SET creation_date = creation_date, flags = REPLACE(flags,"valide", "") WHERE id = {?}', $eid); break; } $pid = ($eid && $action == 'preview') ? $eid : -1; - $sql = "SELECT e.id, e.titre, e.texte,e.id = $pid AS preview, + $sql = "SELECT e.id, e.titre, e.texte,e.id = $pid AS preview, e.user_id, DATE_FORMAT(e.creation_date,'%d/%m/%Y %T') AS creation_date, DATE_FORMAT(e.peremption,'%d/%m/%Y') AS peremption, 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, u.hruid, 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) + FROM announces AS e WHERE ".($arch ? "" : "!")."FIND_IN_SET('archive',e.flags) ORDER BY FIND_IN_SET('valide',e.flags), e.peremption DESC"; $page->assign('evs', XDB::iterator($sql));