From 190efb3a08127072aa3e0876a79e7bf76aa77051 Mon Sep 17 00:00:00 2001 From: Vincent Zanotti Date: Sun, 2 Jan 2011 00:20:58 +0100 Subject: [PATCH] Updates the hooks in module/carnet.php to use the new PlTokenHook. Signed-off-by: Vincent Zanotti --- core | 2 +- modules/carnet.php | 61 +++++++++++++++-------------------------------------- modules/events.php | 6 +++--- modules/xnetgrp.php | 6 +++--- 4 files changed, 24 insertions(+), 51 deletions(-) diff --git a/core b/core index 15ba169..a59a444 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 15ba1697972827b89892b9866c4f6c0859c67ce8 +Subproject commit a59a4446b3f96e25620e98d4aab14860dd2ee951 diff --git a/modules/carnet.php b/modules/carnet.php index ba5e1df..e6e6538 100644 --- a/modules/carnet.php +++ b/modules/carnet.php @@ -24,18 +24,18 @@ class CarnetModule extends PLModule function handlers() { return array( - '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_hook('ical', AUTH_PUBLIC, 'directory_private', NO_HTTPS), - 'carnet/contacts/csv' => $this->make_hook('csv', AUTH_PUBLIC, 'directory_private', NO_HTTPS), - 'carnet/contacts/csv/birthday' => $this->make_hook('csv_birthday', AUTH_PUBLIC, 'directory_private', NO_HTTPS), - - 'carnet/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'directory_private', 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'), ); } @@ -358,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) @@ -378,17 +378,8 @@ class CarnetModule extends PLModule ); } - 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(); @@ -411,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'); @@ -441,17 +423,8 @@ class CarnetModule extends PLModule $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'; diff --git a/modules/events.php b/modules/events.php index f6b2c9d..c37c2f8 100644 --- a/modules/events.php +++ b/modules/events.php @@ -25,11 +25,11 @@ class EventsModule extends PLModule { return array( 'events' => $this->make_hook('ev', AUTH_COOKIE), - 'rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), 'events/preview' => $this->make_hook('preview', AUTH_PUBLIC, 'user', NO_AUTH), 'events/photo' => $this->make_hook('photo', AUTH_PUBLIC), 'events/submit' => $this->make_hook('ev_submit', AUTH_MDP), 'admin/events' => $this->make_hook('admin_events', AUTH_MDP, 'admin'), + 'rss' => $this->make_token_hook('rss', AUTH_COOKIE), 'ajax/tips' => $this->make_hook('tips', AUTH_COOKIE, 'user', NO_AUTH), 'admin/tips' => $this->make_hook('admin_tips', AUTH_MDP, 'admin'), @@ -228,11 +228,11 @@ class EventsModule extends PLModule exit; } - function handler_rss(&$page, $user = null, $hash = null) + function handler_rss(PlPage& $page, PlPage& $user) { $this->load('feed.inc.php'); $feed = new EventFeed(); - return $feed->run($page, $user, $hash); + return $feed->run($page, $user); } function handler_preview(&$page) diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 71b5b75..844df9d 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -48,7 +48,7 @@ class XnetGrpModule extends PLModule '%grp/member/new/ajax' => $this->make_hook('admin_member_new_ajax', AUTH_MDP, 'user', NO_AUTH), '%grp/member/del' => $this->make_hook('admin_member_del', AUTH_MDP, 'groupadmin'), - '%grp/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), + '%grp/rss' => $this->make_token_hook('rss', AUTH_PUBLIC), '%grp/announce/new' => $this->make_hook('edit_announce', AUTH_MDP, 'groupadmin'), '%grp/announce/edit' => $this->make_hook('edit_announce', AUTH_MDP, 'groupadmin'), '%grp/announce/photo' => $this->make_hook('photo_announce', AUTH_PUBLIC), @@ -1005,14 +1005,14 @@ class XnetGrpModule extends PLModule $page->assign('positions', explode(',', $positions)); } - function handler_rss(&$page, $user = null, $hash = null) + function handler_rss(PlPage& $page, PlUser& $user) { global $globals; $page->assign('asso', $globals->asso()); $this->load('feed.inc.php'); $feed = new XnetGrpEventFeed(); - return $feed->run($page, $user, $hash, false); + return $feed->run($page, $user, false); } private function upload_image(PlPage &$page, PlUpload &$upload) -- 2.1.4