X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FFriendica.php;h=90869878e47b131e32aab5c784a00902496419ac;hb=8038c1b04ffa723ebd28610fb72927d8d21b3577;hp=2d76f80d04a7185b95a69ad2ead8cc20da8c65bc;hpb=7dbf72e4540c687c5dbbd15442dbc274f104afc3;p=friendica.git
diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 2d76f80d04..90869878e4 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -1,6 +1,6 @@
get('system', 'tosdisplay')) ?
- DI::l10n()->t('Read about the Terms of Service of this node.', DI::baseUrl()->get()) :
+ DI::l10n()->t('Read about the Terms of Service of this node.', DI::baseUrl()) :
'';
$blockList = $config->get('system', 'blocklist');
if (!empty($blockList)) {
$blocked = [
- 'title' => 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;
@@ -93,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 . '',
- DI::baseUrl()->get(),
- '' . DB_UPDATE_VERSION . '',
- '' . $config->get('system', 'post_update_version') . ''),
+ '' . App::VERSION . '',
+ DI::baseUrl(),
+ '' . $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'),
@@ -108,24 +113,24 @@ class Friendica extends BaseModule
]);
}
- public static function rawContent(array $parameters = [])
+ protected function rawContent(array $request = [])
{
- if (ActivityPub::isRequest()) {
- $data = ActivityPub\Transmitter::getProfile(0);
- if (!empty($data)) {
+ // @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: *');
header('Cache-Control: max-age=23200, stale-while-revalidate=23200');
System::jsonExit($data, 'application/activity+json');
+ } catch (HTTPException\NotFoundException $e) {
+ System::jsonError(404, ['error' => 'Record not found']);
}
}
- $app = DI::app();
-
- // @TODO: Replace with parameter from router
- if ($app->argc <= 1 || ($app->argv[1] !== 'json')) {
- return;
- }
-
$config = DI::config();
$register_policies = [
@@ -146,13 +151,13 @@ class Friendica extends BaseModule
if (!empty($administrator)) {
$admin = [
'name' => $administrator['username'],
- 'profile' => DI::baseUrl()->get() . '/profile/' . $administrator['nickname'],
+ 'profile' => DI::baseUrl() . '/profile/' . $administrator['nickname'],
];
}
$visible_addons = Addon::getVisibleList();
- $config->load('feature_lock');
+ $config->reload();
$locked_features = [];
$featureLocks = $config->get('config', 'feature_lock');
if (isset($featureLocks)) {
@@ -166,8 +171,8 @@ class Friendica extends BaseModule
}
$data = [
- 'version' => FRIENDICA_VERSION,
- 'url' => DI::baseUrl()->get(),
+ 'version' => App::VERSION,
+ 'url' => (string)DI::baseUrl(),
'addons' => $visible_addons,
'locked_features' => $locked_features,
'explicit_content' => intval($config->get('system', 'explicit_content', 0)),
@@ -175,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',
+ 'no_scrape_url' => DI::baseUrl() . '/noscrape',
];
- header('Content-type: application/json; charset=utf-8');
- echo json_encode($data);
- exit();
+ System::jsonExit($data);
}
}