From c1dd6edc28e57fa75fc4cb86a2cd05326ccb7192 Mon Sep 17 00:00:00 2001
From: djmaze <>
Date: Tue, 28 Dec 2021 14:49:21 +0100
Subject: [PATCH] allowAdminPanel => adminAllowed

---
 dev/App/Admin.js                                      | 2 +-
 dev/Common/Links.js                                   | 2 +-
 snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php | 4 ++--
 snappymail/v/0.0.0/app/libraries/RainLoop/Service.php | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dev/App/Admin.js b/dev/App/Admin.js
index 7d362b605..bbf3e5f66 100644
--- a/dev/App/Admin.js
+++ b/dev/App/Admin.js
@@ -17,7 +17,7 @@ class AdminApp extends AbstractApp {
 	}
 
 	start() {
-		if (!Settings.app('allowAdminPanel')) {
+		if (!Settings.app('adminAllowed')) {
 			rl.route.root();
 			setTimeout(() => location.href = '/', 1);
 		} else if (SettingsGet('Auth')) {
diff --git a/dev/Common/Links.js b/dev/Common/Links.js
index 0cf3b7cca..b8769e56b 100644
--- a/dev/Common/Links.js
+++ b/dev/Common/Links.js
@@ -21,7 +21,7 @@ export const
 	 * @returns {string}
 	 */
 	logoutLink = () => (rl.adminArea() && !Settings.app('adminHostUse'))
-		? SERVER_PREFIX + (Settings.app('adminPath') || 'admin')
+		? SERVER_PREFIX + Settings.app('adminPath')
 		: ROOT,
 
 	/**
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index 948ffc43c..87ed7cf58 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -718,8 +718,8 @@ class Actions
 			'attachmentsActions' => $aAttachmentsActions
 		), $bAdmin ? array(
 			'adminHostUse' => '' !== $oConfig->Get('security', 'admin_panel_host', ''),
-			'adminPath' => \strtolower($oConfig->Get('security', 'admin_panel_key', 'admin')),
-			'allowAdminPanel' => (bool)$oConfig->Get('security', 'allow_admin_panel', true),
+			'adminPath' => $oConfig->Get('security', 'admin_panel_key', '') ?: 'admin',
+			'adminAllowed' => (bool)$oConfig->Get('security', 'allow_admin_panel', true),
 		) : array());
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
index 96e52e4ab..7da25e125 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -104,8 +104,7 @@ class Service
 		$sAdminPanelHost = $oConfig->Get('security', 'admin_panel_host', '');
 		if (empty($sAdminPanelHost))
 		{
-			$sAdminPanelKey = \strtolower($oConfig->Get('security', 'admin_panel_key', 'admin'));
-			$bAdmin = !empty($aPaths[0]) && \strtolower($aPaths[0]) === $sAdminPanelKey;
+			$bAdmin = !empty($aPaths[0]) && ($oConfig->Get('security', 'admin_panel_key', '') ?: 'admin') === $aPaths[0];
 		}
 		else if (empty($aPaths[0]) &&
 			\mb_strtolower($sAdminPanelHost) === \mb_strtolower($this->oHttp->GetHost()))