X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FFriendica.php;h=0fd7445b15b0db53ee10952b27f3c49009a40a52;hb=e34795762d72347746bd506f253495da7d0ab329;hp=42b1be57dd2fc9301ebce2a29d30e06e2c2b7c2f;hpb=1bc4b2e0788ac11d3b377013b410f2250fff68aa;p=friendica.git

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 42b1be57dd..0fd7445b15 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
@@ -6,8 +25,11 @@ 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\Protocol\ActivityPub;
 
 /**
  * Prints information about the current node
@@ -74,8 +96,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'),
@@ -89,6 +111,15 @@ class Friendica extends BaseModule
 
 	public static function rawContent(array $parameters = [])
 	{
+		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
@@ -111,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' => 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();