X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FFriendica.php;h=37bd69da498102dc3fc4155a4fcfc34902244c03;hb=02bca72de35949666026f30c8dc7418fe696393d;hp=53bb6eaf682b2e66f31870558ac1662b16b5420b;hpb=7e1cbf8f67c1320333c6f251261dcefe8564c15e;p=friendica.git diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php index 53bb6eaf68..37bd69da49 100644 --- a/src/Module/Friendica.php +++ b/src/Module/Friendica.php @@ -1,14 +1,37 @@ . + * + */ namespace Friendica\Module; +use Friendica\App; 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\Network\HTTPException; +use Friendica\Protocol\ActivityPub; /** * Prints information about the current node @@ -16,7 +39,7 @@ use Friendica\Model\User; */ class Friendica extends BaseModule { - public static function content(array $parameters = []) + protected function content(array $request = []): string { $config = DI::config(); @@ -37,29 +60,30 @@ 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.', DI::baseUrl()->get()) : + 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.'), - 'header' => [ - L10n::t('Blocked domain'), - L10n::t('Reason for the block'), + '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; @@ -72,14 +96,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.', - '' . FRIENDICA_VERSION . '', + '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.', + '' . App::VERSION . '', DI::baseUrl()->get(), - '' . 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'), + '' . $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'), 'visible_addons' => $addon, 'tos' => $tos, @@ -88,13 +112,22 @@ class Friendica extends BaseModule ]); } - public static function rawContent(array $parameters = []) + protected function rawContent(array $request = []) { - $app = DI::app(); - // @TODO: Replace with parameter from router - if ($app->argc <= 1 || ($app->argv[1] !== 'json')) { - return; + 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']); + } } $config = DI::config(); @@ -112,21 +145,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' => DI::baseUrl()->get() . '/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(); @@ -145,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, @@ -154,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); } }