X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fevents.php;h=a9dc2d55c374379d5d959da1f5e7908dacd9b53c;hb=94660e07a1ce471189edfb411d3e86e9be577220;hp=6cd7771404939b4fc3115316c1cf3a044a6772d9;hpb=d1e6167749fdad08c81e23d09e1bbbf76e3b989b;p=platal.git diff --git a/modules/events.php b/modules/events.php index 6cd7771..a9dc2d5 100644 --- a/modules/events.php +++ b/modules/events.php @@ -1,6 +1,6 @@ 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 = {?}) + 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() ORDER BY important DESC, news DESC, end DESC, e.peremption, e.creation_date DESC", S::i('uid')); @@ -191,10 +191,10 @@ 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; } @@ -202,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; } @@ -240,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) @@ -298,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)); } @@ -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,14 +438,14 @@ 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; @@ -459,7 +459,7 @@ class EventsModule extends PLModule 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));