From 14f69f8d2efee5a927821c9a3c134cd1a682c7fe Mon Sep 17 00:00:00 2001
From: millette <millette@controlyourself.ca>
Date: Thu, 13 Nov 2008 10:27:18 -0500
Subject: [PATCH] trac31 pg support, fixing 2tu typo, set ur1.ca as default
 service

darcs-hash:20081113152718-099f7-42b60d02395f016c54c5f3c301f9dbe987c1283f.gz
---
 actions/othersettings.php | 4 ++--
 db/laconica.sql           | 2 +-
 db/laconica_pg.sql        | 1 +
 lib/util.php              | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/actions/othersettings.php b/actions/othersettings.php
index d4a27db200..9f1ad99497 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -42,8 +42,8 @@ class OthersettingsAction extends SettingsAction {
 		
 		$services = array(
 			'' => 'None',
-            'ur1.ca' => 'ur1.ca (free)',
-            '2tu.ru' => '2tu.ru (free)',
+            'ur1.ca' => 'ur1.ca (free service)',
+            '2tu.us' => '2tu.us (free service)',
             'ptiturl.com' => 'ptiturl.com',
             'bit.ly' => 'bit.ly',
 			'tinyurl.com' => 'tinyurl.com',
diff --git a/db/laconica.sql b/db/laconica.sql
index d9a6dbf86a..d1e5a76a52 100644
--- a/db/laconica.sql
+++ b/db/laconica.sql
@@ -65,7 +65,7 @@ create table user (
     smsemail varchar(255) comment 'built from sms and carrier',
     uri varchar(255) unique key comment 'universally unique identifier, usually a tag URI',
     autosubscribe tinyint default 0 comment 'automatically subscribe to users who subscribe to us',
-	urlshorteningservice varchar(50) default 'metamark.net' comment 'service to use for auto-shortening URLs',
+    urlshorteningservice varchar(50) default 'ur1.ca' comment 'service to use for auto-shortening URLs',
     created datetime not null comment 'date this record was created',
     modified timestamp comment 'date this record was modified',
 
diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql
index 8d0db9a80a..d027dc0af0 100644
--- a/db/laconica_pg.sql
+++ b/db/laconica_pg.sql
@@ -63,6 +63,7 @@ create table "user" (
     smsemail varchar(255) /* comment 'built from sms and carrier' */,
     uri varchar(255) unique /* comment 'universally unique identifier, usually a tag URI' */,
     autosubscribe integer default 0 /* comment 'automatically subscribe to users who subscribe to us' */,
+    urlshorteningservice varchar(50) default 'ur1.ca' /* comment 'service to use for auto-shortening URLs' */,
     created timestamp not null /* comment 'date this record was created' */,
     modified timestamp /* comment 'date this record was modified' */
 
diff --git a/lib/util.php b/lib/util.php
index 14311a71d6..3b2ee9d87e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -770,7 +770,7 @@ function common_shorten_link($long_url) {
             $short_url = $short_url_service->shorten($long_url);
             break;
             
-        case '2tu.ru':
+        case '2tu.us':
             $short_url_service = new TightUrl;
             $short_url = $short_url_service->shorten($long_url);
             break;