X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fhttpclient.php;h=b386ce39875e991d08ed5fc0db4deaf2a5b7039b;hb=64f2f3d976e344d3bfa2dbddb937c90a0c4fe55c;hp=6016f89314400e90059a1b93eaf232a9a482219c;hpb=fb9d32a8afdabd2a094f25fbba9c937bc9f0e7c5;p=quix0rs-gnu-social.git

diff --git a/lib/httpclient.php b/lib/httpclient.php
index 6016f89314..b386ce3987 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -80,7 +80,7 @@ class GNUsocial_HTTPResponse extends HTTP_Request2_Response
      */
     function getUrl()
     {
-        return $this->url;
+        return $this->effectiveUrl;
     }
 
     /**
@@ -103,7 +103,7 @@ class GNUsocial_HTTPResponse extends HTTP_Request2_Response
  *
  * This extends the PEAR HTTP_Request2 package:
  * - sends StatusNet-specific User-Agent header
- * - 'follow_redirects' config option, defaulting off
+ * - 'follow_redirects' config option, defaulting on
  * - 'max_redirs' config option, defaulting to 10
  * - extended response class adds getRedirectCount() and getUrl() methods
  * - get() and post() convenience functions return body content directly
@@ -177,8 +177,17 @@ class HTTPClient extends HTTP_Request2
     /**
      * Quick static function to GET a URL
      */
-    public static function quickGet($url, $accept=null)
+    public static function quickGet($url, $accept=null, $params=array())
     {
+        if (!empty($params)) {
+            $params = http_build_query($params, null, '&');
+            if (strpos($url, '?') === false) {
+                $url .= '?' . $params;
+            } else {
+                $url .= '&' . $params;
+            }
+        }
+
         $client = new HTTPClient();
         if (!is_null($accept)) {
             $client->setHeader('Accept', $accept);
@@ -191,6 +200,16 @@ class HTTPClient extends HTTP_Request2
         return $response->getBody();
     }
 
+    public static function quickGetJson($url, $params=array())
+    {
+        $data = json_decode(self::quickGet($url, null, $params));
+        if (is_null($data)) {
+            common_debug('Could not decode JSON data from URL: '.$url);
+            throw new ServerException('Could not decode JSON data from URL');
+        }
+        return $data;
+    }
+
     /**
      * Convenience function to run a GET request.
      *
@@ -205,12 +224,28 @@ class HTTPClient extends HTTP_Request2
     /**
      * Convenience function to run a HEAD request.
      *
+     * NOTE: Will probably turn into a GET request if you let it follow redirects!
+     *       That option is only there to be flexible and may be removed in the future!
+     *
      * @return GNUsocial_HTTPResponse
      * @throws HTTP_Request2_Exception
      */
-    public function head($url, $headers=array())
+    public function head($url, $headers=array(), $follow_redirects=false)
     {
-        return $this->doRequest($url, self::METHOD_HEAD, $headers);
+        // Save the configured value for follow_redirects
+        $old_follow = $this->config['follow_redirects'];
+        try {
+            // Temporarily (possibly) override the follow_redirects setting
+            $this->config['follow_redirects'] = $follow_redirects;
+            return $this->doRequest($url, self::METHOD_HEAD, $headers);
+        } catch (Exception $e) {
+            // Let the exception go on its merry way.
+            throw $e;
+        } finally {
+            // reset to the old value
+            $this->config['follow_redirects'] = $old_follow;
+        }
+        //we've either returned or thrown exception here
     }
 
     /**
@@ -325,4 +360,4 @@ class HTTPClient extends HTTP_Request2
         } while ($maxRedirs);
         return new GNUsocial_HTTPResponse($response, $this->getUrl(), $redirs);
     }
-}
+}
\ No newline at end of file