X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModule%2FFriendica.php;h=c5a66fa3d5038ffc0e23f6caa22a95899a4250f9;hb=e4682a522e34c8484889c66aa018ba83d20c7aab;hp=3325b1ae82bfc283029956137d784bfa0fd47b41;hpb=13a10b8f20ac7c5927c39d9e80e1a7d515385736;p=friendica.git

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 3325b1ae82..c5a66fa3d5 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,8 +25,12 @@ use Friendica\BaseModule;
 use Friendica\Core\Addon;
 use Friendica\Core\Hook;
 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
@@ -34,7 +38,7 @@ use Friendica\Model\User;
  */
 class Friendica extends BaseModule
 {
-	public static function content(array $parameters = [])
+	protected function content(array $request = []): string
 	{
 		$config = DI::config();
 
@@ -93,8 +97,8 @@ class Friendica extends BaseModule
 			'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.',
 				'<strong>' . FRIENDICA_VERSION . '</strong>',
 				DI::baseUrl()->get(),
-				'<strong>' . DB_UPDATE_VERSION . '</strong>',
-				'<strong>' . $config->get('system', 'post_update_version') . '</strong>'),
+				'<strong>' . DB_UPDATE_VERSION . '/' . $config->get('system', 'build') .'</strong>',
+				'<strong>' . PostUpdate::VERSION . '/' . $config->get('system', 'post_update_version') . '</strong>'),
 			'friendica' => DI::l10n()->t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.'),
 			'bugs'      => DI::l10n()->t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">' . DI::l10n()->t('the bugtracker at github') . '</a>',
 			'info'      => DI::l10n()->t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
@@ -106,13 +110,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();
@@ -130,21 +143,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();
@@ -177,8 +182,6 @@ class Friendica extends BaseModule
 			'no_scrape_url'    => DI::baseUrl()->get() . '/noscrape',
 		];
 
-		header('Content-type: application/json; charset=utf-8');
-		echo json_encode($data);
-		exit();
+		System::jsonExit($data);
 	}
 }