We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit c3001ff8 authored by mattl's avatar mattl

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.
parent c906ab11
......@@ -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'),
);
/**
......
......@@ -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')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment