summaryrefslogtreecommitdiff
path: root/plugins/SimpleUrl
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-11-02 06:56:31 -0800
committerBrion Vibber <brion@pobox.com>2009-11-02 07:51:29 -0800
commitb22fc5b74aecd505d4e2df01258171fc65d312cf (patch)
treeea8cf7eb0d0df0a449b760778bc796d476fb4507 /plugins/SimpleUrl
parentd8e2d76ba93557f8c12f966b5d0afccf9fbdc83b (diff)
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.
Diffstat (limited to 'plugins/SimpleUrl')
-rw-r--r--plugins/SimpleUrl/SimpleUrlPlugin.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php
index d59d63e47..82d772048 100644
--- a/plugins/SimpleUrl/SimpleUrlPlugin.php
+++ b/plugins/SimpleUrl/SimpleUrlPlugin.php
@@ -65,6 +65,15 @@ class SimpleUrlPlugin extends Plugin
class SimpleUrl extends ShortUrlApi
{
protected function shorten_imp($url) {
- return $this->http_get($url);
+ $curlh = curl_init();
+ curl_setopt($curlh, CURLOPT_CONNECTTIMEOUT, 20); // # seconds to wait
+ curl_setopt($curlh, CURLOPT_USERAGENT, 'StatusNet');
+ curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
+
+ curl_setopt($curlh, CURLOPT_URL, $this->service_url.urlencode($url));
+ $short_url = curl_exec($curlh);
+
+ curl_close($curlh);
+ return $short_url;
}
}