X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=38244aa3a687cedc3576fe89393ac7ca2cff79fb;hb=39fd8f508829b3b5b27a1bd580e2dd1857602294;hp=c4933f7d7201b9f2dca329033df74b656fb0c265;hpb=5d617d8d3d0258d8e810ebd622c9f45c3193037b;p=platal.git diff --git a/modules/events.php b/modules/events.php index c4933f7..38244aa 100644 --- a/modules/events.php +++ b/modules/events.php @@ -1,6 +1,6 @@ $this->make_hook('ev', AUTH_COOKIE), - 'send_bug' => $this->make_hook('bug', AUTH_COOKIE), + 'rss' => $this->make_hook('rss', 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), '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), - 'admin/newsletter' => $this->make_hook('admin_nl', AUTH_MDP, 'admin'), - 'admin/newsletter/categories' => $this->make_hook('admin_nl_cat', AUTH_MDP, 'admin'), - 'admin/newsletter/edit' => $this->make_hook('admin_nl_edit', AUTH_MDP, 'admin'), ); } - function on_subscribe($forlife, $uid, $promo, $password) - { - require_once 'newsletter.inc.php'; - subscribe_nl($uid); - } - function get_tips($exclude = null) { $exclude = is_null($exclude) ? '' : ' AND id != ' . $exclude . ' '; @@ -71,21 +58,12 @@ class EventsModule extends PLModule 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->changeTpl('events/index.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')); list($date, $naissance) = $res->fetchOneRow(); @@ -172,9 +150,27 @@ class EventsModule extends PLModule ); } + 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, + 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) ) + 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_ev_submit(&$page) { - $page->changeTpl('evenements.tpl'); + $page->changeTpl('events/submit.tpl'); $titre = Post::v('titre'); $texte = Post::v('texte'); @@ -184,7 +180,7 @@ class EventsModule extends PLModule $valid_mesg = Post::v('valid_mesg'); $action = Post::v('action'); - if ($promo_min > $promo_max || + 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))) { @@ -204,7 +200,9 @@ class EventsModule extends PLModule $page->assign('valid_mesg', $valid_mesg); $page->assign('action', strtolower($action)); - if ($action == 'Confirmer') { + if ($action && (!trim($texte) || !trim($titre))) { + $page->trig("L'article doit avoir un titre et un contenu"); + } elseif ($action == 'Confirmer') { $texte = $texte_catch_url; require_once 'validations.inc.php'; $evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max, @@ -232,6 +230,7 @@ class EventsModule extends PLModule function handler_tips(&$page, $tips = null) { + header('Content-Type: text/html; charset="ISO-8859-15"'); $page->changeTpl('include/tips.tpl', NO_SKIN); $page->assign('tips', $this->get_tips($tips)); } @@ -249,62 +248,14 @@ class EventsModule extends PLModule $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'; - - $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('nl_list', get_nl_list()); - } - - function handler_nl_show(&$page, $nid = 'last') - { - $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') != 'texte'); - } - } - - function handler_nl_submit(&$page) - { - $page->changeTpl('newsletter/submit.tpl'); - - require_once 'newsletter.inc.php'; - - if (Post::has('see')) { - $art = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append')); - $page->assign('art', $art); - } elseif (Post::has('valid')) { - require_once('validations.inc.php'); - $art = new NLReq(S::v('uid'), Post::v('title'), - Post::v('body'), Post::v('append')); - $art->submit(); - $page->assign('submited', true); + if ($action == 'edit' && !is_null($id)) { + $page->changeTpl('events/admin_tips.tpl'); } } function handler_admin_events(&$page, $action = 'list', $eid = null) { - $page->changeTpl('admin/evenements.tpl'); + $page->changeTpl('events/admin.tpl'); $page->assign('xorg_title','Polytechnique.org - Administration - Evenements'); $page->register_modifier('hde', 'html_entity_decode'); @@ -402,76 +353,7 @@ class EventsModule extends PLModule $page->assign('evs', XDB::iterator($sql)); } $page->assign('arch', $arch); - } - - function handler_admin_nl(&$page, $new = false) { - $page->changeTpl('newsletter/admin.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Newsletter : liste'); - require_once("newsletter.inc.php"); - - if($new) { - insert_new_nl(); - pl_redirect("admin/newsletter"); - } - - $page->assign('nl_list', get_nl_slist()); - } - - function handler_admin_nl_edit(&$page, $nid = 'last', $aid = null, $action = 'edit') { - $page->changeTpl('newsletter/edit.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Newsletter : Edition'); - require_once("newsletter.inc.php"); - - $nl = new NewsLetter($nid); - - if($action == 'delete') { - $nl->delArticle($aid); - pl_redirect("admin/newsletter/edit/$nid"); - } - - 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; - if (preg_match('/^[-a-z0-9]*$/i', $nl->_shortname) && !is_numeric($nl->_shortname)) { - $nl->save(); - } else { - $page->trig('Le nom de la NL n\'est pas valide'); - pl_redirect('admin/newsletter/edit/' . $nl->_id); - } - } - - if(Post::v('save')) { - $art = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'), - $aid, Post::v('cid'), Post::v('pos')); - $nl->saveArticle($art); - pl_redirect("admin/newsletter/edit/$nid"); - } - - if($action == 'edit' && $aid != 'update') { - $eaid = $aid; - if(Post::has('title')) { - $art = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'), - $eaid, Post::v('cid'), Post::v('pos')); - } else { - $art = ($eaid == 'new') ? new NLArticle() : $nl->getArt($eaid); - } - $page->assign('art', $art); - } - - $page->assign_by_ref('nl',$nl); - } - function handler_admin_nl_cat(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Newsletter : Catégories'); - $page->assign('title', 'Gestion des catégories de la newsletter'); - $table_editor = new PLTableEditor('admin/newsletter/categories','newsletter_cat','cid'); - $table_editor->describe('titre','intitulé',true); - $table_editor->describe('pos','position',true); - $table_editor->apply($page, $action, $id); - } - + } } ?>