From 397177243274f3a44ab05005a8290c37b9c7907e Mon Sep 17 00:00:00 2001
From: millette <millette@controlyourself.ca>
Date: Fri, 7 Nov 2008 15:19:26 -0500
Subject: [PATCH] trac31 added bit.ly support

darcs-hash:20081107201926-099f7-bee53da36841b7dc048591ed91ea35d3e3522d34.gz
---
 actions/othersettings.php | 1 +
 lib/util.php              | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/actions/othersettings.php b/actions/othersettings.php
index 4e28a94f80..d4a27db200 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -45,6 +45,7 @@ class OthersettingsAction extends SettingsAction {
             'ur1.ca' => 'ur1.ca (free)',
             '2tu.ru' => '2tu.ru (free)',
             'ptiturl.com' => 'ptiturl.com',
+            'bit.ly' => 'bit.ly',
 			'tinyurl.com' => 'tinyurl.com',
 			'is.gd' => 'is.gd',
 			'snipr.com' => 'snipr.com',
diff --git a/lib/util.php b/lib/util.php
index 634140fef5..4f93d572e4 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -777,7 +777,12 @@ function common_shorten_link($long_url) {
             $short_url_service = new PtitUrl;
             $short_url = $short_url_service->shorten($long_url);
             break;
-            
+
+        case 'bit.ly':
+			curl_setopt($curlh, CURLOPT_URL, 'http://bit.ly/api?method=shorten&long_url='.urlencode($long_url));
+			$short_url = current(json_decode(curl_exec($curlh))->results)->hashUrl;
+            break;
+
 		case 'is.gd':
 			curl_setopt($curlh, CURLOPT_URL, 'http://is.gd/api.php?longurl='.urlencode($long_url));
 			$short_url = curl_exec($curlh);