Merge branch 'master' of gitorious.org:statusnet/mainline into testing

[quix0rs-gnu-social.git] / plugins / TwitterBridge / twitterbasicauthclient.php

diff --git a/plugins/TwitterBridge/twitterbasicauthclient.php b/plugins/TwitterBridge/twitterbasicauthclient.php
index 1040d72fb6229d1bbc8a78c969bfd464eb0119e2..fd26293f9e40acf54ff4e63402c61813866cbd99 100644 (file)
--- a/plugins/TwitterBridge/twitterbasicauthclient.php
+++ b/plugins/TwitterBridge/twitterbasicauthclient.php
@@ -32,22 +32,16 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 }
 
 /**
- * Exception wrapper for cURL errors
+ * General Exception wrapper for HTTP basic auth errors
  *
- * @category Integration
- * @package  StatusNet
- * @author Adrian Lang <mail@adrianlang.de>
- * @author Brenda Wallace <shiny@cpan.org>
- * @author Craig Andrews <candrews@integralblue.com>
- * @author Dan Moore <dan@moore.cx>
- * @author Evan Prodromou <evan@status.net>
- * @author mEDI <medi@milaro.net>
- * @author Sarven Capadisli <csarven@status.net>
- * @author Zach Copley <zach@status.net> * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
+ *  @category Integration
+ *  @package  StatusNet
+ *  @author   Zach Copley <zach@status.net>
+ *  @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ *  @link     http://status.net/
  *
  */
-class BasicAuthCurlException extends Exception
+class BasicAuthException extends Exception
 {
 }
 
@@ -189,54 +183,44 @@ class TwitterBasicAuthClient
     }
 
     /**
-     * Make a HTTP request using cURL.
+     * Make an HTTP request
      *
      * @param string $url    Where to make the request
      * @param array  $params post parameters
      *
      * @return mixed the request
+     * @throws BasicAuthException
      */
     function httpRequest($url, $params = null, $auth = true)
     {
-        $options = array(
-                         CURLOPT_RETURNTRANSFER => true,
-                         CURLOPT_FAILONERROR    => true,
-                         CURLOPT_HEADER         => false,
-                         CURLOPT_FOLLOWLOCATION => true,
-                         CURLOPT_USERAGENT      => 'StatusNet',
-                         CURLOPT_CONNECTTIMEOUT => 120,
-                         CURLOPT_TIMEOUT        => 120,
-                         CURLOPT_HTTPAUTH       => CURLAUTH_ANY,
-                         CURLOPT_SSL_VERIFYPEER => false,
-
-                         // Twitter is strict about accepting invalid "Expect" headers
-
-                         CURLOPT_HTTPHEADER => array('Expect:')
-                         );
+        $request = HTTPClient::start();
+        $request->setConfig(array(
+            'follow_redirects' => true,
+            'connect_timeout' => 120,
+            'timeout' => 120,
+            'ssl_verify_peer' => false,
+            'ssl_verify_host' => false
+        ));
 
-        if (isset($params)) {
-            $options[CURLOPT_POST]       = true;
-            $options[CURLOPT_POSTFIELDS] = $params;
+        if ($auth) {
+            $request->setAuth($this->screen_name, $this->password);
         }
 
-        if ($auth) {
-            $options[CURLOPT_USERPWD] = $this->screen_name .
-              ':' . $this->password;
+        if (isset($params)) {
+            // Twitter is strict about accepting invalid "Expect" headers
+            $headers = array('Expect:');
+            $response = $request->post($url, $headers, $params);
+        } else {
+            $response = $request->get($url);
         }
 
-        $ch = curl_init($url);
-        curl_setopt_array($ch, $options);
-        $response = curl_exec($ch);
+        $code = $response->getStatus();
 
-        if ($response === false) {
-            $msg  = curl_error($ch);
-            $code = curl_errno($ch);
-            throw new BasicAuthCurlException($msg, $code);
+        if ($code < 200 || $code >= 400) {
+            throw new BasicAuthException($response->getBody(), $code);
         }
 
-        curl_close($ch);
-
-        return $response;
+        return $response->getBody();
     }
 
 }