X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fcarnet.php;h=6d79e6d34ff365f47a9d7244625da3c5a0c24525;hb=f0430dc7403d6c3c29f51132c0f8295c782d7555;hp=286c0d5135b2e8f75dba33ddc38d46f8a45484b5;hpb=fd8f77de8bc10d40395990e3f8e96e0b4a186b46;p=platal.git diff --git a/modules/carnet.php b/modules/carnet.php index 286c0d5..6d79e6d 100644 --- a/modules/carnet.php +++ b/modules/carnet.php @@ -38,13 +38,13 @@ class CarnetModule extends PLModule function _add_rss_link(&$page) { - if (!Session::has('core_rss_hash')) { + if (!S::has('core_rss_hash')) { return; } $page->assign('xorg_rss', array('title' => 'Polytechnique.org :: Carnet', - 'href' => '/carnet/rss/'.Session::get('forlife') - .'/'.Session::get('core_rss_hash').'/rss.xml') + 'href' => '/carnet/rss/'.S::v('forlife') + .'/'.S::v('core_rss_hash').'/rss.xml') ); } @@ -60,16 +60,14 @@ class CarnetModule extends PLModule $page->changeTpl('carnet/panel.tpl'); if (Get::has('read')) { - global $globals; - - $_SESSION['watch_last'] = Get::get('read'); - redirect($globals->baseurl.'/carnet/panel'); + $_SESSION['watch_last'] = Get::v('read'); + pl_redirect('carnet/panel'); } require_once 'notifs.inc.php'; $page->assign('now',date('YmdHis')); - $notifs = new Notifs(Session::getInt('uid'), true); + $notifs = new Notifs(S::v('uid'), true); $page->assign('notifs', $notifs); $page->assign('today', date('Y-m-d')); @@ -81,7 +79,7 @@ class CarnetModule extends PLModule if(preg_match('!^ *(\d{4}) *$!', $arg, $matches)) { $p = intval($matches[1]); if($p<1900 || $p>2100) { - $page->trig("la promo entrée est invalide"); + $page->trig("la promo entrée est invalide"); } else { if ($action == 'add_promo') { $watch->_promos->add($p); @@ -93,9 +91,9 @@ class CarnetModule extends PLModule $p1 = intval($matches[1]); $p2 = intval($matches[2]); if($p1<1900 || $p1>2100) { - $page->trig('la première promo de la plage entrée est invalide'); + $page->trig('la première promo de la plage entrée est invalide'); } elseif($p2<1900 || $p2>2100) { - $page->trig('la seconde promo de la plage entrée est invalide'); + $page->trig('la seconde promo de la plage entrée est invalide'); } else { if ($action == 'add_promo') { $watch->_promos->addRange($p1, $p2); @@ -104,24 +102,22 @@ class CarnetModule extends PLModule } } } else { - $page->trig("La promo (ou la plage de promo) entrée est dans un format incorrect."); + $page->trig("La promo (ou la plage de promo) entrée est dans un format incorrect."); } } function handler_notifs(&$page, $action = null, $arg = null) { - global $globals; - $page->changeTpl('carnet/notifs.tpl'); require_once 'notifs.inc.php'; - $watch = new Watch(Session::getInt('uid')); + $watch = new Watch(S::v('uid')); - $res = $globals->xdb->query("SELECT promo_sortie + $res = XDB::query("SELECT promo_sortie FROM auth_user_md5 WHERE user_id = {?}", - Session::getInt('uid', -1)); + S::v('uid', -1)); $promo_sortie = $res->fetchOneCell(); $page->assign('promo_sortie', $promo_sortie); @@ -142,11 +138,11 @@ class CarnetModule extends PLModule if (Env::has('subs')) $watch->_subs->update('sub'); if (Env::has('flags_contacts')) { - $watch->watch_contacts = Env::getBool('contacts'); + $watch->watch_contacts = Env::b('contacts'); $watch->saveFlags(); } if (Env::has('flags_mail')) { - $watch->watch_mail = Env::getBool('mail'); + $watch->watch_mail = Env::b('mail'); $watch->saveFlags(); } @@ -154,12 +150,11 @@ class CarnetModule extends PLModule } function _get_list($offset, $limit) { - global $globals; - $uid = Session::getInt('uid'); - $res = $globals->xdb->query("SELECT COUNT(*) FROM contacts WHERE uid = {?}", $uid); + $uid = S::v('uid'); + $res = XDB::query("SELECT COUNT(*) FROM contacts WHERE uid = {?}", $uid); $total = $res->fetchOneCell(); - $order = Get::get('order'); + $order = Get::v('order'); $orders = Array( 'nom' => 'nom DESC, u.prenom, u.promo', 'promo' => 'promo DESC, nom, u.prenom', @@ -167,10 +162,10 @@ class CarnetModule extends PLModule if ($order != 'promo' && $order != 'last') $order = 'nom'; $order = $orders[$order]; - if (Get::get('inv') == '') + if (Get::v('inv') == '') $order = str_replace(" DESC,", ",", $order); - $res = $globals->xdb->query(" + $res = XDB::query(" SELECT u.prenom, IF(u.nom_usage='',u.nom,u.nom_usage) AS nom, a.alias AS forlife, u.promo FROM contacts AS c INNER JOIN auth_user_md5 AS u ON (u.user_id = c.contact) @@ -185,32 +180,30 @@ class CarnetModule extends PLModule function handler_contacts(&$page, $action = null) { - global $globals; - $page->changeTpl('carnet/mescontacts.tpl'); require_once("applis.func.inc.php"); $page->assign('xorg_title','Polytechnique.org - Mes contacts'); - $uid = Session::getInt('uid'); - $user = Env::get('user'); + $uid = S::v('uid'); + $user = Env::v('user'); - switch (Env::get('action')) { + switch (Env::v('action')) { case 'retirer': if (is_numeric($user)) { - if ($globals->xdb->execute('DELETE FROM contacts + if (XDB::execute('DELETE FROM contacts WHERE uid = {?} AND contact = {?}', $uid, $user)) { - $page->trig("Contact retiré !"); + $page->trig("Contact retiré !"); } } else { - if ($globals->xdb->execute( + if (XDB::execute( 'DELETE FROM contacts USING contacts AS c INNER JOIN aliases AS a ON (c.contact=a.id and a.type!="homonyme") WHERE c.uid = {?} AND a.alias={?}', $uid, $user)) { - $page->trig("Contact retiré !"); + $page->trig("Contact retiré !"); } } break; @@ -218,15 +211,15 @@ class CarnetModule extends PLModule case 'ajouter': require_once('user.func.inc.php'); if (($login = get_user_login($user)) !== false) { - if ($globals->xdb->execute( + if (XDB::execute( 'INSERT INTO contacts (uid, contact) SELECT {?}, id FROM aliases WHERE alias = {?}', $uid, $login)) { - $page->trig('Contact ajouté !'); + $page->trig('Contact ajouté !'); } else { - $page->trig('Contact déjà dans la liste !'); + $page->trig('Contact déjà dans la liste !'); } } } @@ -238,15 +231,15 @@ class CarnetModule extends PLModule $trombi->setNbRows(4); $page->assign_by_ref('trombi',$trombi); - $order = Get::get('order'); + $order = Get::v('order'); if ($order != 'promo' && $order != 'last') $order = 'nom'; $page->assign('order', $order); - $page->assign('inv', Get::get('inv')); + $page->assign('inv', Get::v('inv')); } else { - $order = Get::get('order'); + $order = Get::v('order'); $orders = Array( 'nom' => 'sortkey DESC, a.prenom, a.promo', 'promo' => 'promo DESC, sortkey, a.prenom', @@ -254,9 +247,9 @@ class CarnetModule extends PLModule if ($order != 'promo' && $order != 'last') $order = 'nom'; $page->assign('order', $order); - $page->assign('inv', Get::get('inv')); + $page->assign('inv', Get::v('inv')); $order = $orders[$order]; - if (Get::get('inv') == '') + if (Get::v('inv') == '') $order = str_replace(" DESC,", ",", $order); $sql = "SELECT contact AS id, @@ -289,14 +282,12 @@ class CarnetModule extends PLModule WHERE c.uid = $uid ORDER BY ".$order; - $page->assign_by_ref('citer', $globals->xdb->iterator($sql)); + $page->assign_by_ref('citer', XDB::iterator($sql)); } } function handler_pdf(&$page, $arg0 = null, $arg1 = null) { - global $globals; - require_once 'contacts.pdf.inc.php'; require_once 'user.func.inc.php'; @@ -313,7 +304,7 @@ class CarnetModule extends PLModule $sql .= ' ORDER BY u.nom, u.prenom, u.promo'; } - $citer = $globals->xdb->iterRow($sql, Session::getInt('uid')); + $citer = XDB::iterRow($sql, S::v('uid')); $pdf = new ContactsPDF(); while (list($alias) = $citer->next()) { @@ -335,48 +326,37 @@ class CarnetModule extends PLModule $page->assign('notifs', $notifs); } - function handler_ical(&$page, $user = null, $hash = null, $all = null) + function handler_ical(&$page) { - global $globals; - - new_nonhtml_page('carnet/calendar.tpl', AUTH_PUBLIC); - - if ($alias && $hash) { - $res = $globals->xdb->query( - 'SELECT a.id - FROM aliases AS a - INNER JOIN auth_user_quick AS q ON ( a.id = q.user_id AND q.core_rss_hash = {?} ) - WHERE a.alias = {?} AND a.type != "homonyme"', $hash, $alias); - $uid = $res->fetchOneCell(); - } - - require_once 'notifs.inc.php'; - $notifs = new Notifs($uid, true); - - $annivcat = false; - foreach ($notifs->_cats as $cat) { - if (preg_match('/anniv/i', $cat['short'])) - $annivcat = $cat['id']; - } - - if ($annivcat !== false) { - $annivs = array(); - foreach ($notifs->_data[$annivcat] as $promo) { - foreach ($promo as $notif) { - if ($all == 'all' || $notif['contact']) { - $annivs[] = array( - 'timestamp' => $notif['known'], - 'date' => strtotime($notif['date']), - 'tomorrow' => strtotime("+1 day", strtotime($notif['date'])), - 'bestalias' => $notif['bestalias'], - 'summary' => 'Anniversaire de '.$notif['prenom'] - .' '.$notif['nom'].' - x '.$notif['promo'], - ); - } - } - } - $page->assign('events', $annivs); + $page->changeTpl('carnet/calendar.tpl', NO_SKIN); + + $res = XDB::iterRow( + 'SELECT u.prenom, + IF(u.nom_usage = \'\',u.nom,u.nom_usage) AS nom, + u.promo, + u.naissance, + DATE_ADD(u.naissance, INTERVAL 1 DAY) AS end, + u.date_ins, + a.alias AS forlife + FROM contacts AS c + INNER JOIN auth_user_md5 AS u ON (u.user_id = c.contact) + INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type = \'a_vie\') + WHERE c.uid = {?}', S::v('uid')); + + $annivs = Array(); + while (list($prenom, $nom, $promo, $naissance, $end, $ts, $forlife) = $res->next()) { + $naissance = str_replace('-', '', $naissance); + $end = str_replace('-', '', $end); + $annivs[] = array( + 'timestamp' => strtotime($ts), + 'date' => $naissance, + 'tomorrow' => $end, + 'forlife' => $forlife, + 'summary' => 'Anniversaire de '.$prenom + .' '.$nom.' - x '.$promo, + ); } + $page->assign('events', $annivs); header('Content-Type: text/calendar; charset=utf-8'); }