From b80e62adfce27891f54081314c7990892bb9cc09 Mon Sep 17 00:00:00 2001
From: djmaze <>
Date: Thu, 23 Dec 2021 12:26:39 +0100
Subject: [PATCH] Changes for #176

---
 .../v/0.0.0/app/libraries/RainLoop/Actions/Admin.php  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
index 51cd9430e..788ddb002 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
@@ -32,8 +32,15 @@ trait Admin
 
 	private function getAdminAuthKey() : string
 	{
-		$aAdminHash = Utils::DecodeKeyValuesQ(Utils::GetCookie(static::$AUTH_ADMIN_TOKEN_KEY, ''));
-		return (empty($aAdminHash[1]) || 'token' !== $aAdminHash[0]) ? '' : $aAdminHash[1];
+		$cookie = Utils::GetCookie(static::$AUTH_ADMIN_TOKEN_KEY, '');
+		if ($cookie) {
+			$aAdminHash = Utils::DecodeKeyValuesQ($cookie);
+			if (!empty($aAdminHash[1]) && 'token' === $aAdminHash[0]) {
+				return $aAdminHash[1];
+			}
+			Utils::ClearCookie(static::$AUTH_ADMIN_TOKEN_KEY);
+		}
+		return '';
 	}
 
 	private function setAdminAuthToken(string $sToken) : void