X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=b3e2d876d580477a19a9c0ec64c7d80cd08b7b7a;hb=e219710aa66342ed9e7593e68a77f2049dbbf6d7;hp=ded323ca8f5c588da720ad3a5c51a139f8f19907;hpb=5ddeb07cc787dd1dc3630a31f1528f5cc7c4d9b9;p=platal.git
diff --git a/modules/events.php b/modules/events.php
index ded323c..b3e2d87 100644
--- a/modules/events.php
+++ b/modules/events.php
@@ -26,16 +26,38 @@ 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, '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, '', NO_AUTH),
+ 'ajax/tips' => $this->make_hook('tips', AUTH_COOKIE, 'user', NO_AUTH),
'admin/tips' => $this->make_hook('admin_tips', AUTH_MDP, 'admin'),
);
}
- function get_tips($exclude = null)
+ private 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 +80,62 @@ class EventsModule extends PLModule
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;
+ }
+
+ private function upload_image(PlatalPage &$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');
+ return false;
+ } elseif (!$upload->isType('image')) {
+ $page->trig('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');
+ return false;
+ }
+ return true;
+ }
+
function handler_ev(&$page, $action = 'list', $eid = null, $pound = null)
{
$page->changeTpl('events/index.tpl');
@@ -65,10 +143,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 +161,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 +196,52 @@ 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)
- );
+ $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');
+ $page->assign_by_ref('events', $array);
+ }
- $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)
- );
+ function handler_photo(&$page, $eid = null, $valid = null)
+ {
+ if ($eid && $eid != 'valid') {
+ $res = XDB::query("SELECT * FROM evenements_photo WHERE eid = {?}", $eid);
+ if ($res->numRows()) {
+ $photo = $res->fetchOneAssoc();
+ header('Content-Type: 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);
+ echo $valid->img;
+ exit;
+ }
+ } else {
+ $upload = new PlUpload(S::v('forlife'), 'event');
+ if ($upload->exists() && $upload->isType('image')) {
+ header('Content-Type: ' . $upload->contentType());
+ echo $upload->getContents();
+ exit;
+ }
+ }
+ global $globals;
+ header('Content-Type: image/png');
+ echo file_get_contents($globals->spoolroot . '/htdocs/images/logo.png');
+ exit;
}
function handler_rss(&$page, $user = null, $hash = null)
@@ -157,20 +251,44 @@ class EventsModule extends PLModule
$uid = init_rss('events/rss.tpl', $user, $hash);
$rss = XDB::iterator(
- 'SELECT e.id, e.titre, e.texte, e.creation_date,
+ '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(e.flags, "valide")
AND peremption >= NOW()', $uid);
$page->assign('rss', $rss);
- }
+ }
+
+ function handler_preview(&$page)
+ {
+ $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 = MiniWiki::WikiToHTML($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');
@@ -179,6 +297,8 @@ class EventsModule extends PLModule
$peremption = Post::i('peremption');
$valid_mesg = Post::v('valid_mesg');
$action = Post::v('action');
+ $upload = new PlUpload(S::v('forlife'), 'event');
+ $this->upload_image($page, $upload);
if (($promo_min > $promo_max && $promo_max != 0)||
($promo_min != 0 && ($promo_min <= 1900 || $promo_min >= 2020)) ||
@@ -188,8 +308,7 @@ class EventsModule extends PLModule
$action = null;
}
- require_once('url_catcher.inc.php');
- $texte_catch_url = url_catcher($texte);
+ $texte_catch_url = MiniWiki::WikiToHTML($texte);
$page->assign('titre', $titre);
$page->assign('texte', $texte);
@@ -199,35 +318,28 @@ class EventsModule extends PLModule
$page->assign('peremption', $peremption);
$page->assign('valid_mesg', $valid_mesg);
$page->assign('action', strtolower($action));
-
- if ($action == 'Confirmer') {
+ $page->assign_by_ref('upload', $upload);
+
+ if ($action == 'Supprimer l\'image') {
+ $upload->rm();
+ $page->assign('action', false);
+ } elseif ($action && (!trim($texte) || !trim($titre))) {
+ $page->trig("L'article doit avoir un titre et un contenu");
+ } elseif ($action) {
$texte = $texte_catch_url;
require_once 'validations.inc.php';
$evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max,
- $peremption, $valid_mesg, S::v('uid'));
+ $peremption, $valid_mesg, S::v('uid'), $upload);
$evtreq->submit();
$page->assign('ok', true);
+ } elseif (!Env::v('preview')) {
+ $upload->rm();
}
-
- $select = '';
- for ($i = 1 ; $i < 30 ; $i++) {
- $time = time() + 3600 * 24 * $i;
- $p_stamp = date('Ymd', $time);
- $year = date('Y', $time);
- $month = date('m', $time);
- $day = date('d', $time);
-
- $select .= "\n";
- }
- $page->assign('select',$select);
}
function handler_tips(&$page, $tips = null)
{
+ header('Content-Type: text/html; charset="UTF-8"');
$page->changeTpl('include/tips.tpl', NO_SKIN);
$page->assign('tips', $this->get_tips($tips));
}
@@ -237,15 +349,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');
}
}
@@ -253,13 +366,27 @@ 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');
$arch = $action == 'archives';
$page->assign('action', $action);
-
- if (Post::v('action') == "Proposer" && $eid) {
+
+ $upload = new PlUpload(S::v('forlife'), '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) {
+ $upload->rm();
+ XDB::execute("DELETE FROM evenements_photo WHERE eid = {?}", $eid);
+ $action = 'edit';
+ } elseif (Post::v('action') == 'Supprimer l\'image' && $eid) {
+ $upload->rm();
+ $action = 'edit';
+ } elseif (Post::v('action') == "Proposer" && $eid) {
$promo_min = Post::i('promo_min');
$promo_max = Post::i('promo_max');
if ($promo_min > $promo_max ||
@@ -269,24 +396,47 @@ class EventsModule extends PLModule
$page->trig("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());
+ if (Post::v('important')) {
+ $flags->addFlag('important');
+ } else {
+ $flags->rmFlag('important');
+ }
XDB::execute('UPDATE evenements
- SET titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?}
+ SET creation_date = creation_date,
+ titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?},
+ flags = {?}
WHERE id = {?}',
Post::v('titre'), Post::v('texte'), Post::v('peremption'),
- Post::v('promo_min'), Post::v('promo_max'), $eid);
+ Post::v('promo_min'), Post::v('promo_max'),
+ $flags->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());
+ $upload->rm();
+ }
}
}
if ($action == 'edit') {
- $res = XDB::query('SELECT titre, texte, peremption, promo_min, promo_max
- FROM evenements
+ $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)
WHERE id={?}', $eid);
- list($titre, $texte, $peremption, $promo_min, $promo_max) = $res->fetchOneRow();
+ list($titre, $texte, $peremption, $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('important', $important);
+ $page->assign('eid', $eid);
+ $page->assign('img', $img);
+ $page->assign_by_ref('upload', $upload);
$select = "";
for ($i = 1 ; $i < 30 ; $i++) {
@@ -350,7 +500,9 @@ class EventsModule extends PLModule
$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:
?>