X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=469bce1ec9b7dcdde625c390ce98a660f84268a8;hb=714f5437ddf637fc9514709a4bb07c6c5eb71542;hp=e49dc70201c42c0f622ef087a6dbff7db61cb422;hpb=429e4a4b8eb428e9631513fc6bb053b4635c7729;p=platal.git diff --git a/modules/events.php b/modules/events.php index e49dc70..469bce1 100644 --- a/modules/events.php +++ b/modules/events.php @@ -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 !', @@ -114,18 +114,19 @@ class EventsModule extends PLModule } // Wishes "Happy birthday" when required - $res = XDB::query( - 'SELECT MONTH(naissance) = MONTH(NOW()) - AND DAYOFMONTH(naissance) = DAYOFMONTH(NOW()) AS is_birthday - FROM auth_user_md5 - WHERE user_id = {?}', - $user->id()); - $page->assign('birthday', $res->fetchOneCell()); + $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. @@ -149,24 +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, d.promo AS promo_display ,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 + ev.user_id IS NULL AS nonlu, e.promo_min, e.promo_max 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 profile_display AS d ON (d.pid = a.user_id) 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')); + 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) { @@ -178,12 +178,13 @@ 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); } @@ -193,7 +194,7 @@ class EventsModule extends PLModule $res = XDB::query("SELECT * FROM evenements_photo 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; } @@ -201,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; } @@ -239,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) @@ -297,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)); } @@ -451,16 +452,14 @@ class EventsModule extends PLModule } $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) 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));