X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcarnet.php;h=aee28901b1888192d1bbe01d6768ad84888e4228;hb=911075226546c6b058eca1e0b889097f79fa6232;hp=1d065af009ce5743951104a7bb98e852e9324b92;hpb=069ddda84d11d665359e384e6d136424ec2fae0d;p=platal.git diff --git a/modules/carnet.php b/modules/carnet.php index 1d065af..aee2890 100644 --- a/modules/carnet.php +++ b/modules/carnet.php @@ -1,6 +1,6 @@ $this->make_hook('index', AUTH_COOKIE), - 'carnet/panel' => $this->make_hook('panel', AUTH_COOKIE), - 'carnet/notifs' => $this->make_hook('notifs', AUTH_COOKIE), - - 'carnet/contacts' => $this->make_hook('contacts', AUTH_COOKIE), - '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/csv' => $this->make_hook('csv', AUTH_PUBLIC, 'user', NO_HTTPS), - 'carnet/contacts/csv/birthday' => $this->make_hook('csv_birthday', AUTH_PUBLIC, 'user', NO_HTTPS), - - 'carnet/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), + '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'), ); } - function _add_rss_link(&$page) + function _add_rss_link($page) { if (!S::hasAuthToken()) { return; } $page->setRssLink('Polytechnique.org :: Carnet', - '/carnet/rss/'.S::v('hruid').'/'.S::v('token').'/rss.xml'); + '/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); @@ -275,7 +275,7 @@ class CarnetModule extends PLModule // For XSRF protection, checks both the normal xsrf token, and the special RSS token. // It allows direct linking to contact adding in the RSS feed. - if (Env::v('action') && Env::v('token') !== S::v('token')) { + if (Env::v('action') && Env::v('token') !== S::user()->token) { S::assert_xsrf_token(); } switch (Env::v('action')) { @@ -292,9 +292,10 @@ class CarnetModule extends PLModule case 'ajouter': if (($contact = User::get(Env::v('user')))) { - if (XDB::execute("REPLACE INTO contacts (uid, contact) - VALUES ({?}, {?})", - $uid, $contact->id())) { + XDB::execute('INSERT IGNORE INTO contacts (uid, contact) + VALUES ({?}, {?})', + $uid, $contact->id()); + if (XDB::affectedRows() > 0) { Platal::session()->updateNbNotifs(); $page->trigSuccess('Contact ajouté !'); } else { @@ -315,7 +316,7 @@ class CarnetModule extends PLModule } if ($search && trim(Env::v('quick'))) { $base = 'carnet/contacts/search'; - $view = new SearchSet(true, false, new UFC_Contact($user)); + $view = new QuickSearchSet(new UFC_Contact($user)); } else { $base = 'carnet/contacts'; $view = new ProfileSet(new UFC_Contact($user)); @@ -331,7 +332,7 @@ class CarnetModule extends PLModule //} } - 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(); @@ -357,11 +358,11 @@ class CarnetModule extends PLModule exit; } - function handler_rss(&$page, $user = null, $hash = null) + function handler_rss(PlPage $page, PlUser $user) { $this->load('feed.inc.php'); $feed = new CarnetFeed(); - return $feed->run($page, $user, $hash); + return $feed->run($page, $user); } function buildBirthRef(Profile $profile) @@ -372,22 +373,13 @@ 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(&$page, $alias = null, $hash = null) + function handler_csv_birthday(PlPage $page, PlUser $user) { - $user = Platal::session()->tokenAuth($alias, $hash); - if (is_null($user)) { - if (S::logged()) { - $user == S::user(); - } else { - return PL_FORBIDDEN; - } - } - $page->changeTpl('carnet/calendar.outlook.tpl', NO_SKIN); $filter = new UserFilter(new UFC_Contact($user)); $profiles = $filter->iterProfiles(); @@ -410,17 +402,8 @@ class CarnetModule extends PLModule pl_content_headers("text/comma-separated-values;charset=".$encoding); } - function handler_ical(&$page, $alias = null, $hash = null) + function handler_ical(PlPage $page, PlUser $user) { - $user = Platal::session()->tokenAuth($alias, $hash); - if (is_null($user)) { - if (S::logged()) { - $user == S::user(); - } else { - return PL_FORBIDDEN; - } - } - require_once 'ical.inc.php'; $page->changeTpl('carnet/calendar.tpl', NO_SKIN); $page->register_function('display_ical', 'display_ical'); @@ -432,25 +415,16 @@ class CarnetModule extends PLModule pl_content_headers("text/calendar"); } - 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(&$page, $alias = null, $hash = null) + function handler_csv(PlPage $page, PlUser $user) { - $user = Platal::session()->tokenAuth($alias, $hash); - if (is_null($user)) { - if (S::logged()) { - $user == S::user(); - } else { - return PL_FORBIDDEN; - } - } - $page->changeTpl('carnet/mescontacts.outlook.tpl', NO_SKIN); $pf = new ProfileFilter(new UFC_Contact($user)); require_once 'carnet/outlook.inc.php';