X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcarnet.php;h=54a118d9ea0fa5680576880ab1b6a27408c2065c;hb=1dc71da137a384e771723b8a893539a7f5cc9fab;hp=44a933695458590c538ed1a26e3bda7a6b450ace;hpb=ebfdf077d5789f9dae13e913d5cc23937ce2a9d2;p=platal.git diff --git a/modules/carnet.php b/modules/carnet.php index 44a9336..54a118d 100644 --- a/modules/carnet.php +++ b/modules/carnet.php @@ -1,6 +1,6 @@ $this->make_hook('notifs', AUTH_COOKIE), 'carnet/contacts' => $this->make_hook('contacts', AUTH_COOKIE), - 'carnet/contacts/pdf' => $this->make_hook('pdf', AUTH_COOKIE, 'user', NO_HTTPS), + 'carnet/contacts/pdf' => $this->make_hook('pdf', AUTH_COOKIE), + 'carnet/contacts/vcard' => $this->make_hook('vcard', AUTH_COOKIE), 'carnet/contacts/ical' => $this->make_hook('ical', AUTH_PUBLIC, 'user', NO_HTTPS), - 'carnet/contacts/vcard' => $this->make_hook('vcard', AUTH_COOKIE, 'user', NO_HTTPS), 'carnet/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), ); } - function on_subscribe($forlife, $uid, $promo, $password) - { - require_once 'notifs.inc.php'; - register_watch_op($uid, WATCH_INSCR); - inscription_notifs_base($uid); - } - function _add_rss_link(&$page) { if (!S::has('core_rss_hash')) { return; } $page->setRssLink('Polytechnique.org :: Carnet', - '/carnet/rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml'); + '/carnet/rss/'.S::v('hruid').'/'.S::v('core_rss_hash').'/rss.xml'); } function handler_index(&$page) { $page->changeTpl('carnet/index.tpl'); - $page->assign('pl_title','Polytechnique.org - Mon carnet'); + $page->setTitle('Mon carnet'); $this->_add_rss_link($page); } @@ -85,7 +78,7 @@ class CarnetModule extends PLModule if(preg_match('!^ *(\d{4}) *$!', $arg, $matches)) { $p = intval($matches[1]); if($p<1900 || $p>2100) { - $page->trigError("la promo entrée est invalide"); + $page->trigError('La promo entrée est invalide.'); } else { if ($action == 'add_promo') { $watch->_promos->add($p); @@ -97,9 +90,9 @@ class CarnetModule extends PLModule $p1 = intval($matches[1]); $p2 = intval($matches[2]); if($p1<1900 || $p1>2100) { - $page->trigError('la première promo de la plage entrée est invalide'); + $page->trigError('La première promo de la plage entrée est invalide.'); } elseif($p2<1900 || $p2>2100) { - $page->trigError('la seconde promo de la plage entrée est invalide'); + $page->trigError('La seconde promo de la plage entrée est invalide.'); } else { if ($action == 'add_promo') { $watch->_promos->addRange($p1, $p2); @@ -165,44 +158,9 @@ class CarnetModule extends PLModule $page->assign_by_ref('watch', $watch); } - function _get_list($offset, $limit) { - $uid = S::v('uid'); - $res = XDB::query("SELECT COUNT(*) FROM contacts WHERE uid = {?}", $uid); - $total = $res->fetchOneCell(); - - $order = Get::v('order'); - $orders = Array( - 'nom' => 'nom DESC, u.prenom, u.promo', - 'promo' => 'promo DESC, nom, u.prenom', - 'last' => 'u.date DESC, nom, u.prenom, promo'); - if ($order != 'promo' && $order != 'last') - $order = 'nom'; - $order = $orders[$order]; - if (Get::v('inv') == '') - $order = str_replace(" DESC,", ",", $order); - - $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) - INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type='a_vie') - WHERE c.uid = {?} - ORDER BY $order - LIMIT {?}, {?}", $uid, $offset*$limit, $limit); - $list = $res->fetchAllAssoc(); - - return Array($total, $list); - } - - function searchErrorHandler($explain) { - $page =& Platal::page(); - $page->trigError($explain); - $this->handler_contacts($page); - } - function handler_contacts(&$page, $action = null, $subaction = null, $ssaction = null) { - $page->assign('pl_title','Polytechnique.org - Mes contacts'); + $page->setTitle('Mes contacts'); $this->_add_rss_link($page); $uid = S::v('uid'); @@ -215,39 +173,24 @@ class CarnetModule extends PLModule } switch (Env::v('action')) { case 'retirer': - if (is_numeric($user)) { - if (XDB::execute('DELETE FROM contacts - WHERE uid = {?} AND contact = {?}', - $uid, $user)) - { - $page->trigSuccess("Contact retiré !"); - } - } else { - if (XDB::execute( - 'DELETE FROM c - 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->trigSuccess("Contact retiré !"); + if (($user = User::get(Env::v('user')))) { + if (XDB::execute("DELETE FROM contacts + WHERE uid = {?} AND contact = {?}", $uid, $user->id())) { + $page->trigSuccess("Contact retiré !"); } } break; case 'ajouter': - require_once('user.func.inc.php'); - if (($login = get_user_login($user)) !== false) { - if (XDB::execute( - 'REPLACE INTO contacts (uid, contact) - SELECT {?}, id - FROM aliases - WHERE alias = {?}', $uid, $login)) - { - $page->trigSuccess('Contact ajouté !'); + if (($user = User::get(Env::v('user')))) { + if (XDB::execute("REPLACE INTO contacts (uid, contact) + VALUES ({?}, {?})", $uid, $user->id())) { + $page->trigSuccess('Contact ajouté !'); } else { - $page->trigWarning('Contact déjà dans la liste !'); + $page->trigWarning('Contact déjà dans la liste !'); } } + break; } $search = false; @@ -260,14 +203,14 @@ class CarnetModule extends PLModule require_once 'userset.inc.php'; $base = 'carnet/contacts/search'; - require_once(dirname(__FILE__) . '/search/classes.inc.php'); + Platal::load('search', 'classes.inc.php'); ThrowError::$throwHook = array($this, 'searchErrorHandler'); $view = new SearchSet(true, false, "INNER JOIN contacts AS c2 ON (u.user_id = c2.contact)", "c2.uid = $uid"); } else { $base = 'carnet/contacts'; $view = new UserSet("INNER JOIN contacts AS c2 ON (u.user_id = c2.contact)", " c2.uid = $uid "); } - $view->addMod('minifiche', 'Mini-Fiches', true); + $view->addMod('minifiche', 'Mini-fiches', true); $view->addMod('trombi', 'Trombinoscope', false, array('with_admin' => false, 'with_promo' => true)); $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'carnet/contacts/search')); $view->apply($base, $page, $action, $subaction); @@ -278,7 +221,7 @@ class CarnetModule extends PLModule function handler_pdf(&$page, $arg0 = null, $arg1 = null) { - require_once dirname(__FILE__).'/carnet/contacts.pdf.inc.php'; + $this->load('contacts.pdf.inc.php'); require_once 'user.func.inc.php'; Platal::session()->close(); @@ -313,12 +256,9 @@ class CarnetModule extends PLModule function handler_rss(&$page, $user = null, $hash = null) { - require_once 'rss.inc.php'; - require_once 'notifs.inc.php'; - - $uid = init_rss('carnet/rss.tpl', $user, $hash); - $notifs = new Notifs($uid, false); - $page->assign('notifs', $notifs); + $this->load('feed.inc.php'); + $feed = new CarnetFeed(); + return $feed->run($page, $user, $hash); } function handler_ical(&$page, $alias = null, $hash = null) @@ -334,6 +274,7 @@ class CarnetModule extends PLModule } else if (!$uid) { exit; } + require_once 'ical.inc.php'; $page->changeTpl('carnet/calendar.tpl', NO_SKIN); $page->register_function('display_ical', 'display_ical'); @@ -345,21 +286,21 @@ class CarnetModule extends PLModule u.naissance, DATE_ADD(u.naissance, INTERVAL 1 DAY) AS end, u.date_ins, - a.alias AS forlife + u.hruid 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 = {?}', $uid); $annivs = Array(); - while (list($prenom, $nom, $promo, $naissance, $end, $ts, $forlife) = $res->next()) { + while (list($prenom, $nom, $promo, $naissance, $end, $ts, $hruid) = $res->next()) { $naissance = str_replace('-', '', $naissance); $end = str_replace('-', '', $end); $annivs[] = array( 'timestamp' => strtotime($ts), 'date' => $naissance, 'tomorrow' => $end, - 'forlife' => $forlife, + 'hruid' => $hruid, 'summary' => 'Anniversaire de '.$prenom .' '.$nom.' - x '.$promo, ); @@ -374,8 +315,9 @@ class CarnetModule extends PLModule $res = XDB::query('SELECT contact FROM contacts WHERE uid = {?}', S::v('uid')); - $vcard = new VCard($res->fetchColumn(), $photos == 'photos'); - $vcard->do_page(&$page); + $vcard = new VCard($photos == 'photos'); + $vcard->addUsers($res->fetchColumn()); + $vcard->show(); } }