From: Mikael Nordfeldth <mmn@hethane.se>
Date: Wed, 18 Sep 2013 23:11:47 +0000 (+0200)
Subject: url shortening fixes for api config and not ur1.ca
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c3001ff82ba6c71d97cbfb59c3962b71ec60edf5;p=quix0rs-gnu-social.git

url shortening fixes for api config and not ur1.ca

Will have to change the 'maxnoticelength' code to stop shortening ALL
links if the setting for infinitely long notices is configured.
---

diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php
index 7cd7c5ed6c..a58c5d3dfa 100644
--- a/actions/apistatusnetconfig.php
+++ b/actions/apistatusnetconfig.php
@@ -51,7 +51,7 @@ class ApiStatusnetConfigAction extends ApiAction
     var $keys = array(
         'site' => array('name', 'server', 'theme', 'path', 'logo', 'fancy', 'language',
                         'email', 'broughtby', 'broughtbyurl', 'timezone', 'closed',
-                        'inviteonly', 'private', 'textlimit', 'ssl', 'sslserver', 'shorturllength'),
+                        'inviteonly', 'private', 'textlimit', 'ssl', 'sslserver'),
         'license' => array('type', 'owner', 'url', 'title', 'image'),
         'nickname' => array('featured'),
         'profile' => array('biolimit'),
@@ -60,7 +60,8 @@ class ApiStatusnetConfigAction extends ApiAction
         'throttle' => array('enabled', 'count', 'timespan'),
         'xmpp' => array('enabled', 'server', 'port', 'user'),
         'integration' => array('source'),
-        'attachments' => array('uploads', 'file_quota')
+        'attachments' => array('uploads', 'file_quota'),
+        'url' => array('maxlength', 'maxnoticelength'),
     );
 
     /**
diff --git a/lib/default.php b/lib/default.php
index 274c7014a4..7aa50bc3d9 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -56,7 +56,6 @@ $default =
               'private' => true,
               'ssl' => 'never',
               'sslserver' => null,
-              'shorturllength' => 30,
               'dupelimit' => 60, // default for same person saying the same thing
               'textlimit' => 0, // in chars; 0 == no limit
               'indent' => true,
@@ -337,8 +336,8 @@ $default =
               'peopletag' => true,
               'external' => 'sometimes'), // Options: 'sometimes', 'never', default = 'sometimes'
         'url' =>
-        array('shortener' => 'ur1.ca',
-              'maxlength' => 25,
+        array('shortener' => 'internal',
+              'maxlength' => 60,
               'maxnoticelength' => -1),
         'http' => // HTTP client settings when contacting other sites
         array('ssl_cafile' => false, // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt')