From 36c104fb34d7128a0372dd3f77504c0b2f76ba80 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Fri, 28 Aug 2009 07:02:27 +0000
Subject: Make SyncTwitterFriends and TwitterStatusFetcher daemons use both
 HTTP Basic Auth as well as OAuth

---
 lib/oauthclient.php            | 2 +-
 lib/twitterbasicauthclient.php | 6 +++---
 lib/twitteroauthclient.php     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/oauthclient.php b/lib/oauthclient.php
index cc10cea8f..f1827726e 100644
--- a/lib/oauthclient.php
+++ b/lib/oauthclient.php
@@ -22,7 +22,7 @@
  * @category  Action
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2008 StatusNet, Inc.
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
diff --git a/lib/twitterbasicauthclient.php b/lib/twitterbasicauthclient.php
index 82359d93d..66bb01e53 100644
--- a/lib/twitterbasicauthclient.php
+++ b/lib/twitterbasicauthclient.php
@@ -88,7 +88,7 @@ class TwitterBasicAuthClient
         $params   = array('status' => $status,
                           'source' => common_config('integration', 'source'),
                           'in_reply_to_status_id' => $in_reply_to_status_id);
-        $response = $this->httpRequest($url, $params, true);
+        $response = $this->httpRequest($url, $params);
         $status   = json_decode($response);
         return $status;
     }
@@ -117,7 +117,7 @@ class TwitterBasicAuthClient
             $url .= "?$qry";
         }
 
-        $response = $this->httpRequest($url, null, true);
+        $response = $this->httpRequest($url);
         $statuses = json_decode($response);
         return $statuses;
     }
@@ -190,7 +190,7 @@ class TwitterBasicAuthClient
      *
      * @return mixed the request
      */
-    function httpRequest($url, $params = null, $auth = false)
+    function httpRequest($url, $params = null, $auth = true)
     {
         $options = array(
                          CURLOPT_RETURNTRANSFER => true,
diff --git a/lib/twitteroauthclient.php b/lib/twitteroauthclient.php
index 9821a491e..e37fa05f0 100644
--- a/lib/twitteroauthclient.php
+++ b/lib/twitteroauthclient.php
@@ -22,7 +22,7 @@
  * @category  Integration
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2008 StatusNet, Inc.
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
-- 
cgit v1.2.3-54-g00ecf