X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=96885f81f7fb1ef30ed948fe13a7b5fb5075ebc6;hb=bf517dafc122edf6ccd86847f0626cfd0df9f340;hp=38244aa3a687cedc3576fe89393ac7ca2cff79fb;hpb=1970c12b2252d9357f59598e69b6c6044ef4e4c2;p=platal.git
diff --git a/modules/events.php b/modules/events.php
index 38244aa..96885f8 100644
--- a/modules/events.php
+++ b/modules/events.php
@@ -26,6 +26,7 @@ class EventsModule extends PLModule
return array(
'events' => $this->make_hook('ev', AUTH_COOKIE),
'rss' => $this->make_hook('rss', AUTH_PUBLIC),
+ 'events/preview' => $this->make_hook('preview', AUTH_PUBLIC, '', NO_AUTH),
'events/submit' => $this->make_hook('ev_submit', AUTH_MDP),
'admin/events' => $this->make_hook('admin_events', AUTH_MDP, 'admin'),
@@ -36,6 +37,26 @@ class EventsModule extends PLModule
function get_tips($exclude = null)
{
+ 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
+ SET last_version = {?}
+ WHERE user_id = {?}',
+ $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',
+ 'priorite' => 255,
+ 'promo_min' => 0,
+ 'promo_max' => 0,
+ 'state' => 'active',
+ 'special' => true);
+ }
+
$exclude = is_null($exclude) ? '' : ' AND id != ' . $exclude . ' ';
$priority = rand(0, 510);
do {
@@ -58,6 +79,41 @@ class EventsModule extends PLModule
return $res->fetchOneAssoc();
}
+ 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(e.flags, 'valide') 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,a.user_id,a.nom,a.prenom,a.promo,l.alias AS forlife
+ FROM evenements AS e
+ 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(e.flags, 'valide') 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;
+ }
+
function handler_ev(&$page, $action = 'list', $eid = null, $pound = null)
{
$page->changeTpl('events/index.tpl');
@@ -65,10 +121,10 @@ class EventsModule extends PLModule
$page->assign('tips', $this->get_tips());
$res = XDB::query('SELECT date, naissance FROM auth_user_md5
- WHERE user_id={?}', S::v('uid'));
+ WHERE user_id={?}', S::v('uid'));
list($date, $naissance) = $res->fetchOneRow();
- // incitation à mettre à jour la fiche
+ // incitation à mettre à jour la fiche
$d2 = mktime(0, 0, 0, substr($date, 5, 2), substr($date, 8, 2),
substr($date, 0, 4));
@@ -83,13 +139,13 @@ class EventsModule extends PLModule
$page->assign('birthday', date('Y') - substr($naissance, 0, 4));
}
- // incitation à mettre une photo
+ // incitation à mettre une photo
$res = XDB::query('SELECT COUNT(*) FROM photo
- WHERE uid={?}', S::v('uid'));
+ WHERE uid={?}', S::v('uid'));
$page->assign('photo_incitation', $res->fetchOneCell() == 0);
- // Incitation à se géolocaliser
+ // Incitation à se géolocaliser
require_once 'geoloc.inc.php';
$res = localize_addresses(S::v('uid', -1));
$page->assign('geoloc_incitation', count($res));
@@ -118,36 +174,16 @@ class EventsModule extends PLModule
pl_redirect('events#newsid'.$eid);
}
- // 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');
- $sql = "SELECT e.id,e.titre,e.texte,a.user_id,a.nom,a.prenom,a.promo,l.alias AS forlife
- FROM evenements AS e
- 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(e.flags, 'valide') 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
- ORDER BY (e.promo_min != 0 AND e.promo_max != 0) DESC, e.peremption";
- $page->assign('evenement',
- XDB::iterator($sql, S::v('uid'),
- $promo, $promo)
- );
-
- $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(e.flags, 'valide') AND peremption >= NOW()
- AND (e.promo_min = 0 || e.promo_min <= {?})
- AND (e.promo_max = 0 || e.promo_max >= {?})
- ORDER BY (e.promo_min != 0 AND e.promo_max != 0) DESC, e.peremption";
- $page->assign('evenement_summary',
- XDB::iterator($sql, S::v('uid'),
- $promo, $promo)
- );
+ $array = array();
+ $this->get_events('e.creation_date > DATE_SUB(CURDATE(), INTERVAL 2 DAY)',
+ '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)',
+ '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)',
+ 'e.peremption, e.creation_date DESC', $array, 'body');
+ $page->assign_by_ref('events', $array);
}
function handler_rss(&$page, $user = null, $hash = null)
@@ -166,11 +202,35 @@ class EventsModule extends PLModule
WHERE u.user_id = {?} AND FIND_IN_SET(e.flags, "valide")
AND peremption >= NOW()', $uid);
$page->assign('rss', $rss);
- }
+ }
+
+ function handler_preview(&$page)
+ {
+ require_once('url_catcher.inc.php');
+ $page->changeTpl('events/preview.tpl', NO_SKIN);
+ $texte = Get::v('texte');
+ if (!is_utf8($texte)) {
+ $texte = utf8_encode($texte);
+ }
+ if (strpos($_SERVER['HTTP_REFERER'], 'admin') === false) {
+ $texte = url_catcher(pl_entities($texte));
+ }
+ $titre = Get::v('titre');
+ if (!is_utf8($titre)) {
+ $titre = utf8_encode($titre);
+ }
+ $page->assign('texte_html', $texte);
+ $page->assign('titre', $titre);
+ header('Content-Type: text/html; charset=utf-8');
+ }
function handler_ev_submit(&$page)
{
$page->changeTpl('events/submit.tpl');
+ $page->addJsLink('ajax.js');
+
+ require_once('wiki.inc.php');
+ wiki_require_page('Xorg.Annonce');
$titre = Post::v('titre');
$texte = Post::v('texte');
@@ -202,7 +262,7 @@ class EventsModule extends PLModule
if ($action && (!trim($texte) || !trim($titre))) {
$page->trig("L'article doit avoir un titre et un contenu");
- } elseif ($action == 'Confirmer') {
+ } elseif ($action) {
$texte = $texte_catch_url;
require_once 'validations.inc.php';
$evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max,
@@ -230,7 +290,7 @@ class EventsModule extends PLModule
function handler_tips(&$page, $tips = null)
{
- header('Content-Type: text/html; charset="ISO-8859-15"');
+ header('Content-Type: text/html; charset="UTF-8"');
$page->changeTpl('include/tips.tpl', NO_SKIN);
$page->assign('tips', $this->get_tips($tips));
}
@@ -240,15 +300,16 @@ class EventsModule extends PLModule
$page->assign('xorg_title', 'Polytechnique.org - 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->describe('peremption', '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('state', 'actif', true);
$table_editor->describe('text', 'texte (html) de l\'astuce', false);
- $table_editor->describe('priorite', 'priorité (0=min, 256=max)', false);
+ $table_editor->describe('priorite', '0<=priorité<=255', true);
+ $table_editor->list_on_edit(false);
$table_editor->apply($page, $action, $id);
- if ($action == 'edit' && !is_null($id)) {
+ if (($action == 'edit' && !is_null($id)) || $action == 'update') {
$page->changeTpl('events/admin_tips.tpl');
}
}
@@ -256,6 +317,7 @@ class EventsModule extends PLModule
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->register_modifier('hde', 'html_entity_decode');
@@ -273,7 +335,8 @@ class EventsModule extends PLModule
$action = 'edit';
} else {
XDB::execute('UPDATE evenements
- SET titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?}
+ SET creation_date = creation_date,
+ titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?}
WHERE id = {?}',
Post::v('titre'), Post::v('texte'), Post::v('peremption'),
Post::v('promo_min'), Post::v('promo_max'), $eid);
@@ -287,6 +350,7 @@ class EventsModule extends PLModule
list($titre, $texte, $peremption, $promo_min, $promo_max) = $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);
@@ -356,4 +420,5 @@ class EventsModule extends PLModule
}
}
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>