X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=2439185a6dfa200d7a2053e594c1cb0351c18338;hb=3032cbd8c5126247565d5c7cf7b705903148f476;hp=d5b9521759f75179e04b1a719e863f42c596fa88;hpb=a3a049fc80d3707bcc76903ab89f73974c470c0c;p=platal.git
diff --git a/modules/events.php b/modules/events.php
index d5b9521..2439185 100644
--- a/modules/events.php
+++ b/modules/events.php
@@ -25,23 +25,50 @@ class EventsModule extends PLModule
{
return array(
'events' => $this->make_hook('ev', 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'),
- '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, '', NO_AUTH),
+ 'admin/tips' => $this->make_hook('admin_tips', AUTH_MDP, 'admin'),
);
}
- function handler_ev(&$page)
+ function get_tips($exclude = null)
{
- $page->changeTpl('login.tpl');
+ $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_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={?}', Session::getInt('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));
@@ -56,65 +83,45 @@ 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={?}', Session::getInt('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(Session::getInt('uid', -1));
+ $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 (Session::has('core_rss_hash')) {
- $page->assign('xorg_rss',
- array('title' => 'Polytechnique.org :: News',
- 'href' => '/rss/'.Session::get('forlife')
- .'/'.Session::get('core_rss_hash').'/rss.xml')
- );
+ if (S::has('core_rss_hash')) {
+ $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'), Session::getInt('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'), Session::getInt('uid'));
+ WHERE evt_id = {?} AND user_id = {?}',
+ $eid, S::v('uid'));
+ pl_redirect('events#newsid'.$eid);
}
// affichage des evenements
- // annonces promos triées par présence d'une limite sur les promos
+ // annonces promos triées par présence d'une limite sur les promos
// puis par dates croissantes d'expiration
- $promo = Session::getInt('promo');
+ $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
@@ -126,7 +133,7 @@ class EventsModule extends PLModule
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, Session::getInt('uid'),
+ XDB::iterator($sql, S::v('uid'),
$promo, $promo)
);
@@ -138,25 +145,55 @@ class EventsModule extends PLModule
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, Session::getInt('uid'),
+ XDB::iterator($sql, S::v('uid'),
$promo, $promo)
);
}
+ 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');
-
- $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');
+ $page->changeTpl('events/submit.tpl');
+
+ $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');
+
+ 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;
+ }
+ 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);
@@ -164,13 +201,10 @@ class EventsModule extends PLModule
$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);
+ $texte = $texte_catch_url;
require_once 'validations.inc.php';
$evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max,
- $peremption, $valid_mesg, Session::getInt('uid'));
+ $peremption, $valid_mesg, S::v('uid'));
$evtreq->submit();
$page->assign('ok', true);
}
@@ -192,56 +226,131 @@ class EventsModule extends PLModule
$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());
+ $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(Session::get('prenom'), Session::get('nom'),
- Session::get('bestalias'), Session::get('femme'),
- Session::get('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', 'priorité (0=min, 256=max)', false);
+ $table_editor->apply($page, $action, $id);
+ if ($action == 'edit' && !is_null($id)) {
+ $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');
-
- require_once 'newsletter.inc.php';
-
- 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(Session::getInt('uid'), Post::get('title'),
- Post::get('body'), Post::get('append'));
- $art->submit();
- $page->assign('submited', true);
+ $page->changeTpl('events/admin.tpl');
+ $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) {
+ $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') {
+ $res = XDB::query('SELECT titre, texte, peremption, promo_min, promo_max
+ FROM evenements
+ WHERE id={?}', $eid);
+ list($titre, $texte, $peremption, $promo_min, $promo_max) = $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);
+
+ $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;
+ }
+
+ $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
+ 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);
+ }
}
?>