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 fa37967858c3c29000797e510e5f98aca8ab558f.

1 files changed, 14 insertions, 9 deletions

diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
index ef0d8dda4..18ae7719b 100644
--- a/lib/Shorturl_api.php
+++ b/lib/Shorturl_api.php
@@ -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) {