wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

url shortening fixes for api config and not ur1.ca

Browse Source 
Will have to change the 'maxnoticelength' code to stop shortening ALL
links if the setting for infinitely long notices is configured.
This commit is contained in:
Mikael Nordfeldth 2013-09-19 01:11:47 +02:00
parent c906ab11b0
commit c3001ff82b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actions/apistatusnetconfig.php
View File

@ -51,7 +51,7 @@ class ApiStatusnetConfigAction extends ApiAction
var $keys = array( var $keys = array(
'site' => array('name', 'server', 'theme', 'path', 'logo', 'fancy', 'language', 'site' => array('name', 'server', 'theme', 'path', 'logo', 'fancy', 'language',
'email', 'broughtby', 'broughtbyurl', 'timezone', 'closed', 'email', 'broughtby', 'broughtbyurl', 'timezone', 'closed',
'inviteonly', 'private', 'textlimit', 'ssl', 'sslserver', 'shorturllength'), 'inviteonly', 'private', 'textlimit', 'ssl', 'sslserver'),
'license' => array('type', 'owner', 'url', 'title', 'image'), 'license' => array('type', 'owner', 'url', 'title', 'image'),
'nickname' => array('featured'), 'nickname' => array('featured'),
'profile' => array('biolimit'), 'profile' => array('biolimit'),
@ -60,7 +60,8 @@ class ApiStatusnetConfigAction extends ApiAction
'throttle' => array('enabled', 'count', 'timespan'), 'throttle' => array('enabled', 'count', 'timespan'),
'xmpp' => array('enabled', 'server', 'port', 'user'), 'xmpp' => array('enabled', 'server', 'port', 'user'),
'integration' => array('source'), 'integration' => array('source'),
'attachments' => array('uploads', 'file_quota') 'attachments' => array('uploads', 'file_quota'),
'url' => array('maxlength', 'maxnoticelength'),
); );
/** /**

5
lib/default.php
View File

@ -56,7 +56,6 @@ $default =
'private' => true, 'private' => true,
'ssl' => 'never', 'ssl' => 'never',
'sslserver' => null, 'sslserver' => null,
'shorturllength' => 30,
'dupelimit' => 60, // default for same person saying the same thing 'dupelimit' => 60, // default for same person saying the same thing
'textlimit' => 0, // in chars; 0 == no limit 'textlimit' => 0, // in chars; 0 == no limit
'indent' => true, 'indent' => true,
@ -337,8 +336,8 @@ $default =
'peopletag' => true, 'peopletag' => true,
'external' => 'sometimes'), // Options: 'sometimes', 'never', default = 'sometimes' 'external' => 'sometimes'), // Options: 'sometimes', 'never', default = 'sometimes'
'url' => 'url' =>
array('shortener' => 'ur1.ca', array('shortener' => 'internal',
'maxlength' => 25, 'maxlength' => 60,
'maxnoticelength' => -1), 'maxnoticelength' => -1),
'http' => // HTTP client settings when contacting other sites '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') array('ssl_cafile' => false, // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt')