X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=0495075aa4910b0f8d5f14ee5705a9cc042e254f;hb=39337e2d8e5357597a6e14a5e0ba91521f1e2c21;hp=87b9e1721f1313301b3596fffc1dd576780f90a1;hpb=cab0809050d58f8484608e91f7555ebd69dcb451;p=platal.git diff --git a/modules/events.php b/modules/events.php index 87b9e17..0495075 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, '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'), - 'nl' => $this->make_hook('nl', AUTH_COOKIE), - 'nl/show' => $this->make_hook('nl_show', AUTH_COOKIE), - 'nl/submit' => $this->make_hook('nl_submit', AUTH_COOKIE), + 'ajax/tips' => $this->make_hook('tips', AUTH_COOKIE, 'user', NO_AUTH), + 'admin/tips' => $this->make_hook('admin_tips', AUTH_MDP, 'admin'), ); } - function handler_ev(&$page) + private function get_tips($exclude = null) { - $page->changeTpl('login.tpl'); + 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 à faire un tour d\'horizon des ' + . 'nouveautés.

' + . 'Tu peux également retrouver ces informations sur ' + . 'les fora, ou sur 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 { + $priority = (int)($priority/2); + $res = XDB::query("SELECT * + FROM tips + WHERE (peremption = '0000-00-00' OR peremption > CURDATE()) + AND (promo_min = 0 OR promo_min <= {?}) + AND (promo_max = 0 OR promo_max >= {?}) + AND (priorite >= {?}) + AND (state = 'active') + $exclude + ORDER BY RAND() + LIMIT 1", + S::i('promo'), S::i('promo'), $priority); + } while ($priority && !$res->numRows()); + if (!$res->numRows()) { + return null; + } + return $res->fetchOneAssoc(); + } + + 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'); + $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')); + WHERE user_id={?}', S::v('uid')); list($date, $naissance) = $res->fetchOneRow(); // incitation à mettre à jour la fiche @@ -59,7 +128,7 @@ class EventsModule extends PLModule // 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 @@ -67,93 +136,162 @@ class EventsModule extends PLModule $res = localize_addresses(S::v('uid', -1)); $page->assign('geoloc_incitation', count($res)); - // affichage de la boîte avec quelques liens - require_once 'login.conf.php'; - $pub_nbElem = $pub_nbLig * $pub_nbCol ; - if (count($pub_tjs) <= $pub_nbElem) { - $publicite = array_slice($pub_tjs, 0, $pub_nbElem); - } else { - $publicite = $pub_tjs ; - } - - $nbAlea = $pub_nbElem - count($publicite) ; - if ($nbAlea > 0) { - $choix = array_rand($pub_rnd,$nbAlea) ; - foreach ($choix as $url) { - $publicite[$url] = $pub_rnd[$url] ; - } - } - $publicite = array_chunk( $publicite , $pub_nbLig , true ) ; - $page->assign_by_ref('publicite', $publicite); - // ajout du lien RSS - if (S::has('core_rss_hash')) { - $page->assign('xorg_rss', - array('title' => 'Polytechnique.org :: News', - 'href' => '/rss/'.S::v('forlife') - .'/'.S::v('core_rss_hash').'/rss.xml') - ); + $page->setRssLink('Polytechnique.org :: News', + '/rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml'); } // cache les evenements lus et raffiche les evenements a relire - if (Env::has('lu')){ - XDB::execute('DELETE FROM evenements_vus AS ev - INNER JOIN evenements AS e ON e.id = ev.evt_id - WHERE peremption < NOW)'); + 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({?},{?})', - Env::get('lu'), S::v('uid')); + $eid, S::v('uid')); + pl_redirect('events#'.$pound); } - if (Env::has('nonlu')){ + if ($action == 'unread' && $eid) { XDB::execute('DELETE FROM evenements_vus - WHERE evt_id = {?} AND user_id = {?}', - Env::get('nonlu'), S::v('uid')); - } - - // 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) - ); + WHERE evt_id = {?} AND user_id = {?}', + $eid, S::v('uid')); + pl_redirect('events#newsid'.$eid); + } + + $array = array(); + $it = XDB::iterator("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, 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 + 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 >= {?}) + ORDER BY important DESC, news DESC, end DESC, e.peremption, e.creation_date DESC", + S::i('uid'), S::i('promo'), S::i('promo')); + $cats = array('important', 'news', 'end', 'body'); + $body = $it->next(); + foreach ($cats as $cat) { + $data = array(); + if (!$body) { + continue; + } + do { + if ($cat == 'body' || $body[$cat]) { + $data[] = $body; + } else { + break; + } + $body = $it->next(); + } while ($body); + if (!empty($data)) { + $array[$cat] = $data; + } + } + $page->assign_by_ref('events', $array); } - function handler_ev_submit(&$page) + function handler_photo(&$page, $eid = null, $valid = null) { - $page->changeTpl('evenements.tpl'); + 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; + } - $titre = Post::get('titre'); - $texte = Post::get('texte'); - $promo_min = Post::getInt('promo_min'); - $promo_max = Post::getInt('promo_max'); - $peremption = Post::getInt('peremption'); - $valid_mesg = Post::get('valid_mesg'); - $action = Post::get('action'); + 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, + FIND_IN_SET(\'wiki\', e.flags) AS wiki + 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); + } + + function handler_preview(&$page) + { + $page->changeTpl('events/preview.tpl', NO_SKIN); + $texte = Get::v('texte'); + if (!is_utf8($texte)) { + $texte = utf8_encode($texte); + } + $titre = Get::v('titre'); + if (!is_utf8($titre)) { + $titre = utf8_encode($titre); + } + $page->assign('texte', $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'); + $promo_min = Post::i('promo_min'); + $promo_max = Post::i('promo_max'); + $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)) || + ($promo_max != 0 && ($promo_max <= 1900 || $promo_max >= 2020))) + { + $page->trig("L'intervalle de promotions n'est pas valide"); + $action = null; + } $page->assign('titre', $titre); $page->assign('texte', $texte); @@ -162,86 +300,191 @@ class EventsModule extends PLModule $page->assign('peremption', $peremption); $page->assign('valid_mesg', $valid_mesg); $page->assign('action', strtolower($action)); - - if ($action == 'Confirmer') { - $texte = preg_replace('/((http|ftp)+(s)?:\/\/[^<>\s]+)/i', - '\\0', $texte); - $texte = preg_replace('/([^,\s]+@[^,\s]+)/i', - '\\0', $texte); + $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) { 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_nl(&$page, $action = null) + function handler_tips(&$page, $tips = null) { - require_once 'newsletter.inc.php'; - - $page->changeTpl('newsletter/index.tpl'); - $page->assign('xorg_title','Polytechnique.org - Lettres mensuelles'); - - switch ($action) { - case 'out': unsubscribe_nl(); break; - case 'in': subscribe_nl(); break; - default: ; - } - - $page->assign('nls', get_nl_state()); - $page->assign_by_ref('nl_list', get_nl_list()); + header('Content-Type: text/html; charset="UTF-8"'); + $page->changeTpl('include/tips.tpl', NO_SKIN); + $page->assign('tips', $this->get_tips($tips)); } - function handler_nl_show(&$page, $nid = 'last') + function handler_admin_tips(&$page, $action = 'list', $id = null) { - $page->changeTpl('newsletter/show.tpl'); - - require_once 'newsletter.inc.php'; - - $nl = new NewsLetter($nid); - $page->assign_by_ref('nl', $nl); - - if (Post::has('send')) { - $nl->sendTo(S::v('prenom'), S::v('nom'), - S::v('bestalias'), S::v('femme'), - S::v('mail_fmt') != 'text'); + $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('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', '0<=priorité<=255', true); + $table_editor->list_on_edit(false); + $table_editor->apply($page, $action, $id); + if (($action == 'edit' && !is_null($id)) || $action == 'update') { + $page->changeTpl('events/admin_tips.tpl'); } } - function handler_nl_submit(&$page) + function handler_admin_events(&$page, $action = 'list', $eid = null) { - $page->changeTpl('newsletter/submit.tpl'); + $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); + + $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 != 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"); + $action = 'edit'; + } else { + $res = XDB::query('SELECT flags FROM evenements WHERE id = {?}', $eid); + $flags = new FlagSet($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={?}, + flags = {?} + WHERE id = {?}', + Post::v('titre'), Post::v('texte'), Post::v('peremption'), + 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(); + } + } + } - require_once 'newsletter.inc.php'; + 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) + WHERE id={?}', $eid); + list($titre, $texte, $peremption, $promo_min, $promo_max, $important, $img) = $res->fetchOneRow(); + $page->assign('titre',$titre); + $page->assign('texte',$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++) { + $p_stamp=date("Ymd",time()+3600*24*$i); + $year=substr($p_stamp,0,4); + $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 + WHERE id = {?}', $eid); + break; + + case "archive": + XDB::execute('UPDATE evenements + SET creation_date = creation_date, flags = CONCAT(flags,",archive") + WHERE id = {?}', $eid); + break; + + case "unarchive": + XDB::execute('UPDATE evenements + SET creation_date = creation_date, flags = REPLACE(flags,"archive","") + WHERE id = {?}', $eid); + $action = 'archives'; + $arch = true; + break; + + case "valid": + XDB::execute('UPDATE evenements + SET creation_date = creation_date, flags = CONCAT(flags,",valide") + WHERE id = {?}', $eid); + break; + + case "unvalid": + XDB::execute('UPDATE evenements + SET creation_date = creation_date, flags = REPLACE(flags,"valide", "") + WHERE id = {?}', $eid); + break; + } - if (Post::has('see')) { - $art = new NLArticle(Post::get('title'), Post::get('body'), Post::get('append')); - $page->assign('art', $art); - } elseif (Post::has('valid')) { - require_once('validations.inc.php'); - $art = new NLReq(S::v('uid'), Post::get('title'), - Post::get('body'), Post::get('append')); - $art->submit(); - $page->assign('submited', true); + $pid = ($eid && $action == 'preview') ? $eid : -1; + $sql = "SELECT e.id, e.titre, e.texte,e.id = $pid AS preview, + 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, + u.promo, u.nom, u.prenom, a.alias AS forlife, + FIND_IN_SET('wiki', e.flags) AS wiki + 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') + 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)); } + $page->assign('arch', $arch); + $page->assign('admin_evts', true); } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>