From 763acb16bef53e4398a272da4a55159db6df229d Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Fri, 27 Feb 2009 14:59:02 -0500 Subject: [PATCH] Some typos, add some missing required session_key parameters, cs, etc... --- framework/Service_Facebook/lib/Horde/Service/Facebook.php | 2 +- .../lib/Horde/Service/Facebook/BatchRequest.php | 3 ++- .../Service_Facebook/lib/Horde/Service/Facebook/Friends.php | 10 +++++----- .../lib/Horde/Service/Facebook/Notifications.php | 4 ++-- .../Service_Facebook/lib/Horde/Service/Facebook/Users.php | 8 ++++---- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook.php b/framework/Service_Facebook/lib/Horde/Service/Facebook.php index e5bfae5fb..fa380f297 100644 --- a/framework/Service_Facebook/lib/Horde/Service/Facebook.php +++ b/framework/Service_Facebook/lib/Horde/Service/Facebook.php @@ -264,7 +264,7 @@ class Horde_Service_Facebook throw new Horde_Service_Facebook_Exception($description, $code); } - $this->batchRequest = new Horde_Service_FacebookbatchRequest($this, $this->_http); + $this->batchRequest = new Horde_Service_Facebook_BatchRequest($this, $this->_http); } /** diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook/BatchRequest.php b/framework/Service_Facebook/lib/Horde/Service/Facebook/BatchRequest.php index 731da2681..34c74e260 100644 --- a/framework/Service_Facebook/lib/Horde/Service/Facebook/BatchRequest.php +++ b/framework/Service_Facebook/lib/Horde/Service/Facebook/BatchRequest.php @@ -79,7 +79,8 @@ class Horde_Service_Facebook_BatchRequest extends Horde_Service_Facebook_Request $serial_only = ($this->_batchMode == self::BATCH_MODE_SERIAL_ONLY); $params = array('method_feed' => $method_feed_json, - 'serial_only' => $serial_only); + 'serial_only' => $serial_only, + 'session_key' => $this->_facebook->auth->getSessionKey()); $json = $this->_postRequest('batch.run', $params); $result = json_decode($json, true); if (is_array($result) && isset($result['error_code'])) { diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook/Friends.php b/framework/Service_Facebook/lib/Horde/Service/Facebook/Friends.php index 646216ee1..3ea85abc5 100644 --- a/framework/Service_Facebook/lib/Horde/Service/Facebook/Friends.php +++ b/framework/Service_Facebook/lib/Horde/Service/Facebook/Friends.php @@ -8,7 +8,7 @@ * @category Horde * @package Horde_Service_Facebook */ -class Horde_Servce_Facebook_Friends extends Horde_Service_Facebook_Base +class Horde_Service_Facebook_Friends extends Horde_Service_Facebook_Base { /** * Returns whether or not pairs of users are friends. @@ -51,15 +51,15 @@ class Horde_Servce_Facebook_Friends extends Horde_Service_Facebook_Base public function &get($flid = null, $uid = null) { // Session key is *required* - if (!$this->_facebook->auth->getSessionKey()) { + if (!$skey = $this->_facebook->auth->getSessionKey()) { throw new Horde_Service_Facebook_Exception('session_key is required', Horde_Service_Facebook_ErrorCodes::API_EC_SESSION_REQUIRED); } - $params = array(); - if ($uid) { + $params = array('session_key' => $skey); + if (!empty($uid)) { $params['uid'] = $uid; } - if ($flid) { + if (!empty($flid)) { $params['flid'] = $flid; } diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook/Notifications.php b/framework/Service_Facebook/lib/Horde/Service/Facebook/Notifications.php index 9234546dc..697582cfe 100644 --- a/framework/Service_Facebook/lib/Horde/Service/Facebook/Notifications.php +++ b/framework/Service_Facebook/lib/Horde/Service/Facebook/Notifications.php @@ -22,12 +22,12 @@ class Horde_Service_Facebook_Notifications extends Horde_Service_Facebook_Base public function &get() { // Session key is *required* - if (!$this->_facebook->auth->getSessionKey()) { + if (!$skey = $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.notifications.get', - array('session_key' => $this->_facebook->auth->getSessionKey())); + array('session_key' => $skey)); } /** diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook/Users.php b/framework/Service_Facebook/lib/Horde/Service/Facebook/Users.php index cc817bb7f..7775c0381 100644 --- a/framework/Service_Facebook/lib/Horde/Service/Facebook/Users.php +++ b/framework/Service_Facebook/lib/Horde/Service/Facebook/Users.php @@ -144,9 +144,9 @@ class Horde_Service_Facebook_Users extends Horde_Service_Facebook_Base * * @return boolean */ - public function &users_setStatus($status, $uid = null, $clear = false, $includeVerb = true) + public function &setStatus($status, $uid = null, $clear = false, $includeVerb = true) { - if (empty($uid) && !$this->_facebook->auth->getSessionKey()) { + if (empty($uid) && !$skey = $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); } @@ -154,10 +154,10 @@ class Horde_Service_Facebook_Users extends Horde_Service_Facebook_Base 'clear' => $clear, 'status_includes_verb' => $includeVerb); - if (empty($uid)) { + if (!empty($uid)) { $params['uid'] = $uid; } else { - $params['session_key'] = $this->_facebook->auth->getSessionKey(); + $params['session_key'] = $skey; } return $this->_facebook->call_method('facebook.users.setStatus', $params); -- 2.11.0