X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=36451f4357cbe4a0346017b735822539e4632c49;hb=69b7b6e9d2c1ab2a698257bd7882333c5b9c0b81;hp=fab8dd935f4409461f2149ee0d6d5e5a2b19fe86;hpb=91f4232430d5ecb47873c9686346344f3d3d7a43;p=platal.git diff --git a/modules/events.php b/modules/events.php index fab8dd9..36451f4 100644 --- a/modules/events.php +++ b/modules/events.php @@ -25,9 +25,13 @@ class EventsModule extends PLModule { return array( 'events' => $this->make_hook('ev', AUTH_COOKIE), + 'send_bug' => $this->make_hook('bug', AUTH_COOKIE), '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), + 'admin/tips' => $this->make_hook('admin_tips', 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), @@ -43,9 +47,43 @@ class EventsModule extends PLModule subscribe_nl($uid); } + function get_tips($exclude = null) + { + $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 >= {?}) + $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(); + } + + function handler_bug(&$page) + { + $this->handler_ev($page); + $page->assign('bug', 1); + } + function handler_ev(&$page, $action = 'list', $eid = null, $pound = null) { $page->changeTpl('login.tpl'); + $page->addJsLink('ajax.js'); + $page->assign('tips', $this->get_tips()); + + // donne la derniere date de session + $page->assign('lastlogin', strftime("%Y%m%d%H%M%S",S::i('lastlogin'))); $res = XDB::query('SELECT date, naissance FROM auth_user_md5 WHERE user_id={?}', S::v('uid')); @@ -77,34 +115,10 @@ 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 - /* Bandeau de publicité sur la page de login */ - $publicite = array( - 'password' => 'Changer mon mot de passe' , - 'Docs/Dons' => 'Faire un don à l\'association Polytechnique.org' - ) ; - - // Liens apparaissant de façon aléatoire - $pub_rnd = array( - 'nl/show' => 'Afficher la dernière newsletter' , - 'http://www.polytechnique.net' => 'Vers les autres sites polytechniciens' , - "trombi/{$_SESSION["promo"]}" => "Voir le trombi de ma promo" , - 'banana' => 'Un petit tour du côté des forums !!' - ) ; - - $choix = array_rand($pub_rnd, 2); - foreach ($choix as $url) { - $publicite[$url] = $pub_rnd[$url] ; - } - $page->assign('publicite', array_chunk($publicite, 2, true)); - // 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 @@ -169,6 +183,14 @@ class EventsModule extends PLModule $valid_mesg = Post::v('valid_mesg'); $action = Post::v('action'); + if ($promo_min > $promo_max || + ($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; + } + require_once('url_catcher.inc.php'); $texte_catch_url = url_catcher($texte); @@ -207,6 +229,26 @@ class EventsModule extends PLModule $page->assign('select',$select); } + function handler_tips(&$page, $tips = null) + { + $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->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('text', 'texte (html) de l\'astuce', false); + $table_editor->describe('priorite', 'priorité (0=min, 256=max)', false); + $table_editor->apply($page, $action, $id); + } + function handler_nl(&$page, $action = null) { require_once 'newsletter.inc.php'; @@ -268,11 +310,21 @@ class EventsModule extends PLModule $page->assign('action', $action); if (Post::v('action') == "Proposer" && $eid) { - XDB::execute('UPDATE evenements - SET 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); + $promo_min = Post::i('promo_min'); + $promo_max = Post::i('promo_max'); + if ($promo_min > $promo_max || + ($promo_min != 0 && ($promo_min <= 1900 || $promo_min >= 2020)) || + ($promo_max != 0 && ($promo_max <= 1900 || $promo_max >= 2020))) + { + $page->trig("L'intervalle de promotions $promo_min -> $promo_max n'est pas valide"); + $action = 'edit'; + } else { + XDB::execute('UPDATE evenements + SET 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); + } } if ($action == 'edit') { @@ -377,6 +429,7 @@ class EventsModule extends PLModule if($aid == 'update') { $nl->_title = Post::v('title'); + $nl->_title_mail= Post::v('title_mail'); $nl->_date = Post::v('date'); $nl->_head = Post::v('head'); $nl->_shortname = strlen(Post::v('shortname')) ? Post::v('shortname') : null;