*
* 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
/**
* Quick static function to GET a URL
*/
- public static function quickGet($url, $accept='text/html,application/xhtml+xml')
+ 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();
- $client->setHeader('Accept', $accept);
+ if (!is_null($accept)) {
+ $client->setHeader('Accept', $accept);
+ }
$response = $client->get($url);
if (!$response->isOk()) {
// TRANS: Exception. %s is a profile URL.
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.
*
/**
* 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) {
+ // reset to the old value
+ $this->config['follow_redirects'] = $old_follow;
+
+ // Let the exception go on its merry way.
+ throw $e;
+ }
+ //we've either returned or thrown exception here
+
+ // reset to the old value
+ $this->config['follow_redirects'] = $old_follow;
}
/**