X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcarnet.php;h=6d79e6d34ff365f47a9d7244625da3c5a0c24525;hb=2c0315bc77abc3c53b5891d2a8c5d4943fd27143;hp=5241b1ec0da865c50b15aad73404dc1d283d94bf;hpb=cab0809050d58f8484608e91f7555ebd69dcb451;p=platal.git diff --git a/modules/carnet.php b/modules/carnet.php index 5241b1e..6d79e6d 100644 --- a/modules/carnet.php +++ b/modules/carnet.php @@ -60,10 +60,8 @@ 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'; @@ -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,7 +102,7 @@ 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."); } } @@ -140,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(); } @@ -156,7 +154,7 @@ class CarnetModule extends PLModule $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', @@ -164,7 +162,7 @@ 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 = XDB::query(" @@ -187,16 +185,16 @@ class CarnetModule extends PLModule $page->assign('xorg_title','Polytechnique.org - Mes contacts'); $uid = S::v('uid'); - $user = Env::get('user'); + $user = Env::v('user'); - switch (Env::get('action')) { + switch (Env::v('action')) { case 'retirer': if (is_numeric($user)) { if (XDB::execute('DELETE FROM contacts WHERE uid = {?} AND contact = {?}', $uid, $user)) { - $page->trig("Contact retiré !"); + $page->trig("Contact retiré !"); } } else { if (XDB::execute( @@ -205,7 +203,7 @@ class CarnetModule extends PLModule 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; @@ -219,9 +217,9 @@ class CarnetModule extends PLModule 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 !'); } } } @@ -233,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', @@ -249,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, @@ -328,46 +326,37 @@ class CarnetModule extends PLModule $page->assign('notifs', $notifs); } - function handler_ical(&$page, $user = null, $hash = null, $all = null) + function handler_ical(&$page) { - new_nonhtml_page('carnet/calendar.tpl', AUTH_PUBLIC); - - if ($alias && $hash) { - $res = 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'); }