X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FFriendica.php;h=0fd7445b15b0db53ee10952b27f3c49009a40a52;hb=e34795762d72347746bd506f253495da7d0ab329;hp=ee8b2206119d53262c354de26721d1addbf3df6a;hpb=c961128416390dab45bd5bd88ec4bf7823394413;p=friendica.git
diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index ee8b220611..0fd7445b15 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -1,13 +1,35 @@
.
+ *
+ */
namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\Addon;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\Core\System;
+use Friendica\Database\PostUpdate;
+use Friendica\DI;
use Friendica\Model\User;
+use Friendica\Protocol\ActivityPub;
/**
* Prints information about the current node
@@ -17,8 +39,7 @@ class Friendica extends BaseModule
{
public static function content(array $parameters = [])
{
- $app = self::getApp();
- $config = $app->getConfig();
+ $config = DI::config();
$visibleAddonList = Addon::getVisibleList();
if (!empty($visibleAddonList)) {
@@ -37,27 +58,27 @@ class Friendica extends BaseModule
}
}
$addon = [
- 'title' => L10n::t('Installed addons/apps:'),
+ 'title' => DI::l10n()->t('Installed addons/apps:'),
'list' => $sortedAddonList,
];
} else {
$addon = [
- 'title' => L10n::t('No installed addons/apps'),
+ 'title' => DI::l10n()->t('No installed addons/apps'),
];
}
$tos = ($config->get('system', 'tosdisplay')) ?
- L10n::t('Read about the Terms of Service of this node.', $app->getBaseURL()) :
+ DI::l10n()->t('Read about the Terms of Service of this node.', DI::baseUrl()->get()) :
'';
$blockList = $config->get('system', 'blocklist');
if (!empty($blockList)) {
$blocked = [
- 'title' => L10n::t('On this server the following remote servers are blocked.'),
+ 'title' => DI::l10n()->t('On this server the following remote servers are blocked.'),
'header' => [
- L10n::t('Blocked domain'),
- L10n::t('Reason for the block'),
+ DI::l10n()->t('Blocked domain'),
+ DI::l10n()->t('Reason for the block'),
],
'list' => $blockList,
];
@@ -72,14 +93,14 @@ class Friendica extends BaseModule
$tpl = Renderer::getMarkupTemplate('friendica.tpl');
return Renderer::replaceMacros($tpl, [
- 'about' => 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.',
+ '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->getBaseURL(),
- '' . DB_UPDATE_VERSION . '',
- '' . $config->get('system', 'post_update_version') . ''),
- 'friendica' => L10n::t('Please visit Friendi.ca to learn more about the Friendica project.'),
- 'bugs' => L10n::t('Bug reports and issues: please visit') . ' ' . '' . L10n::t('the bugtracker at github') . '',
- 'info' => L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
+ DI::baseUrl()->get(),
+ '' . DB_UPDATE_VERSION . '/' . $config->get('system', 'build') .'',
+ '' . PostUpdate::VERSION . '/' . $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'),
'visible_addons' => $addon,
'tos' => $tos,
@@ -90,14 +111,23 @@ class Friendica extends BaseModule
public static function rawContent(array $parameters = [])
{
- $app = self::getApp();
+ if (ActivityPub::isRequest()) {
+ $data = ActivityPub\Transmitter::getProfile(0);
+ if (!empty($data)) {
+ header('Access-Control-Allow-Origin: *');
+ header('Cache-Control: max-age=23200, stale-while-revalidate=23200');
+ System::jsonExit($data, 'application/activity+json');
+ }
+ }
+
+ $app = DI::app();
// @TODO: Replace with parameter from router
if ($app->argc <= 1 || ($app->argv[1] !== 'json')) {
return;
}
- $config = $app->getConfig();
+ $config = DI::config();
$register_policies = [
Register::CLOSED => 'REGISTER_CLOSED',
@@ -112,21 +142,13 @@ class Friendica extends BaseModule
$register_policy = $register_policies[$register_policy_int];
}
- $condition = [];
- $admin = false;
- if (!empty($config->get('config', 'admin_nickname'))) {
- $condition['nickname'] = $config->get('config', 'admin_nickname');
- }
- if (!empty($config->get('config', 'admin_email'))) {
- $adminList = explode(',', str_replace(' ', '', $config->get('config', 'admin_email')));
- $condition['email'] = $adminList[0];
- $administrator = User::getByEmail($adminList[0], ['username', 'nickname']);
- if (!empty($administrator)) {
- $admin = [
- 'name' => $administrator['username'],
- 'profile' => $app->getBaseURL() . '/profile/' . $administrator['nickname'],
- ];
- }
+ $admin = [];
+ $administrator = User::getFirstAdmin(['username', 'nickname']);
+ if (!empty($administrator)) {
+ $admin = [
+ 'name' => $administrator['username'],
+ 'profile' => DI::baseUrl()->get() . '/profile/' . $administrator['nickname'],
+ ];
}
$visible_addons = Addon::getVisibleList();
@@ -146,7 +168,7 @@ class Friendica extends BaseModule
$data = [
'version' => FRIENDICA_VERSION,
- 'url' => $app->getBaseURL(),
+ 'url' => DI::baseUrl()->get(),
'addons' => $visible_addons,
'locked_features' => $locked_features,
'explicit_content' => intval($config->get('system', 'explicit_content', 0)),
@@ -154,9 +176,9 @@ class Friendica extends BaseModule
'register_policy' => $register_policy,
'admin' => $admin,
'site_name' => $config->get('config', 'sitename'),
- 'platform' => FRIENDICA_PLATFORM,
+ 'platform' => strtolower(FRIENDICA_PLATFORM),
'info' => $config->get('config', 'info'),
- 'no_scrape_url' => $app->getBaseURL() . '/noscrape',
+ 'no_scrape_url' => DI::baseUrl()->get() . '/noscrape',
];
header('Content-type: application/json; charset=utf-8');