Misses this file to merge. I like the comments.

[quix0rs-gnu-social.git] / lib / httpclient.php

diff --git a/lib/httpclient.php b/lib/httpclient.php
index 514a5afeb2a91810544252aec7dc0e03b7f4d88d..6016f89314400e90059a1b93eaf232a9a482219c 100644 (file)
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('GNUSOCIAL')) {
     exit(1);
 }
 
@@ -54,7 +54,7 @@ require_once 'HTTP/Request2/Response.php';
  * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link http://status.net/
  */
-class StatusNet_HTTPResponse extends HTTP_Request2_Response
+class GNUsocial_HTTPResponse extends HTTP_Request2_Response
 {
     function __construct(HTTP_Request2_Response $response, $url, $redirects=0)
     {
@@ -145,12 +145,24 @@ class HTTPClient extends HTTP_Request2
             $this->config['ssl_verify_peer'] = false;
         }
 
+        // This means "verify the cert hostname against what we connect to", it does not
+        // imply CA trust or anything like that. Just the hostname.
+        $this->config['ssl_verify_host'] = common_config('http', 'ssl_verify_host');
+
         if (common_config('http', 'curl') && extension_loaded('curl')) {
             $this->config['adapter'] = 'HTTP_Request2_Adapter_Curl';
         }
 
+        foreach (array('host', 'port', 'user', 'password', 'auth_scheme') as $cf) {
+            $k = 'proxy_'.$cf;
+            $v = common_config('http', $k); 
+            if (!empty($v)) {
+                $this->config[$k] = $v;
+            }
+        }
+
         parent::__construct($url, $method, $config);
-        $this->setHeader('User-Agent', $this->userAgent());
+        $this->setHeader('User-Agent', self::userAgent());
     }
 
     /**
@@ -162,10 +174,27 @@ class HTTPClient extends HTTP_Request2
         return new HTTPClient();
     }
 
+    /**
+     * Quick static function to GET a URL
+     */
+    public static function quickGet($url, $accept=null)
+    {
+        $client = new HTTPClient();
+        if (!is_null($accept)) {
+            $client->setHeader('Accept', $accept);
+        }
+        $response = $client->get($url);
+        if (!$response->isOk()) {
+            // TRANS: Exception. %s is a profile URL.
+            throw new Exception(sprintf(_m('Could not GET URL %s.'), $url), $response->getStatus());
+        }
+        return $response->getBody();
+    }
+
     /**
      * Convenience function to run a GET request.
      *
-     * @return StatusNet_HTTPResponse
+     * @return GNUsocial_HTTPResponse
      * @throws HTTP_Request2_Exception
      */
     public function get($url, $headers=array())
@@ -176,7 +205,7 @@ class HTTPClient extends HTTP_Request2
     /**
      * Convenience function to run a HEAD request.
      *
-     * @return StatusNet_HTTPResponse
+     * @return GNUsocial_HTTPResponse
      * @throws HTTP_Request2_Exception
      */
     public function head($url, $headers=array())
@@ -190,7 +219,7 @@ class HTTPClient extends HTTP_Request2
      * @param string $url
      * @param array $headers optional associative array of HTTP headers
      * @param array $data optional associative array or blob of form data to submit
-     * @return StatusNet_HTTPResponse
+     * @return GNUsocial_HTTPResponse
      * @throws HTTP_Request2_Exception
      */
     public function post($url, $headers=array(), $data=array())
@@ -202,7 +231,7 @@ class HTTPClient extends HTTP_Request2
     }
 
     /**
-     * @return StatusNet_HTTPResponse
+     * @return GNUsocial_HTTPResponse
      * @throws HTTP_Request2_Exception
      */
     protected function doRequest($url, $method, $headers)
@@ -234,23 +263,24 @@ class HTTPClient extends HTTP_Request2
     }
 
     /**
-     * Pulls up StatusNet's customized user-agent string, so services
+     * Pulls up GNU Social's customized user-agent string, so services
      * we hit can track down the responsible software.
      *
      * @return string
      */
-    function userAgent()
+    static public function userAgent()
     {
-        return "StatusNet/".STATUSNET_VERSION." (".STATUSNET_CODENAME.")";
+        return GNUSOCIAL_ENGINE . '/' . GNUSOCIAL_VERSION
+                . ' (' . GNUSOCIAL_CODENAME . ')';
     }
 
     /**
      * Actually performs the HTTP request and returns a
-     * StatusNet_HTTPResponse object with response body and header info.
+     * GNUsocial_HTTPResponse object with response body and header info.
      *
      * Wraps around parent send() to add logging and redirection processing.
      *
-     * @return StatusNet_HTTPResponse
+     * @return GNUsocial_HTTPResponse
      * @throw HTTP_Request2_Exception
      */
     public function send()
@@ -293,6 +323,6 @@ class HTTPClient extends HTTP_Request2
             }
             break;
         } while ($maxRedirs);
-        return new StatusNet_HTTPResponse($response, $this->getUrl(), $redirs);
+        return new GNUsocial_HTTPResponse($response, $this->getUrl(), $redirs);
     }
 }