X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FFriendica.php;h=bbcccd7dad843a3db3fc798e037cfac17f5b97c2;hb=50e43c530e019bce5defda2a4503a9a817d8772f;hp=3fccda5f859ddd429adb34a8e21e23e3c521ca83;hpb=51b2bf6f70c45a445bc83fd1b190eb758334d5ba;p=friendica.git
diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 3fccda5f85..bbcccd7dad 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -1,6 +1,6 @@
DI::l10n()->t('On this server the following remote servers are blocked.'),
- 'header' => [
+ 'title' => DI::l10n()->t('On this server the following remote servers are blocked.'),
+ 'header' => [
DI::l10n()->t('Blocked domain'),
DI::l10n()->t('Reason for the block'),
],
- 'list' => $blockList,
+ 'download' => DI::l10n()->t('Download this list in CSV format'),
+ 'list' => $blockList,
];
} else {
$blocked = null;
@@ -95,10 +98,10 @@ class Friendica extends BaseModule
return Renderer::replaceMacros($tpl, [
'about' => DI::l10n()->t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
- '' . FRIENDICA_VERSION . '',
+ '' . App::VERSION . '',
DI::baseUrl()->get(),
- '' . DB_UPDATE_VERSION . '/' . $config->get('system', 'build') .'',
- '' . PostUpdate::VERSION . '/' . $config->get('system', 'post_update_version') . ''),
+ '' . $config->get('system', 'build') . '/' . DB_UPDATE_VERSION . '',
+ '' . $keyValue->get('post_update_version') . '/' . PostUpdate::VERSION . ''),
'friendica' => DI::l10n()->t('Please visit Friendi.ca to learn more about the Friendica project.'),
'bugs' => DI::l10n()->t('Bug reports and issues: please visit') . ' ' . '' . DI::l10n()->t('the bugtracker at github') . '',
'info' => DI::l10n()->t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
@@ -154,7 +157,7 @@ class Friendica extends BaseModule
$visible_addons = Addon::getVisibleList();
- $config->load('feature_lock');
+ $config->reload();
$locked_features = [];
$featureLocks = $config->get('config', 'feature_lock');
if (isset($featureLocks)) {
@@ -168,7 +171,7 @@ class Friendica extends BaseModule
}
$data = [
- 'version' => FRIENDICA_VERSION,
+ 'version' => App::VERSION,
'url' => DI::baseUrl()->get(),
'addons' => $visible_addons,
'locked_features' => $locked_features,
@@ -177,13 +180,11 @@ class Friendica extends BaseModule
'register_policy' => $register_policy,
'admin' => $admin,
'site_name' => $config->get('config', 'sitename'),
- 'platform' => strtolower(FRIENDICA_PLATFORM),
+ 'platform' => strtolower(App::PLATFORM),
'info' => $config->get('config', 'info'),
'no_scrape_url' => DI::baseUrl()->get() . '/noscrape',
];
- header('Content-type: application/json; charset=utf-8');
- echo json_encode($data);
- exit();
+ System::jsonExit($data);
}
}