summaryrefslogtreecommitdiff
path: root/lib/Shorturl_api.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-11-02 17:21:23 +0000
committerSarven Capadisli <csarven@status.net>2009-11-02 17:21:23 +0000
commiteaae5a4c90249330034e8ee1004e85ae6399fe70 (patch)
tree36c5e1420b4340773f7b6cca4ceca0c075869938 /lib/Shorturl_api.php
parent4aa6deb8abb725be7fa6dc30bdfd2e7de1ff24d1 (diff)
parent5581143bee602dbd5417f532f2b483e58d0a4269 (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.php24
1 files changed, 10 insertions, 14 deletions
diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
index 18ae7719b..de4d55012 100644
--- a/lib/Shorturl_api.php
+++ b/lib/Shorturl_api.php
@@ -41,22 +41,18 @@ 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 = HTTPClient::start();
+ $response = $request->post($this->service_url, null, $data);
+ return $response->getBody();
}
- protected function http_get($url) {
- $encoded_url = urlencode($url);
- return file_get_contents("{$this->service_url}$encoded_url");
+ protected function http_get($url)
+ {
+ $request = HTTPClient::start();
+ $response = $request->get($this->service_url . urlencode($url));
+ return $response->getBody();
}
protected function tidy($response) {