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

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index ae8ea14968..0fd7445b15 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -1,13 +1,35 @@
 <?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;
 
 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
@@ -15,10 +37,9 @@ use Friendica\Model\User;
  */
 class Friendica extends BaseModule
 {
-	public static function content()
+	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 <a href="%1$s/tos">Terms of Service</a> of this node.', $app->getBaseURL()) :
+			DI::l10n()->t('Read about the <a href="%1$s/tos">Terms of Service</a> 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.',
 				'<strong>' . FRIENDICA_VERSION . '</strong>',
-				$app->getBaseURL(),
-				'<strong>' . DB_UPDATE_VERSION . '</strong>',
-				'<strong>' . $config->get('system', 'post_update_version') . '</strong>'),
-			'friendica' => L10n::t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.'),
-			'bugs'      => L10n::t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">' . L10n::t('the bugtracker at github') . '</a>',
-			'info'      => L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
+				DI::baseUrl()->get(),
+				'<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'),
 
 			'visible_addons' => $addon,
 			'tos'            => $tos,
@@ -88,16 +109,25 @@ class Friendica extends BaseModule
 		]);
 	}
 
-	public static function rawContent()
+	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');