keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Config use in api_statusnet_config()

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-01 14:42:58 -04:00
parent 757fd357f6
commit cb7176ee70
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/api.php
View file

@ -3337,18 +3337,15 @@ function api_statusnet_config($type)
{ {
$a = get_app(); $a = get_app();
$name = $a->config['sitename']; $name = Config::get('config', 'sitename');
$server = $a->get_hostname(); $server = $a->get_hostname();
$logo = System::baseUrl() . '/images/friendica-64.png'; $logo = System::baseUrl() . '/images/friendica-64.png';
$email = $a->config['admin_email']; $email = Config::get('config', 'admin_email');
$closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false'); $closed = Config::get('config', 'register_policy') == REGISTER_CLOSED ? 'true' : 'false';
$private = ((Config::get('system', 'block_public')) ? 'true' : 'false'); $private = Config::get('system', 'block_public') ? 'true' : 'false';
$textlimit = (string) (($a->config['max_import_size']) ? $a->config['max_import_size'] : 200000); $textlimit = (string) Config::get('config', 'api_import_size', Config::get('config', 'max_import_size', 200000));
if ($a->config['api_import_size']) { $ssl = Config::get('system', 'have_ssl') ? 'true' : 'false';
$textlimit = (string) $a->config['api_import_size']; $sslserver = Config::get('system', 'have_ssl') ? str_replace('http:', 'https:', System::baseUrl()) : '';
}
$ssl = ((Config::get('system', 'have_ssl')) ? 'true' : 'false');
$sslserver = (($ssl === 'true') ? str_replace('http:', 'https:', System::baseUrl()) : '');
$config = [ $config = [
'site' => ['name' => $name,'server' => $server, 'theme' => 'default', 'path' => '', 'site' => ['name' => $name,'server' => $server, 'theme' => 'default', 'path' => '',