From 5c229336287c5ad212d22bdbcc0598ea7cfc03c1 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Mon, 14 Feb 2022 15:39:47 +0100 Subject: [PATCH] Small restructure --- .../v/0.0.0/app/libraries/MailSo/Imap/Commands/Quota.php | 2 +- snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Quota.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Quota.php index 8fe235e71..de5305a07 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Quota.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Quota.php @@ -46,13 +46,13 @@ trait Quota : null; } + // * QUOTA "User quota" (STORAGE 1284645 2097152)\r\n private function getQuotaResult(\MailSo\Imap\ResponseCollection $oResponseCollection) : array { $aReturn = array(0, 0); foreach ($oResponseCollection as $oResponse) { if (Enumerations\ResponseType::UNTAGGED === $oResponse->ResponseType && 'QUOTA' === $oResponse->StatusOrIndex - && \is_array($oResponse->ResponseList) && isset($oResponse->ResponseList[3]) && \is_array($oResponse->ResponseList[3]) && 2 < \count($oResponse->ResponseList[3]) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php index 6704d72ea..f68f5bb6d 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php @@ -51,7 +51,6 @@ trait User { $sEmail = \MailSo\Base\Utils::Trim($this->GetActionParam('Email', '')); $sPassword = $this->GetActionParam('Password', ''); - $sLanguage = $this->GetActionParam('Language', ''); $bSignMe = !empty($this->GetActionParam('SignMe', 0)); $oAccount = null; @@ -63,7 +62,8 @@ trait User $this->SetAuthToken($oAccount); - if ($oAccount && \strlen($sLanguage)) + $sLanguage = $this->GetActionParam('Language', ''); + if ($oAccount && $sLanguage) { $oSettings = $this->SettingsProvider()->Load($oAccount); if ($oSettings)