X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FFriendica.php;h=fe4c846c92047ec438c2ba5d21c8acda7e515b76;hb=e1863951986ba5be173758324a00652bc5af870c;hp=f02cc2610b803888d1f75232c720dcf69a9007cc;hpb=1415d1903acf69168826a1c468d2578009206152;p=friendica.git
diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index f02cc2610b..fe4c846c92 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -1,6 +1,6 @@
config = $config;
+ $this->keyValue = $keyValue;
+ $this->session = $session;
+ }
+
+ protected function content(array $request = []): string
+ {
$visibleAddonList = Addon::getVisibleList();
if (!empty($visibleAddonList)) {
@@ -57,29 +79,30 @@ class Friendica extends BaseModule
}
}
$addon = [
- 'title' => DI::l10n()->t('Installed addons/apps:'),
+ 'title' => $this->t('Installed addons/apps:'),
'list' => $sortedAddonList,
];
} else {
$addon = [
- 'title' => DI::l10n()->t('No installed addons/apps'),
+ 'title' => $this->t('No installed addons/apps'),
];
}
- $tos = ($config->get('system', 'tosdisplay')) ?
- DI::l10n()->t('Read about the Terms of Service of this node.', DI::baseUrl()->get()) :
+ $tos = ($this->config->get('system', 'tosdisplay')) ?
+ $this->t('Read about the Terms of Service of this node.', $this->baseUrl) :
'';
- $blockList = $config->get('system', 'blocklist');
+ $blockList = $this->config->get('system', 'blocklist') ?? [];
- if (!empty($blockList)) {
+ if (!empty($blockList) && ($this->config->get('blocklist', 'public') || $this->session->isAuthenticated())) {
$blocked = [
- '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'),
+ 'title' => $this->t('On this server the following remote servers are blocked.'),
+ 'header' => [
+ $this->t('Blocked domain'),
+ $this->t('Reason for the block'),
],
- 'list' => $blockList,
+ 'download' => $this->t('Download this list in CSV format'),
+ 'list' => $blockList,
];
} else {
$blocked = null;
@@ -92,14 +115,14 @@ class Friendica extends BaseModule
$tpl = Renderer::getMarkupTemplate('friendica.tpl');
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', 'build') .'',
- '' . $config->get('system', 'post_update_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'),
+ 'about' => $this->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.',
+ '' . App::VERSION . '',
+ $this->baseUrl,
+ '' . $this->config->get('system', 'build') . '/' . DB_UPDATE_VERSION . '',
+ '' . $this->keyValue->get('post_update_version') . '/' . PostUpdate::VERSION . ''),
+ 'friendica' => $this->t('Please visit Friendi.ca to learn more about the Friendica project.'),
+ 'bugs' => $this->t('Bug reports and issues: please visit') . ' ' . '' . $this->t('the bugtracker at github') . '',
+ 'info' => $this->t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
'visible_addons' => $addon,
'tos' => $tos,
@@ -108,34 +131,31 @@ 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)) {
+ if (empty($this->parameters['format']) || $this->parameters['format'] !== '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 = [
Register::CLOSED => 'REGISTER_CLOSED',
Register::APPROVE => 'REGISTER_APPROVE',
Register::OPEN => 'REGISTER_OPEN'
];
- $register_policy_int = intval($config->get('config', 'register_policy'));
- if ($register_policy_int !== Register::CLOSED && $config->get('config', 'invitation_only')) {
+ $register_policy_int = $this->config->get('config', 'register_policy');
+ if ($register_policy_int !== Register::CLOSED && $this->config->get('config', 'invitation_only')) {
$register_policy = 'REGISTER_INVITATION';
} else {
$register_policy = $register_policies[$register_policy_int];
@@ -146,15 +166,15 @@ class Friendica extends BaseModule
if (!empty($administrator)) {
$admin = [
'name' => $administrator['username'],
- 'profile' => DI::baseUrl()->get() . '/profile/' . $administrator['nickname'],
+ 'profile' => $this->baseUrl . '/profile/' . $administrator['nickname'],
];
}
$visible_addons = Addon::getVisibleList();
- $config->load('feature_lock');
+ $this->config->reload();
$locked_features = [];
- $featureLocks = $config->get('config', 'feature_lock');
+ $featureLocks = $this->config->get('config', 'feature_lock');
if (isset($featureLocks)) {
foreach ($featureLocks as $feature => $lock) {
if ($feature === 'config_loaded') {
@@ -166,22 +186,20 @@ class Friendica extends BaseModule
}
$data = [
- 'version' => FRIENDICA_VERSION,
- 'url' => DI::baseUrl()->get(),
+ 'version' => App::VERSION,
+ 'url' => (string)$this->baseUrl,
'addons' => $visible_addons,
'locked_features' => $locked_features,
- 'explicit_content' => intval($config->get('system', 'explicit_content', 0)),
- 'language' => $config->get('system', 'language'),
+ 'explicit_content' => intval($this->config->get('system', 'explicit_content', 0)),
+ 'language' => $this->config->get('system', 'language'),
'register_policy' => $register_policy,
'admin' => $admin,
- 'site_name' => $config->get('config', 'sitename'),
- 'platform' => strtolower(FRIENDICA_PLATFORM),
- 'info' => $config->get('config', 'info'),
- 'no_scrape_url' => DI::baseUrl()->get() . '/noscrape',
+ 'site_name' => $this->config->get('config', 'sitename'),
+ 'platform' => strtolower(App::PLATFORM),
+ 'info' => $this->config->get('config', 'info'),
+ 'no_scrape_url' => $this->baseUrl . '/noscrape',
];
- header('Content-type: application/json; charset=utf-8');
- echo json_encode($data);
- exit();
+ System::jsonExit($data);
}
}