X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModule%2FApps.php;h=07863e44c5aeb9f9c8ef715f9039bbf4e6670e52;hb=f0743e4e128dfcb5d6305f4ed09e969573ba6b15;hp=29a735121d2b57dadd169288749f0b99c1a69ce5;hpb=71820db023f769afa22a5f1362913b8e22199cf1;p=friendica.git

diff --git a/src/Module/Apps.php b/src/Module/Apps.php
index 29a735121d..07863e44c5 100644
--- a/src/Module/Apps.php
+++ b/src/Module/Apps.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,35 +21,50 @@
 
 namespace Friendica\Module;
 
+use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Nav;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Navigation\SystemMessages;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  * Shows the App menu
  */
 class Apps extends BaseModule
 {
-	public static function init(array $parameters = [])
+	/** @var Nav */
+	protected $nav;
+	/** @var SystemMessages */
+	protected $systemMessages;
+
+	public function __construct(SystemMessages $systemMessages, Nav $nav, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
 	{
-		$privateaddons = DI::config()->get('config', 'private_addons');
-		if ($privateaddons === "1" && !local_user()) {
-			DI::baseUrl()->redirect();
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+		$this->nav = $nav;
+		$this->systemMessages = $systemMessages;
+
+		$privateaddons = $config->get('config', 'private_addons');
+		if ($privateaddons === "1" && !$session->getLocalUserId()) {
+			$baseUrl->redirect();
 		}
 	}
 
-	public static function content(array $parameters = [])
+	protected function content(array $request = []): string
 	{
-		$apps = Nav::getAppMenu();
-
+		$apps = $this->nav->getAppMenu();
 		if (count($apps) == 0) {
-			notice(DI::l10n()->t('No installed applications.'));
+			$this->systemMessages->addNotice($this->t('No installed applications.'));
 		}
 
 		$tpl = Renderer::getMarkupTemplate('apps.tpl');
 		return Renderer::replaceMacros($tpl, [
-			'$title' => DI::l10n()->t('Applications'),
+			'$title' => $this->t('Applications'),
 			'$apps'  => $apps,
 		]);
 	}