From 153c5842aee6509f9e171589a97d1b30989b1fb1 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Sun, 18 Jul 2010 12:17:58 -0400
Subject: [PATCH] Horde_Service_Twitter_Request:: needs a
 Horde_Controller_Request:: object

---
 framework/Core/lib/Horde/Core/Binder/Twitter.php              |  2 +-
 framework/Oauth/lib/Horde/Oauth/Request.php                   |  2 +-
 .../Service_Twitter/lib/Horde/Service/Twitter/Auth/Oauth.php  |  2 +-
 .../Service_Twitter/lib/Horde/Service/Twitter/Request.php     | 11 +++++++++++
 .../lib/Horde/Service/Twitter/Request/Oauth.php               |  6 +++---
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/framework/Core/lib/Horde/Core/Binder/Twitter.php b/framework/Core/lib/Horde/Core/Binder/Twitter.php
index b2c44855f..39dd75756 100644
--- a/framework/Core/lib/Horde/Core/Binder/Twitter.php
+++ b/framework/Core/lib/Horde/Core/Binder/Twitter.php
@@ -30,7 +30,7 @@ class Horde_Core_Binder_Twitter implements Horde_Injector_Binder
 
             /* Create the Consumer */
             $auth = new Horde_Service_Twitter_Auth_Oauth(new Horde_Oauth_Consumer($params));
-            $request = new Horde_Service_Twitter_Request_Oauth();
+            $request = new Horde_Service_Twitter_Request_Oauth(new Horde_Controller_Request_Http());
             $twitter = new Horde_Service_Twitter($auth, $request);
 
             //$twitter->setCache($injector->getInstance('Horde_Cache'));
diff --git a/framework/Oauth/lib/Horde/Oauth/Request.php b/framework/Oauth/lib/Horde/Oauth/Request.php
index 6cf13b5a5..074aa0ccf 100644
--- a/framework/Oauth/lib/Horde/Oauth/Request.php
+++ b/framework/Oauth/lib/Horde/Oauth/Request.php
@@ -55,7 +55,7 @@ class Horde_Oauth_Request
             $this->_params['oauth_consumer_key'] = $consumer->key;
         }
 
-        if (empty($this->_params['oauth_token']) && !is_null($token)) {
+        if (empty($this->_params['oauth_token']) && !empty($token)) {
             $this->_params['oauth_token'] = $token->key;
         }
 
diff --git a/framework/Service_Twitter/lib/Horde/Service/Twitter/Auth/Oauth.php b/framework/Service_Twitter/lib/Horde/Service/Twitter/Auth/Oauth.php
index a50578629..45525a3a5 100644
--- a/framework/Service_Twitter/lib/Horde/Service/Twitter/Auth/Oauth.php
+++ b/framework/Service_Twitter/lib/Horde/Service/Twitter/Auth/Oauth.php
@@ -58,7 +58,7 @@ class Horde_Service_Twitter_Auth_Oauth extends Horde_Service_Twitter_Auth
      *                                          the application.
      * @return Horde_Oauth_Token
      */
-    public function getAccessToken($request = null, $requestSecret = null)
+    public function getAccessToken(Horde_Controller_Request_Http $request, $requestSecret = null)
     {
         if (!empty($this->_token)) {
             return $this->_token;
diff --git a/framework/Service_Twitter/lib/Horde/Service/Twitter/Request.php b/framework/Service_Twitter/lib/Horde/Service/Twitter/Request.php
index 30942b391..cf169747b 100644
--- a/framework/Service_Twitter/lib/Horde/Service/Twitter/Request.php
+++ b/framework/Service_Twitter/lib/Horde/Service/Twitter/Request.php
@@ -18,6 +18,17 @@ abstract class Horde_Service_Twitter_Request
      */
     protected $_twitter;
 
+    /**
+     * 
+     * @var Horde_Controller_Request_Http
+     */
+    protected $_request;
+
+    public function __construct(Horde_Controller_Request_Http $request)
+    {
+        $this->_request = $request;
+    }
+
     public function setTwitter(Horde_Service_Twitter $twitter)
     {
         $this->_twitter = $twitter;
diff --git a/framework/Service_Twitter/lib/Horde/Service/Twitter/Request/Oauth.php b/framework/Service_Twitter/lib/Horde/Service/Twitter/Request/Oauth.php
index 2dad95545..d1b19fc35 100644
--- a/framework/Service_Twitter/lib/Horde/Service/Twitter/Request/Oauth.php
+++ b/framework/Service_Twitter/lib/Horde/Service/Twitter/Request/Oauth.php
@@ -22,7 +22,7 @@ class Horde_Service_Twitter_Request_Oauth extends Horde_Service_Twitter_Request
      */
     public function get($url, $params = array())
     {
-        $key = md5($url . 'get' . serialize($params) . serialize($this->_twitter->auth->getAccessToken()));
+        $key = md5($url . 'get' . serialize($params) . serialize($this->_twitter->auth->getAccessToken($this->_request)));
         $cache = $this->_twitter->responseCache;
         if (!empty($cache) && $results = $cache->get($key, $this->_twitter->cacheLifetime)) {
             return $results;
@@ -30,7 +30,7 @@ class Horde_Service_Twitter_Request_Oauth extends Horde_Service_Twitter_Request
         $request = new Horde_Oauth_Request($url, $params, 'GET');
         $request->sign($this->_twitter->auth->oauth->signatureMethod,
                        $this->_twitter->auth->oauth,
-                       $this->_twitter->auth->getAccessToken());
+                       $this->_twitter->auth->getAccessToken($this->_request));
         $url = ($url instanceof Horde_Url) ? $url : new Horde_Url($url);
         $url->add($params);
         try {
@@ -61,7 +61,7 @@ class Horde_Service_Twitter_Request_Oauth extends Horde_Service_Twitter_Request
         $request = new Horde_Oauth_Request($url, $params);
         $request->sign($this->_twitter->auth->oauth->signatureMethod,
                        $this->_twitter->auth->oauth,
-                       $this->_twitter->auth->getAccessToken());
+                       $this->_twitter->auth->getAccessToken($this->_request));
         try {
             $response = $this->_twitter->getHttpClient()->post($url, $params, array('Authorization' => $request->buildAuthorizationHeader('Twitter API')));
         } catch (Horde_Http_Exception $e) {
-- 
2.11.0