From ed89b608929faf6fedbaa435249da85edb5ac9aa Mon Sep 17 00:00:00 2001 From: LukaszC86 <38657823+LukaszC86@users.noreply.github.com> Date: Tue, 8 Nov 2022 09:36:13 +0100 Subject: [PATCH] 2.20.5 - fix for broken admin login In 2.20.5 if you try to login to admin panel you get errors: PHP message: PHP Notice: Undefined variable: sToken in /(...)/snappymail/v/2.20.5/app/libraries/RainLoop/ActionsAdmin.php on line 126 SERVICE[WARNING]: Argument 1 passed to RainLoop\ActionsAdmin::setAdminAuthToken() must be of the type string, null given, called in /(...)/snappymail/v/2.20.5/app/libraries/RainLoop/ActionsAdmin.php on line 126 --- snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php index 91d3393f7..d96e738fa 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php @@ -123,7 +123,7 @@ class ActionsAdmin extends Actions throw new ClientException(Notifications::AuthError); } - $sToken = $this->setAdminAuthToken($sToken); + $sToken = $this->setAdminAuthToken(); return $this->DefaultResponse(__FUNCTION__, $sToken ? $this->AppData(true) : false); } @@ -667,7 +667,7 @@ class ActionsAdmin extends Actions return $this->DefaultResponse(__FUNCTION__, $QR->__toString()); } - private function setAdminAuthToken(string $sToken) : string + private function setAdminAuthToken() : string { $sRand = \MailSo\Base\Utils::Sha1Rand(); if (!$this->Cacher(null, true)->Set(KeyPathHelper::SessionAdminKey($sRand), \time())) {