X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=c37c2f81f38eb6cb0e2b6b57b501348af92843fc;hb=190efb3a08127072aa3e0876a79e7bf76aa77051;hp=0a16d146a1f3e40fe7e86fb42d7896de2e656328;hpb=2f8bacc215bab9d9e3401e73004574cfb0eb4540;p=platal.git diff --git a/modules/events.php b/modules/events.php index 0a16d14..c37c2f8 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), + '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'), + 'rss' => $this->make_token_hook('rss', AUTH_COOKIE), + + 'ajax/tips' => $this->make_hook('tips', AUTH_COOKIE, 'user', NO_AUTH), + 'admin/tips' => $this->make_hook('admin_tips', AUTH_MDP, 'admin'), ); } @@ -40,7 +40,7 @@ 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)) { + if ($globals->version != S::user()->last_version && is_null($exclude)) { XDB::execute('UPDATE accounts SET last_version = {?} WHERE uid = {?}', @@ -64,11 +64,11 @@ class EventsModule extends PLModule do { $priority = (int)($priority/2); $res = XDB::query("SELECT * - FROM tips - WHERE (peremption = '0000-00-00' OR peremption > CURDATE()) + FROM reminder_tips + WHERE (expiration = '0000-00-00' OR expiration > CURDATE()) AND (promo_min = 0 OR promo_min <= {?}) AND (promo_max = 0 OR promo_max >= {?}) - AND (priorite >= {?}) + AND (priority >= {?}) AND (state = 'active') $exclude ORDER BY RAND() @@ -103,17 +103,27 @@ class EventsModule extends PLModule function handler_ev(&$page, $action = 'list', $eid = null, $pound = null) { $page->changeTpl('events/index.tpl'); - $page->addJsLink('ajax.js'); - $page->assign('tips', $this->get_tips()); - // Profile update (appears when profile is > 400d old), and birthday - // oneboxes. $user = S::user(); + + /** XXX: Tips and reminder only for user with 'email' permission. + * We can do better in the future by storing a userfilter + * with the tip/reminder. + */ + if ($user->checkPerms(User::PERM_MAIL)) { + $page->assign('tips', $this->get_tips()); + + } + + // Adds a reminder onebox to the page. + require_once 'reminder.inc.php'; + if (($reminder = Reminder::GetCandidateReminder($user))) { + $reminder->Prepare($page); + } + + // Wishes "Happy birthday" when required $profile = $user->profile(); if (!is_null($profile)) { - if (strtotime($profile->last_change) < time() - (400 * 86400)) { - $page->assign('fiche_incitation', $profile->last_change); - } if ($profile->next_birthday == date('Y-m-d')) { $birthyear = (int)date('Y', strtotime($profile->birthdate)); $curyear = (int)date('Y'); @@ -121,55 +131,45 @@ class EventsModule extends PLModule } } - // 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 "geocoding.inc.php"; - $page->assign('geoloc_incitation', Geocoder::countNonGeocoded(S::user()->id())); - // Direct link to the RSS feed, when available. if (S::hasAuthToken()) { $page->setRssLink('Polytechnique.org :: News', - '/rss/'.S::v('hruid') .'/'.S::v('token').'/rss.xml'); + '/rss/' . S::v('hruid') . '/' . S::user()->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 - WHERE peremption < NOW()'); - XDB::execute('REPLACE INTO evenements_vus VALUES({?},{?})', - $eid, S::v('uid')); + FROM announce_read AS ev + INNER JOIN announces AS e ON e.id = ev.evt_id + WHERE expiration < NOW()'); + XDB::execute('INSERT IGNORE INTO announce_read (evt_id, uid) + 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 - WHERE evt_id = {?} AND user_id = {?}', + XDB::execute('DELETE FROM announce_read + WHERE evt_id = {?} AND uid = {?}', $eid, S::v('uid')); pl_redirect('events#newsid'.$eid); } // Fetch the events to display, along with their metadata. $array = array(); - $it = XDB::iterator("SELECT e.id, e.titre, e.texte, e.post_id, e.user_id, + $it = XDB::iterator("SELECT e.id, e.titre, e.texte, e.post_id, e.uid, 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, e.promo_min, e.promo_max - FROM evenements AS e - LEFT JOIN evenements_photo AS p ON (e.id = p.eid) - 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() - ORDER BY important DESC, news DESC, end DESC, e.peremption, e.creation_date DESC", + e.expiration < DATE_ADD(CURDATE(), INTERVAL 2 DAY) AS end, + ev.uid 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.uid = {?}) + WHERE FIND_IN_SET('valide', e.flags) AND expiration >= NOW() + ORDER BY important DESC, news DESC, end DESC, e.expiration, e.creation_date DESC", S::i('uid')); $cats = array('important', 'news', 'end', 'body'); @@ -200,40 +200,39 @@ class EventsModule extends PLModule 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; } } elseif ($eid == 'valid') { - 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; } - function handler_rss(&$page, $user = null, $hash = null) + function handler_rss(PlPage& $page, PlPage& $user) { $this->load('feed.inc.php'); $feed = new EventFeed(); - return $feed->run($page, $user, $hash); + return $feed->run($page, $user); } function handler_preview(&$page) @@ -249,13 +248,12 @@ 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) { $page->changeTpl('events/submit.tpl'); - $page->addJsLink('ajax.js'); $wp = new PlWikiPage('Xorg.Annonce'); $wp->buildCache(); @@ -264,7 +262,7 @@ class EventsModule extends PLModule $texte = Post::v('texte'); $promo_min = Post::i('promo_min'); $promo_max = Post::i('promo_max'); - $peremption = Post::i('peremption'); + $expiration = Post::i('expiration'); $valid_mesg = Post::v('valid_mesg'); $action = Post::v('action'); $upload = new PlUpload(S::user()->login(), 'event'); @@ -282,7 +280,7 @@ class EventsModule extends PLModule $page->assign('texte', $texte); $page->assign('promo_min', $promo_min); $page->assign('promo_max', $promo_max); - $page->assign('peremption', $peremption); + $page->assign('expiration', $expiration); $page->assign('valid_mesg', $valid_mesg); $page->assign('action', strtolower($action)); $page->assign_by_ref('upload', $upload); @@ -295,9 +293,8 @@ class EventsModule extends PLModule } elseif ($action) { S::assert_xsrf_token(); - require_once 'validations.inc.php'; $evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max, - $peremption, $valid_mesg, S::user(), $upload); + $expiration, $valid_mesg, S::user(), $upload); $evtreq->submit(); $page->assign('ok', true); } elseif (!Env::v('preview')) { @@ -307,7 +304,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)); } @@ -316,14 +313,14 @@ class EventsModule extends PLModule { $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); + $table_editor = new PLTableEditor('admin/tips', 'reminder_tips', 'id'); + $table_editor->describe('expiration', '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('title', 'titre', true); $table_editor->describe('state', 'actif', true); $table_editor->describe('text', 'texte (html) de l\'astuce', false); - $table_editor->describe('priorite', '0<=priorité<=255', true); + $table_editor->describe('priority', '0<=priorité<=255', true); $table_editor->list_on_edit(false); $table_editor->apply($page, $action, $id); if (($action == 'edit' && !is_null($id)) || $action == 'update') { @@ -334,7 +331,6 @@ class EventsModule extends PLModule function handler_admin_events(&$page, $action = 'list', $eid = null) { $page->changeTpl('events/admin.tpl'); - $page->addJsLink('ajax.js'); $page->setTitle('Administration - Evenements'); $page->register_modifier('hde', 'html_entity_decode'); @@ -350,7 +346,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(); @@ -366,7 +362,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')) { @@ -375,35 +371,36 @@ 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={?}, + titre={?}, texte={?}, expiration={?}, promo_min={?}, promo_max={?}, flags = {?} WHERE id = {?}', - Post::v('titre'), Post::v('texte'), Post::v('peremption'), + Post::v('titre'), Post::v('texte'), Post::v('expiration'), 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 - SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}', - $eid, $type, $x, $y, $upload->getContents()); + XDB::execute('INSERT INTO announce_photos (eid, attachmime, attach, x, y) + VALUES ({?}, {?}, {?}, {?}, {?}) + ON DUPLICATE KEY UPDATE attachmime = VALUES(attachmime), attach = VALUES(attach), x = VALUES(x), y = VALUES(y)', + $eid, $type, $upload->getContents(), $x, $y); $upload->rm(); } } } if ($action == 'edit') { - $res = XDB::query('SELECT titre, texte, peremption, promo_min, promo_max, FIND_IN_SET(\'important\', flags), + $res = XDB::query('SELECT titre, texte, expiration, 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(); + list($titre, $texte, $expiration, $promo_min, $promo_max, $important, $img) = $res->fetchOneRow(); $page->assign('titre',$titre); $page->assign('texte',$texte); $page->assign('promo_min',$promo_min); $page->assign('promo_max',$promo_max); - $page->assign('peremption',$peremption); + $page->assign('expiration',$expiration); $page->assign('important', $important); $page->assign('eid', $eid); $page->assign('img', $img); @@ -417,7 +414,7 @@ class EventsModule extends PLModule $day=substr($p_stamp,6,2); $select .= "\n"; } $page->assign('select',$select); @@ -425,20 +422,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'; @@ -447,30 +444,30 @@ 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, e.user_id, + $sql = "SELECT e.id, e.titre, e.texte,e.id = $pid AS preview, e.uid, DATE_FORMAT(e.creation_date,'%d/%m/%Y %T') AS creation_date, - DATE_FORMAT(e.peremption,'%d/%m/%Y') AS peremption, + DATE_FORMAT(e.expiration,'%d/%m/%Y') AS expiration, e.promo_min, e.promo_max, FIND_IN_SET('valide', e.flags) AS fvalide, FIND_IN_SET('archive', e.flags) AS farch, FIND_IN_SET('wiki', e.flags) AS wiki - FROM evenements AS e + FROM announces AS e WHERE ".($arch ? "" : "!")."FIND_IN_SET('archive',e.flags) - ORDER BY FIND_IN_SET('valide',e.flags), e.peremption DESC"; + ORDER BY FIND_IN_SET('valide',e.flags), e.expiration DESC"; $page->assign('evs', XDB::iterator($sql)); } $page->assign('arch', $arch);