X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=98d4a3702c216cab416ebdcbdc1df89124a94ad1;hb=94590511073104fbf5b565cf988e76182021ef47;hp=985499d79a90a70eb8e5103dc51185492d9ecf5a;hpb=fb813fb52d5ab65ca9a5b92b5cb9089523380d79;p=platal.git diff --git a/modules/events.php b/modules/events.php index 985499d..98d4a37 100644 --- a/modules/events.php +++ b/modules/events.php @@ -132,33 +132,33 @@ class EventsModule extends PLModule // 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 - 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 = {?}) + 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 peremption >= NOW() ORDER BY important DESC, news DESC, end DESC, e.peremption, e.creation_date DESC", S::i('uid')); @@ -191,7 +191,7 @@ 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(); pl_cached_dynamic_content_headers("image/" . $photo['attachmime']); @@ -341,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(); @@ -357,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')) { @@ -366,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 = {?} @@ -375,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(); @@ -386,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); @@ -416,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'; @@ -438,28 +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, 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, 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"; $page->assign('evs', XDB::iterator($sql));