X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FFriendica.php;h=37bd69da498102dc3fc4155a4fcfc34902244c03;hb=f114ad188353910f1714a2df04affb7e5ee58253;hp=74d9309bdb280bcd2eb9cf301b75b270d7d6c0c6;hpb=5aad46c7fb2b66d63ad93d92ee355fc522b57be1;p=friendica.git
diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 74d9309bdb..37bd69da49 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 +97,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 . '',
+ '' . $config->get('system', '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'),
@@ -112,7 +114,12 @@ class Friendica extends BaseModule
protected function rawContent(array $request = [])
{
- if (ActivityPub::isRequest()) {
+ // @TODO: Replace with parameter from router
+ if (DI::args()->getArgc() <= 1 || (DI::args()->getArgv()[1] !== 'json')) {
+ if (!ActivityPub::isRequest()) {
+ return;
+ }
+
try {
$data = ActivityPub\Transmitter::getProfile(0);
header('Access-Control-Allow-Origin: *');
@@ -123,11 +130,6 @@ class Friendica extends BaseModule
}
}
- // @TODO: Replace with parameter from router
- if (DI::args()->getArgc() <= 1 || (DI::args()->getArgv()[1] !== 'json')) {
- return;
- }
-
$config = DI::config();
$register_policies = [
@@ -168,7 +170,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 +179,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);
}
}