X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=eebfa82c219636e5f99ef61de91d88549220654f;hb=e5ef86153a88317faaa15441b6aabde24b35a78b;hp=2ccd14aa2362cdd1f5b7893aa1f82a228ffa7546;hpb=1b602af5faa3a20d03b7ec28ffcba3e7f36a8514;p=platal.git
diff --git a/modules/events.php b/modules/events.php
index 2ccd14a..eebfa82 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),
- '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,16 +41,17 @@ 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 !',
'text' => 'Le site a été mis à jour depuis ta dernière visite vers la version ' . $globals->version
- . '. Nous t\'invitons à en découvrir les nouveautés en te rendant sur '
- . 'nos forums ou en consultant '
- . 'la liste exhaustive des modifications',
+ . '.
Nous t\'invitons à faire un tour d\'horizon des '
+ . 'nouveautés.
'
+ . 'Tu peux également retrouver ces informations sur '
+ . 'les forums, ou sur la liste exhaustive des modifications.',
'priorite' => 255,
'promo_min' => 0,
'promo_max' => 0,
@@ -58,16 +59,16 @@ class EventsModule extends PLModule
'special' => true);
}
- $exclude = is_null($exclude) ? '' : ' AND id != ' . $exclude . ' ';
+ $exclude = is_null($exclude) ? '' : ' AND id != ' . intval($exclude) . ' ';
$priority = rand(0, 510);
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()
@@ -76,61 +77,24 @@ class EventsModule extends PLModule
} while ($priority && !$res->numRows());
if (!$res->numRows()) {
return null;
- }
- return $res->fetchOneAssoc();
- }
-
- private function get_events($where, $order, array &$array, $name)
- {
- // affichage des evenements
- // annonces promos triées par présence d'une limite sur les promos
- // puis par dates croissantes d'expiration
- $promo = S::v('promo');
- $uid = S::i('uid');
- $sql = "SELECT e.id,e.titre, ev.user_id IS NULL AS nonlu
- FROM evenements AS e
- 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 >= {?})
- AND $where
- ORDER BY $order";
- $sum = XDB::iterator($sql, $uid, $promo, $promo);
- if (!$sum->total()) {
- return false;
}
- $sql = "SELECT e.id,e.titre,e.texte,e.post_id,a.user_id,a.nom,a.prenom,a.promo,l.alias AS forlife,
- p.x, p.y, p.attach IS NOT NULL AS img
- 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 aliases AS l ON ( a.user_id=l.id AND l.type='a_vie' )
- 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 >= {?})
- AND ev.user_id IS NULL
- AND $where
- ORDER BY $order";
- $evt = XDB::iterator($sql, $uid, $promo, $promo);
- $array[$name] = array('events' => $evt, 'summary' => $sum);
- return true;
+ return $res->fetchOneAssoc();
}
- private function upload_image(PlatalPage &$page, PlUpload &$upload)
+ private function upload_image(PlPage &$page, PlUpload &$upload)
{
if (@!$_FILES['image']['tmp_name'] && !Env::v('image_url')) {
return true;
}
if (!$upload->upload($_FILES['image']) && !$upload->download(Env::v('image_url'))) {
- $page->trig('Impossible de télécharger l\'image');
+ $page->trigError('Impossible de télécharger l\'image');
return false;
} elseif (!$upload->isType('image')) {
- $page->trig('Le fichier n\'est pas une image valide au format JPEG, GIF ou PNG');
+ $page->trigError('Le fichier n\'est pas une image valide au format JPEG, GIF ou PNG.');
$upload->rm();
return false;
} elseif (!$upload->resizeImage(200, 300, 100, 100, 32284)) {
- $page->trig('Impossible de retraiter l\'image');
+ $page->trigError('Impossible de retraiter l\'image');
return false;
}
return true;
@@ -142,83 +106,95 @@ class EventsModule extends PLModule
$page->addJsLink('ajax.js');
$page->assign('tips', $this->get_tips());
- $res = XDB::query('SELECT date, naissance FROM auth_user_md5
- WHERE user_id={?}', S::v('uid'));
- list($date, $naissance) = $res->fetchOneRow();
-
- // incitation à mettre à jour la fiche
-
- $d2 = mktime(0, 0, 0, substr($date, 5, 2), substr($date, 8, 2),
- substr($date, 0, 4));
- if( (time() - $d2) > 60 * 60 * 24 * 400 ) {
- // si fiche date de + de 400j;
- $page->assign('fiche_incitation', $date);
+ // Adds a reminder onebox to the page.
+ $user = S::user();
+ require_once 'reminder.inc.php';
+ if (($reminder = Reminder::GetCandidateReminder($user))) {
+ $reminder->Prepare($page);
}
- // Souhaite bon anniversaire
-
- if (substr($naissance, 5) == date('m-d')) {
- $page->assign('birthday', date('Y') - substr($naissance, 0, 4));
+ // 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);
+ }
}
- // incitation à mettre une photo
-
- $res = XDB::query('SELECT COUNT(*) FROM photo
- WHERE uid={?}', S::v('uid'));
- $page->assign('photo_incitation', $res->fetchOneCell() == 0);
-
- // Incitation à se géolocaliser
- require_once 'geoloc.inc.php';
- $res = localize_addresses(S::v('uid', -1));
- $page->assign('geoloc_incitation', count($res));
-
- // ajout du lien RSS
- if (S::has('core_rss_hash')) {
+ // Direct link to the RSS feed, when available.
+ if (S::hasAuthToken()) {
$page->setRssLink('Polytechnique.org :: News',
- '/rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml');
+ '/rss/'.S::v('hruid') .'/'.S::v('token').'/rss.xml');
}
- // cache les evenements lus et raffiche les evenements a relire
+ // Hide the read event, and reload the page to get to the next event.
if ($action == 'read' && $eid) {
- XDB::execute('DELETE evenements_vus.*
- 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({?},{?})',
+ XDB::execute('DELETE ev.*
+ FROM announce_read AS ev
+ INNER JOIN announces AS e ON e.id = ev.evt_id
+ WHERE expiration < NOW()');
+ 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();
- $this->get_events('FIND_IN_SET(\'important\', e.flags)', 'e.creation_date DESC', $array, 'important');
- $this->get_events('e.creation_date > DATE_SUB(CURDATE(), INTERVAL 2 DAY)
- AND NOT FIND_IN_SET(\'important\', e.flags)',
- 'e.creation_date DESC', $array, 'news');
- $this->get_events('e.peremption < DATE_ADD(CURDATE(), INTERVAL 2 DAY)
- AND e.creation_date <= DATE_SUB(CURDATE(), INTERVAL 2 DAY)
- AND NOT FIND_IN_SET(\'important\', e.flags)',
- 'e.peremption, e.creation_date DESC', $array, 'end');
- $this->get_events('e.peremption >= DATE_ADD(CURDATE(), INTERVAL 2 DAY)
- AND e.creation_date <= DATE_SUB(CURDATE(), INTERVAL 2 DAY)
- AND NOT FIND_IN_SET(\'important\', e.flags)',
- 'e.peremption, e.creation_date DESC', $array, 'body');
+ $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.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');
+
+ $this->load('feed.inc.php');
+ $user = S::user();
+ $body = EventFeed::nextEvent($it, $user);
+ foreach ($cats as $cat) {
+ $data = array();
+ if (!$body) {
+ continue;
+ }
+ do {
+ if ($cat == 'body' || $body[$cat]) {
+ $data[] = $body;
+ } else {
+ break;
+ }
+ $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;
}
@@ -226,41 +202,29 @@ 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::v('forlife'), 'event');
+ $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)
- {
- require_once 'rss.inc.php';
-
- $uid = init_rss('events/rss.tpl', $user, $hash);
-
- $rss = XDB::iterator(
- 'SELECT e.id, e.titre, e.texte, e.creation_date, e.post_id, p.attachmime IS NOT NULL AS photo,
- IF(u2.nom_usage = "", u2.nom, u2.nom_usage) AS nom, u2.prenom, u2.promo
- FROM auth_user_md5 AS u
- INNER JOIN evenements AS e ON ( (e.promo_min = 0 || e.promo_min <= u.promo)
- AND (e.promo_max = 0 || e.promo_max >= u.promo) )
- LEFT JOIN evenements_photo AS p ON (p.eid = e.id)
- INNER JOIN auth_user_md5 AS u2 ON (u2.user_id = e.user_id)
- WHERE u.user_id = {?} AND FIND_IN_SET("valide", e.flags)
- AND peremption >= NOW()', $uid);
- $page->assign('rss', $rss);
+ {
+ $this->load('feed.inc.php');
+ $feed = new EventFeed();
+ return $feed->run($page, $user, $hash);
}
function handler_preview(&$page)
@@ -270,52 +234,46 @@ class EventsModule extends PLModule
if (!is_utf8($texte)) {
$texte = utf8_encode($texte);
}
- if (strpos($_SERVER['HTTP_REFERER'], 'admin') === false) {
- $texte = MiniWiki::WikiToHTML($texte);
- }
$titre = Get::v('titre');
if (!is_utf8($titre)) {
$titre = utf8_encode($titre);
}
- $page->assign('texte_html', $texte);
+ $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');
-
- require_once('wiki.inc.php');
- wiki_require_page('Xorg.Annonce');
+
+ $wp = new PlWikiPage('Xorg.Annonce');
+ $wp->buildCache();
$titre = Post::v('titre');
$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::v('forlife'), 'event');
+ $upload = new PlUpload(S::user()->login(), 'event');
$this->upload_image($page, $upload);
if (($promo_min > $promo_max && $promo_max != 0)||
($promo_min != 0 && ($promo_min <= 1900 || $promo_min >= 2020)) ||
($promo_max != 0 && ($promo_max <= 1900 || $promo_max >= 2020)))
{
- $page->trig("L'intervalle de promotions n'est pas valide");
+ $page->trigError("L'intervalle de promotions n'est pas valide");
$action = null;
}
- $texte_catch_url = MiniWiki::WikiToHTML($texte);
-
$page->assign('titre', $titre);
$page->assign('texte', $texte);
- $page->assign('texte_html', $texte_catch_url);
$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);
@@ -324,12 +282,13 @@ class EventsModule extends PLModule
$upload->rm();
$page->assign('action', false);
} elseif ($action && (!trim($texte) || !trim($titre))) {
- $page->trig("L'article doit avoir un titre et un contenu");
+ $page->trigError("L'article doit avoir un titre et un contenu");
} elseif ($action) {
- $texte = $texte_catch_url;
+ S::assert_xsrf_token();
+
require_once 'validations.inc.php';
$evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max,
- $peremption, $valid_mesg, S::v('uid'), $upload);
+ $expiration, $valid_mesg, S::user(), $upload);
$evtreq->submit();
$page->assign('ok', true);
} elseif (!Env::v('preview')) {
@@ -339,17 +298,17 @@ 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));
}
function handler_admin_tips(&$page, $action = 'list', $id = null)
{
- $page->assign('xorg_title', 'Polytechnique.org - Administration - Astuces');
+ $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);
@@ -363,75 +322,79 @@ class EventsModule extends PLModule
}
}
- function handler_admin_events(&$page, $action = 'list', $eid = null)
+ function handler_admin_events(&$page, $action = 'list', $eid = null)
{
$page->changeTpl('events/admin.tpl');
$page->addJsLink('ajax.js');
- $page->assign('xorg_title','Polytechnique.org - Administration - Evenements');
+ $page->setTitle('Administration - Evenements');
$page->register_modifier('hde', 'html_entity_decode');
$arch = $action == 'archives';
$page->assign('action', $action);
- $upload = new PlUpload(S::v('forlife'), 'event');
+ $upload = new PlUpload(S::user()->login(), 'event');
if ((Env::has('preview') || Post::v('action') == "Proposer") && $eid) {
$action = 'edit';
$this->upload_image($page, $upload);
}
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();
$upload->rm();
$action = 'edit';
} elseif (Post::v('action') == "Proposer" && $eid) {
+ S::assert_xsrf_token();
$promo_min = Post::i('promo_min');
$promo_max = Post::i('promo_max');
if (($promo_min != 0 && ($promo_min <= 1900 || $promo_min >= 2020)) ||
($promo_max != 0 && ($promo_max <= 1900 || $promo_max >= 2020 || $promo_max < $promo_min)))
{
- $page->trig("L'intervalle de promotions $promo_min -> $promo_max n'est pas valide");
+ $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);
- $flags = new FlagSet($res->fetchOneCell());
+ $res = XDB::query('SELECT flags FROM announces WHERE id = {?}', $eid);
+ $flags = new PlFlagSet($res->fetchOneCell());
+ $flags->addFlag('wiki');
if (Post::v('important')) {
$flags->addFlag('important');
} else {
$flags->rmFlag('important');
- }
- XDB::execute('UPDATE evenements
- SET creation_date = creation_date,
- titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?},
+ }
+
+ XDB::execute('UPDATE announces
+ SET creation_date = creation_date,
+ titre={?}, texte={?}, expiration={?}, promo_min={?}, promo_max={?},
flags = {?}
- WHERE id = {?}',
- Post::v('titre'), Post::v('texte'), Post::v('peremption'),
+ WHERE id = {?}',
+ Post::v('titre'), Post::v('texte'), Post::v('expiration'),
Post::v('promo_min'), Post::v('promo_max'),
- $flags->flags(), $eid);
+ $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();
}
- }
+ }
}
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('texte_html', pl_entity_decode($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);
@@ -444,26 +407,29 @@ class EventsModule extends PLModule
$month=substr($p_stamp,4,2);
$day=substr($p_stamp,6,2);
- $select .= "\n";
}
$page->assign('select',$select);
} else {
switch ($action) {
case 'delete':
- XDB::execute('DELETE from evenements
+ S::assert_xsrf_token();
+ XDB::execute('DELETE from announces
WHERE id = {?}', $eid);
break;
case "archive":
- XDB::execute('UPDATE evenements
+ S::assert_xsrf_token();
+ XDB::execute('UPDATE announces
SET creation_date = creation_date, flags = CONCAT(flags,",archive")
WHERE id = {?}', $eid);
break;
case "unarchive":
- XDB::execute('UPDATE evenements
+ S::assert_xsrf_token();
+ XDB::execute('UPDATE announces
SET creation_date = creation_date, flags = REPLACE(flags,"archive","")
WHERE id = {?}', $eid);
$action = 'archives';
@@ -471,36 +437,36 @@ class EventsModule extends PLModule
break;
case "valid":
- XDB::execute('UPDATE evenements
+ S::assert_xsrf_token();
+ XDB::execute('UPDATE announces
SET creation_date = creation_date, flags = CONCAT(flags,",valide")
WHERE id = {?}', $eid);
break;
case "unvalid":
- XDB::execute('UPDATE evenements
+ S::assert_xsrf_token();
+ 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.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,
- u.promo, u.nom, u.prenom, a.alias AS forlife
- FROM evenements AS e
- INNER JOIN auth_user_md5 AS u ON(e.user_id = u.user_id)
- INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type='a_vie')
+ FIND_IN_SET('wiki', e.flags) AS wiki
+ 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);
$page->assign('admin_evts', true);
- }
+ }
}
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: