X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=75ef0b2f55d54b219d0c74fe9327e1ed5075bee7;hb=77e786e1d93d7017e611c42b6b4541d9ae2fbdbc;hp=2702756dde54f33b39ec4ab453af5476036c9fc6;hpb=0535ed02cd1f0ff6b22c7b1ea25b1547adcf4950;p=platal.git
diff --git a/modules/events.php b/modules/events.php
index 2702756..75ef0b2 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, '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),
- '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'),
+ 'ajax/tips' => $this->make_hook('tips', AUTH_COOKIE, 'user', NO_AUTH),
+ 'admin/tips' => $this->make_hook('admin_tips', AUTH_MDP, 'admin'),
);
}
- function on_subscribe($forlife, $uid, $promo, $password)
+ private function get_tips($exclude = null)
{
- require_once 'newsletter.inc.php';
- subscribe_nl($uid);
+ 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 forums, 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();
}
- function handler_bug(&$page)
+ private function upload_image(PlatalPage &$page, PlUpload &$upload)
{
- $this->handler_ev($page);
- $page->assign('bug', 1);
+ if (@!$_FILES['image']['tmp_name'] && !Env::v('image_url')) {
+ return true;
+ }
+ if (!$upload->upload($_FILES['image']) && !$upload->download(Env::v('image_url'))) {
+ $page->trigError('Impossible de télécharger l\'image');
+ return false;
+ } elseif (!$upload->isType('image')) {
+ $page->trigError('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->trigError('Impossible de retraiter l\'image');
+ return false;
+ }
+ return true;
}
function handler_ev(&$page, $action = 'list', $eid = null, $pound = null)
{
- $page->changeTpl('login.tpl');
-
- // donne la derniere date de session
- $page->assign('lastlogin', strftime("%Y%m%d%H%M%S",S::i('lastlogin')));
+ $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
+ // incitation à mettre à jour la fiche
$d2 = mktime(0, 0, 0, substr($date, 5, 2), substr($date, 8, 2),
substr($date, 0, 4));
@@ -76,40 +125,19 @@ 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));
- // 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/login' => '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')) {
+ if (S::rssActivated()) {
$page->setRssLink('Polytechnique.org :: News',
'/rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml');
}
@@ -117,7 +145,7 @@ class EventsModule extends PLModule
// cache les evenements lus et raffiche les evenements a relire
if ($action == 'read' && $eid) {
XDB::execute('DELETE evenements_vus.*
- FROM evenements_vus AS ev
+ 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({?},{?})',
@@ -132,41 +160,120 @@ 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();
+ $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_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)
+ {
+ 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('evenements.tpl');
+ $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');
@@ -175,141 +282,142 @@ 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 ||
+ 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");
+ $page->trigError("L'intervalle de promotions n'est pas valide");
$action = null;
}
- require_once('url_catcher.inc.php');
- $texte_catch_url = url_catcher($texte);
-
$page->assign('titre', $titre);
$page->assign('texte', $texte);
- $page->assign('texte_html', $texte_catch_url);
$page->assign('promo_min', $promo_min);
$page->assign('promo_max', $promo_max);
$page->assign('peremption', $peremption);
$page->assign('valid_mesg', $valid_mesg);
$page->assign('action', strtolower($action));
-
- if ($action == 'Confirmer') {
- $texte = $texte_catch_url;
+ $page->assign_by_ref('upload', $upload);
+
+ if ($action == 'Supprimer l\'image') {
+ $upload->rm();
+ $page->assign('action', false);
+ } elseif ($action && (!trim($texte) || !trim($titre))) {
+ $page->trigError("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)
- {
- 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')
+ function handler_tips(&$page, $tips = 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') != 'texte');
- }
+ 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_submit(&$page)
+ function handler_admin_tips(&$page, $action = 'list', $id = null)
{
- $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);
+ $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_admin_events(&$page, $action = 'list', $eid = null)
+ function handler_admin_events(&$page, $action = 'list', $eid = null)
{
- $page->changeTpl('admin/evenements.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);
-
- 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 ||
- ($promo_min != 0 && ($promo_min <= 1900 || $promo_min >= 2020)) ||
- ($promo_max != 0 && ($promo_max <= 1900 || $promo_max >= 2020)))
+ 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");
+ $page->trigError("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 titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?}
- WHERE id = {?}',
+ 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, $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('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++) {
@@ -318,7 +426,7 @@ class EventsModule extends PLModule
$month=substr($p_stamp,4,2);
$day=substr($p_stamp,6,2);
- $select .= "\n";
}
@@ -364,7 +472,8 @@ class EventsModule extends PLModule
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
+ 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')
@@ -373,76 +482,9 @@ class EventsModule extends PLModule
$page->assign('evs', XDB::iterator($sql));
}
$page->assign('arch', $arch);
+ $page->assign('admin_evts', true);
}
-
- 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);
- }
-
}
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>