From acfc756bad1b79402618524c6c064d1e12012321 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Wed, 25 Feb 2009 14:12:17 -0500 Subject: [PATCH] Can't cache the session_key in the method classes, since we may set a new session_key after we instantiate one of the classes. --- .../lib/Horde/Service/Facebook/Base.php | 1 - .../lib/Horde/Service/Facebook/Events.php | 12 ++++++------ .../lib/Horde/Service/Facebook/Fql.php | 2 +- .../lib/Horde/Service/Facebook/Friends.php | 10 +++++----- .../lib/Horde/Service/Facebook/Notifications.php | 4 ++-- .../lib/Horde/Service/Facebook/Users.php | 22 +++++++++++----------- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook/Base.php b/framework/Service_Facebook/lib/Horde/Service/Facebook/Base.php index 3be253a4b..583e3d4b6 100644 --- a/framework/Service_Facebook/lib/Horde/Service/Facebook/Base.php +++ b/framework/Service_Facebook/lib/Horde/Service/Facebook/Base.php @@ -25,7 +25,6 @@ abstract class Horde_Service_Facebook_Base { $this->_facebook = $facebook; $this->_request = $request; - $this->_sessionKey = $facebook->auth->getSessionKey(); } diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook/Events.php b/framework/Service_Facebook/lib/Horde/Service/Facebook/Events.php index d9d6ec261..691fe04d6 100644 --- a/framework/Service_Facebook/lib/Horde/Service/Facebook/Events.php +++ b/framework/Service_Facebook/lib/Horde/Service/Facebook/Events.php @@ -43,7 +43,7 @@ 'start_time' => $start_time, 'end_time' => $end_time, 'rsvp_status' => $rsvp_status, - 'session_key' => $this->_sessionKey)); + 'session_key' => $this->_facebook->auth->getSessionKey())); } /** @@ -58,7 +58,7 @@ { return $this->_facebook->call_method('facebook.events.getMembers', array('eid' => $eid, - 'session_key' => $this->_sessionKey)); + 'session_key' => $this->_facebook->auth->getSessionKey())); } /** @@ -74,7 +74,7 @@ return $this->_facebook->call_method('facebook.events.rsvp', array('eid' => $eid, 'rsvp_status' => $rsvp_status, - 'session_key' => $this->_sessionKey)); + 'session_key' => $this->_facebook->auth->getSessionKey())); } @@ -92,7 +92,7 @@ return $this->_facebook->call_method('facebook.events.cancel', array('eid' => $eid, 'cancel_message' => $cancel_message, - 'session_key' => $this->_sessionKey)); + 'session_key' => $this->_facebook->auth->getSessionKey())); } /** @@ -107,7 +107,7 @@ { return $this->_facebook->call_method('facebook.events.create', array('event_info' => $event_info, - 'session_key' => $this->_sessionKey)); + 'session_key' => $this->_facebook->auth->getSessionKey())); } /** @@ -123,7 +123,7 @@ return $this->_facebook->call_method('facebook.events.edit', array('eid' => $eid, 'event_info' => $event_info, - 'session_key' => $this->_sessionKey)); + 'session_key' => $this->_facebook->auth->getSessionKey())); } } \ No newline at end of file diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook/Fql.php b/framework/Service_Facebook/lib/Horde/Service/Facebook/Fql.php index e995a8af2..55aaf0f79 100644 --- a/framework/Service_Facebook/lib/Horde/Service/Facebook/Fql.php +++ b/framework/Service_Facebook/lib/Horde/Service/Facebook/Fql.php @@ -25,7 +25,7 @@ class Horde_Service_Facebook_Fql extends Horde_Service_Facebook_Base { $params = array('query' => $query); if ($include_session) { - $params['session_key'] = $this->_sessionKey; + $params['session_key'] = $this->_facebook->auth->getSessionKey(); } return $this->_facebook->call_method('facebook.fql.query', $params); diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook/Friends.php b/framework/Service_Facebook/lib/Horde/Service/Facebook/Friends.php index b0b857a42..646216ee1 100644 --- a/framework/Service_Facebook/lib/Horde/Service/Facebook/Friends.php +++ b/framework/Service_Facebook/lib/Horde/Service/Facebook/Friends.php @@ -29,7 +29,7 @@ class Horde_Servce_Facebook_Friends extends Horde_Service_Facebook_Base public function &areFriends($uids1, $uids2) { // Session key is *required* - if (empty($this->_sessionKey)) { + if (!$this->_facebook->auth->getSessionKey()) { throw new Horde_Service_Facebook_Exception('session_key is required', Horde_Service_Facebook_ErrorCodes::API_EC_SESSION_REQUIRED); } @@ -37,7 +37,7 @@ class Horde_Servce_Facebook_Friends extends Horde_Service_Facebook_Base return $this->_facebook->call_method('facebook.friends.areFriends', array('uids1' => $uids1, 'uids2' => $uids2, - 'session_key' => $this->_sessionKey)); + 'session_key' => $this->_facebook->auth->getSessionKey())); } /** @@ -51,7 +51,7 @@ class Horde_Servce_Facebook_Friends extends Horde_Service_Facebook_Base public function &get($flid = null, $uid = null) { // Session key is *required* - if (empty($this->_sessionKey)) { + if (!$this->_facebook->auth->getSessionKey()) { throw new Horde_Service_Facebook_Exception('session_key is required', Horde_Service_Facebook_ErrorCodes::API_EC_SESSION_REQUIRED); } @@ -74,12 +74,12 @@ class Horde_Servce_Facebook_Friends extends Horde_Service_Facebook_Base public function &getLists() { // Session key is *required* - if (empty($this->_sessionKey)) { + if (!$this->_facebook->auth->getSessionKey()) { throw new Horde_Service_Facebook_Exception('session_key is required', Horde_Service_Facebook_ErrorCodes::API_EC_SESSION_REQUIRED); } return $this->_facebook->call_method('facebook.friends.getLists', - array('session_key' => $this->_sessionKey)); + array('session_key' => $this->_facebook->auth->getSessionKey())); } } \ No newline at end of file diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook/Notifications.php b/framework/Service_Facebook/lib/Horde/Service/Facebook/Notifications.php index 5b392efe9..7bbf30bad 100644 --- a/framework/Service_Facebook/lib/Horde/Service/Facebook/Notifications.php +++ b/framework/Service_Facebook/lib/Horde/Service/Facebook/Notifications.php @@ -68,7 +68,7 @@ class Horde_Service_Facebook_Notifications extends Horde_Service_Facebook_Base public function &sendEmail($recipients, $subject, $text, $fbml) { // Session key is *required* - if (empty($this->_sessionKey)) { + if (empty($this->_facebook->auth->getSessionKey())) { throw new Horde_Service_Facebook_Exception('session_key is required', Horde_Service_Facebook_ErrorCodes::API_EC_SESSION_REQUIRED); } @@ -77,7 +77,7 @@ class Horde_Service_Facebook_Notifications extends Horde_Service_Facebook_Base 'subject' => $subject, 'text' => $text, 'fbml' => $fbml, - 'session_key' => $this->_sessionKey)); + 'session_key' => $this->_facebook->auth->getSessionKey())); } } \ No newline at end of file diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook/Users.php b/framework/Service_Facebook/lib/Horde/Service/Facebook/Users.php index 8019841b5..cc817bb7f 100644 --- a/framework/Service_Facebook/lib/Horde/Service/Facebook/Users.php +++ b/framework/Service_Facebook/lib/Horde/Service/Facebook/Users.php @@ -55,13 +55,13 @@ class Horde_Service_Facebook_Users extends Horde_Service_Facebook_Base */ public function &getLoggedInUser() { - if (empty($this->_sessionKey)) { + if (!$this->_facebook->auth->getSessionKey()) { throw new Horde_Service_Facebook_Exception('users.getLoggedInUser requires a session_key', Horde_Service_Facebook_ErrorCodes::API_EC_PARAM_SESSION_KEY); } return $this->_facebook->call_method('facebook.users.getLoggedInUser', - array('session_key' => $this->_sessionKey)); + array('session_key' => $this->_facebook->auth->getSessionKey())); } /** @@ -73,14 +73,14 @@ class Horde_Service_Facebook_Users extends Horde_Service_Facebook_Base */ public function &hasAppPermission($ext_perm, $uid = null) { - if (empty($uid) && empty($this->_sessionKey)) { + if (empty($uid) && !$this->_facebook->auth->getSessionKey()) { throw new Horde_Service_Facebook_Exception('users.hasAppPermission requires either a uid or a session_key', - Horde_Service_Facebook_ErrorCodes::API_EC_PARAM_SESSION_KEY) + Horde_Service_Facebook_ErrorCodes::API_EC_PARAM_SESSION_KEY); } $params = array('ext_perm' => $ext_perm); if (empty($uid)) { - $params['session_key'] = $this->_sessionKey; + $params['session_key'] = $this->_facebook->auth->getSessionKey(); } else { $params['uid'] = $uid; } @@ -97,8 +97,8 @@ class Horde_Service_Facebook_Users extends Horde_Service_Facebook_Base */ public function &isAppUser($uid = null) { - if (empty($uid) && !empty($this->_sessionKey)) { - $params = array('session_key' => $this->_sessionKey); + if (empty($uid) && !!$this->_facebook->auth->getSessionKey()) { + $params = array('session_key' => $this->_facebook->auth->getSessionKey()); } elseif (!empty($uid)) { $params = array('uid' => $uid); } else { @@ -119,12 +119,12 @@ class Horde_Service_Facebook_Users extends Horde_Service_Facebook_Base */ public function &isVerified() { - if (empty($this->_sessionKey)) { + if (!$this->_facebook->auth->getSessionKey()) { throw new Horde_Service_Facebook_Exception('users.isVerified requires a session_key', Horde_Service_Facebook_ErrorCodes::API_EC_PARAM_SESSION_KEY); } - return $this->call_method('facebook.users.isVerified', array('session_key' => $this->_sessionKey)); + return $this->call_method('facebook.users.isVerified', array('session_key' => $this->_facebook->auth->getSessionKey())); } /** @@ -146,7 +146,7 @@ class Horde_Service_Facebook_Users extends Horde_Service_Facebook_Base */ public function &users_setStatus($status, $uid = null, $clear = false, $includeVerb = true) { - if (empty($uid) && empty($this->_sessionKey)) { + if (empty($uid) && !$this->_facebook->auth->getSessionKey()) { throw new Horde_Service_Facebook_Exception('users.setStatus requires a uid or a session_key', Horde_Service_Facebook_ErrorCodes::API_EC_PARAM_SESSION_KEY); } @@ -157,7 +157,7 @@ class Horde_Service_Facebook_Users extends Horde_Service_Facebook_Base if (empty($uid)) { $params['uid'] = $uid; } else { - $params['session_key'] = $this->_sessionKey; + $params['session_key'] = $this->_facebook->auth->getSessionKey(); } return $this->_facebook->call_method('facebook.users.setStatus', $params); -- 2.11.0