X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcarnet.php;h=d60d34da2fbc53a052337999602be969dcca618a;hb=009f4a24bd8743b2cf180b59cb2a2d90ff3f8640;hp=e6e65385d81d5f503ba3632030798c3ff5105ef8;hpb=190efb3a08127072aa3e0876a79e7bf76aa77051;p=platal.git diff --git a/modules/carnet.php b/modules/carnet.php index e6e6538..d60d34d 100644 --- a/modules/carnet.php +++ b/modules/carnet.php @@ -1,6 +1,6 @@ $this->make_hook('index', AUTH_COOKIE, 'directory_private'), - 'carnet/panel' => $this->make_hook('panel', AUTH_COOKIE, 'directory_private'), - 'carnet/notifs' => $this->make_hook('notifs', AUTH_COOKIE, 'directory_private'), - - 'carnet/contacts' => $this->make_hook('contacts', AUTH_COOKIE, 'directory_private'), - 'carnet/contacts/pdf' => $this->make_hook('pdf', AUTH_COOKIE, 'directory_private'), - 'carnet/contacts/vcard' => $this->make_hook('vcard', AUTH_COOKIE, 'directory_private'), - 'carnet/contacts/ical' => $this->make_token_hook('ical', AUTH_COOKIE, 'directory_private'), - 'carnet/contacts/csv' => $this->make_token_hook('csv', AUTH_COOKIE, 'directory_private'), + 'carnet' => $this->make_hook('index', AUTH_COOKIE, 'directory_private'), + 'carnet/panel' => $this->make_hook('panel', AUTH_COOKIE, 'directory_private'), + 'carnet/notifs' => $this->make_hook('notifs', AUTH_COOKIE, 'directory_private'), + + 'carnet/contacts' => $this->make_hook('contacts', AUTH_COOKIE, 'directory_private'), + 'carnet/contacts/pdf' => $this->make_hook('pdf', AUTH_COOKIE, 'directory_private'), + 'carnet/contacts/vcard' => $this->make_hook('vcard', AUTH_COOKIE, 'directory_private'), + 'carnet/contacts/ical' => $this->make_token_hook('ical', AUTH_COOKIE, 'directory_private'), + 'carnet/contacts/csv' => $this->make_token_hook('csv', AUTH_COOKIE, 'directory_private'), 'carnet/contacts/csv/birthday' => $this->make_token_hook('csv_birthday', AUTH_COOKIE, 'directory_private'), - 'carnet/rss' => $this->make_token_hook('rss', AUTH_COOKIE, 'directory_private'), + 'carnet/rss' => $this->make_token_hook('rss', AUTH_COOKIE, 'directory_private'), ); } - function _add_rss_link(&$page) + function _add_rss_link($page) { if (!S::hasAuthToken()) { return; @@ -48,14 +48,14 @@ class CarnetModule extends PLModule '/carnet/rss/' . S::v('hruid') . '/' . S::user()->token . '/rss.xml'); } - function handler_index(&$page) + function handler_index($page) { $page->changeTpl('carnet/index.tpl'); $page->setTitle('Mon carnet'); $this->_add_rss_link($page); } - function handler_panel(&$page) + function handler_panel($page) { $page->changeTpl('carnet/panel.tpl'); @@ -79,7 +79,7 @@ class CarnetModule extends PLModule $this->_add_rss_link($page); } - private function getSinglePromotion(PlPage &$page, $promo) + private function getSinglePromotion(PlPage $page, $promo) { if (!(is_int($promo) || ctype_digit($promo)) || $promo < 1920 || $promo > date('Y')) { $page->trigError('Promotion invalide : ' . $promo . '.'); @@ -88,7 +88,7 @@ class CarnetModule extends PLModule return (int)$promo; } - private function getPromo(PlPage &$page, $promo) + private function getPromo(PlPage $page, $promo) { if (strpos($promo, '-') === false) { $promo = $this->getSinglePromotion($page, $promo); @@ -119,7 +119,7 @@ class CarnetModule extends PLModule return $array; } - private function addPromo(PlPage &$page, $promo) + private function addPromo(PlPage $page, $promo) { $promos = $this->getPromo($page, $promo); if (!$promos || count($promos) == 0) { @@ -135,7 +135,7 @@ class CarnetModule extends PLModule Platal::session()->updateNbNotifs(); } - private function delPromo(PlPage &$page, $promo) + private function delPromo(PlPage $page, $promo) { $promos = $this->getPromo($page, $promo); if (!$promos || count($promos) == 0) { @@ -152,7 +152,7 @@ class CarnetModule extends PLModule Platal::session()->updateNbNotifs(); } - public function addNonRegistered(PlPage &$page, PlUser &$user) + public function addNonRegistered(PlPage $page, PlUser $user) { XDB::execute('INSERT IGNORE INTO watch_nonins (uid, ni_id) VALUES ({?}, {?})', S::i('uid'), $user->id()); @@ -160,7 +160,7 @@ class CarnetModule extends PLModule Platal::session()->updateNbNotifs(); } - public function delNonRegistered(PlPage &$page, PlUser &$user) + public function delNonRegistered(PlPage $page, PlUser $user) { XDB::execute('DELETE FROM watch_nonins WHERE uid = {?} AND ni_id = {?}', @@ -169,7 +169,7 @@ class CarnetModule extends PLModule Platal::session()->updateNbNotifs(); } - public function handler_notifs(&$page, $action = null, $arg = null) + public function handler_notifs($page, $action = null, $arg = null) { $page->changeTpl('carnet/notifs.tpl'); @@ -265,7 +265,7 @@ class CarnetModule extends PLModule $page->assign('actions', $actions); } - function handler_contacts(&$page, $action = null, $subaction = null, $ssaction = null) + function handler_contacts($page, $action = null, $subaction = null, $ssaction = null) { $page->setTitle('Mes contacts'); $this->_add_rss_link($page); @@ -280,7 +280,7 @@ class CarnetModule extends PLModule } switch (Env::v('action')) { case 'retirer': - if (($contact = User::get(Env::v('user')))) { + if (($contact = Profile::get(Env::v('user')))) { if (XDB::execute("DELETE FROM contacts WHERE uid = {?} AND contact = {?}", $uid, $contact->id())) { @@ -291,7 +291,7 @@ class CarnetModule extends PLModule break; case 'ajouter': - if (($contact = User::get(Env::v('user')))) { + if (($contact = Profile::get(Env::v('user')))) { XDB::execute('INSERT IGNORE INTO contacts (uid, contact) VALUES ({?}, {?})', $uid, $contact->id()); @@ -324,22 +324,19 @@ class CarnetModule extends PLModule $view->addMod('minifiche', 'Mini-fiches', true); $view->addMod('trombi', 'Trombinoscope', false, array('with_admin' => false, 'with_promo' => true)); - // TODO: Reactivate when the new map is completed. - // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'carnet/contacts/search')); + $view->addMod('map', 'Planisphère'); $view->apply('carnet/contacts', $page, $action, $subaction); - //if ($action != 'geoloc' || ($search && !$ssaction) || (!$search && !$subaction)) { $page->changeTpl('carnet/mescontacts.tpl'); - //} } - function handler_pdf(&$page, $arg0 = null, $arg1 = null) + function handler_pdf($page, $arg0 = null, $arg1 = null) { $this->load('contacts.pdf.inc.php'); $user = S::user(); Platal::session()->close(); - $order = array(new UFO_Name(Profile::LASTNAME), new UFO_Name(Profile::FIRSTNAME)); + $order = array(new UFO_Name()); if ($arg0 == 'promo') { $order = array_unshift($order, new UFO_Promo()); } else { @@ -358,7 +355,7 @@ class CarnetModule extends PLModule exit; } - function handler_rss(PlPage& $page, PlUser& $user) + function handler_rss(PlPage $page, PlUser $user) { $this->load('feed.inc.php'); $feed = new CarnetFeed(); @@ -373,12 +370,12 @@ class CarnetModule extends PLModule 'timestamp' => $date, 'date' => date('Ymd', $date), 'tomorrow' => date('Ymd', $tomorrow), - 'hruid' => $profile->hrid(), + 'email' => $profile->owner()->bestEmail(), 'summary' => 'Anniversaire de ' . $profile->fullName(true) ); } - function handler_csv_birthday(PlPage& $page, PlUser& $user) + function handler_csv_birthday(PlPage $page, PlUser $user) { $page->changeTpl('carnet/calendar.outlook.tpl', NO_SKIN); $filter = new UserFilter(new UFC_Contact($user)); @@ -399,10 +396,10 @@ class CarnetModule extends PLModule } else { $encoding = 'utf-8'; } - pl_content_headers("text/comma-separated-values;charset=".$encoding); + pl_cached_content_headers('text/comma-separated-values; charset=' . $encoding, 1); } - function handler_ical(PlPage& $page, PlUser& $user) + function handler_ical(PlPage $page, PlUser $user) { require_once 'ical.inc.php'; $page->changeTpl('carnet/calendar.tpl', NO_SKIN); @@ -412,18 +409,18 @@ class CarnetModule extends PLModule $profiles = $filter->iterProfiles(); $page->assign('events', PlIteratorUtils::map($profiles, array($this, 'buildBirthRef'))); - pl_content_headers("text/calendar"); + pl_cached_content_headers('text/calendar', 1); } - function handler_vcard(&$page, $photos = null) + function handler_vcard($page, $photos = null) { $pf = new ProfileFilter(new UFC_Contact(S::user())); $vcard = new VCard($photos == 'photos'); - $vcard->addProfiles($pf->getProfiles()); + $vcard->addProfiles($pf->getProfiles(null, Profile::FETCH_ALL)); $vcard->show(); } - function handler_csv(PlPage& $page, PlUser& $user) + function handler_csv(PlPage $page, PlUser $user) { $page->changeTpl('carnet/mescontacts.outlook.tpl', NO_SKIN); $pf = new ProfileFilter(new UFC_Contact($user));