diff options
author | Sarven Capadisli <csarven@status.net> | 2009-11-02 14:53:31 +0000 |
---|---|---|
committer | Sarven Capadisli <csarven@status.net> | 2009-11-02 14:53:31 +0000 |
commit | 8a07c7d7c021693271d1856f15dfe0abd9461d5d (patch) | |
tree | 1846465919fd94a2056c0154782d687242285fd6 /lib/Shorturl_api.php | |
parent | ebd604cf6b6fda6823437cafc1d2db3eb23d9f41 (diff) | |
parent | fa37967858c3c29000797e510e5f98aca8ab558f (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/Shorturl_api.php')
-rw-r--r-- | lib/Shorturl_api.php | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php index 18ae7719b..ef0d8dda4 100644 --- a/lib/Shorturl_api.php +++ b/lib/Shorturl_api.php @@ -41,22 +41,17 @@ abstract class ShortUrlApi return strlen($url) >= common_config('site', 'shorturllength'); } - 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_post($data) + { + $request = new HTTPClient($this->service_url); + return $request->post($data); } - protected function http_get($url) { - $encoded_url = urlencode($url); - return file_get_contents("{$this->service_url}$encoded_url"); + protected function http_get($url) + { + $service = $this->service_url . urlencode($url); + $request = new HTTPClient($service); + return $request->get(); } protected function tidy($response) { |