From 08e83e9216f38f5cc31c95484bd4724d70052433 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 17:34:39 +0100
Subject: [PATCH 1/2] moving mod/apps to src/Module/Apps

---
 mod/apps.php        | 33 ---------------------------------
 src/Module/Apps.php | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 33 deletions(-)
 delete mode 100644 mod/apps.php
 create mode 100644 src/Module/Apps.php

diff --git a/mod/apps.php b/mod/apps.php
deleted file mode 100644
index d497ce93a2..0000000000
--- a/mod/apps.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @file mod/apps.php
- */
-use Friendica\Content\Nav;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\Renderer;
-
-function apps_content()
-{
-	$privateaddons = Config::get('config', 'private_addons');
-	if ($privateaddons === "1") {
-		if (! local_user()) {
-			info(L10n::t('You must be logged in to use addons. '));
-			return;
-		};
-	}
-
-	$title = L10n::t('Applications');
-
-	$apps = Nav::getAppMenu();
-
-	if (count($apps) == 0) {
-		notice(L10n::t('No installed applications.') . EOL);
-	}
-
-	$tpl = Renderer::getMarkupTemplate('apps.tpl');
-	return Renderer::replaceMacros($tpl, [
-		'$title' => $title,
-		'$apps'  => $apps,
-	]);
-}
diff --git a/src/Module/Apps.php b/src/Module/Apps.php
new file mode 100644
index 0000000000..a23ac0a77b
--- /dev/null
+++ b/src/Module/Apps.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Content\Nav;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+
+/**
+ * Shows the App menu
+ */
+class Apps extends BaseModule
+{
+	public static function init()
+	{
+		$privateaddons = Config::get('config', 'private_addons');
+		if ($privateaddons === "1") {
+			if (!local_user()) {
+				self::getApp()->internalRedirect();
+			};
+		}
+	}
+
+	public static function content()
+	{
+		$apps = Nav::getAppMenu();
+
+		if (count($apps) == 0) {
+			notice(L10n::t('No installed applications.') . EOL);
+		}
+
+		$tpl = Renderer::getMarkupTemplate('apps.tpl');
+		return Renderer::replaceMacros($tpl, [
+			'$title' => L10n::t('Applications'),
+			'$apps'  => $apps,
+		]);
+	}
+}

From e31139ed607171e7e9621c21ec833c307e602c2b Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 24 Feb 2019 17:51:53 +0100
Subject: [PATCH 2/2] reduce code

---
 src/Module/Apps.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Module/Apps.php b/src/Module/Apps.php
index a23ac0a77b..efba071aa3 100644
--- a/src/Module/Apps.php
+++ b/src/Module/Apps.php
@@ -16,10 +16,8 @@ class Apps extends BaseModule
 	public static function init()
 	{
 		$privateaddons = Config::get('config', 'private_addons');
-		if ($privateaddons === "1") {
-			if (!local_user()) {
-				self::getApp()->internalRedirect();
-			};
+		if ($privateaddons === "1" && !local_user()) {
+			self::getApp()->internalRedirect();
 		}
 	}