Revert "Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions."

Going to restructure a little more before finalizing this...

This reverts commit fa37967858.
This commit is contained in:
Brion Vibber
2009-11-02 06:56:31 -08:00
parent d8e2d76ba9
commit b22fc5b74a
29 changed files with 672 additions and 4244 deletions

View File

@@ -41,17 +41,22 @@ abstract class ShortUrlApi
return strlen($url) >= common_config('site', 'shorturllength');
}
protected function http_post($data)
{
$request = new HTTPClient($this->service_url);
return $request->post($data);
protected function http_post($data) {
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $this->service_url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
$response = curl_exec($ch);
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
if (($code < 200) || ($code >= 400)) return false;
return $response;
}
protected function http_get($url)
{
$service = $this->service_url . urlencode($url);
$request = new HTTPClient($service);
return $request->get();
protected function http_get($url) {
$encoded_url = urlencode($url);
return file_get_contents("{$this->service_url}$encoded_url");
}
protected function tidy($response) {