From 4b7495b7e762728d31423469398c1bf6f2c2f9c1 Mon Sep 17 00:00:00 2001 From: djmaze Date: Fri, 29 Oct 2021 10:21:19 +0200 Subject: [PATCH] Folder flags case-sensitive not used, so remove them --- .../v/0.0.0/app/libraries/MailSo/Imap/Folder.php | 13 +------------ .../v/0.0.0/app/libraries/MailSo/Mail/Folder.php | 5 ----- .../app/libraries/RainLoop/Actions/Folders.php | 2 +- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Folder.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Folder.php index 038c7a964..1748ca58a 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Folder.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Folder.php @@ -35,11 +35,6 @@ class Folder */ private $sDelimiter; - /** - * @var array - */ - private $aFlags; - /** * @var array */ @@ -68,8 +63,7 @@ class Folder $this->sFullNameRaw = $sFullNameRaw; $this->sDelimiter = $sDelimiter; - $this->aFlags = $aFlags; - $this->aFlagsLowerCase = \array_map('strtolower', $this->aFlags); + $this->aFlagsLowerCase = \array_map('strtolower', $aFlags); $this->sFullNameRaw = 'INBOX'.$this->sDelimiter === \substr(\strtoupper($this->sFullNameRaw), 0, 5 + \strlen($this->sDelimiter)) ? 'INBOX'.\substr($this->sFullNameRaw, 5) : $this->sFullNameRaw; @@ -107,11 +101,6 @@ class Folder return $this->sDelimiter; } - public function Flags() : array - { - return $this->aFlags; - } - public function FlagsLowerCase() : array { return $this->aFlagsLowerCase; diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Folder.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Folder.php index 76308486d..5de1f4344 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Folder.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Folder.php @@ -123,11 +123,6 @@ class Folder implements \JsonSerializable return $this->oImapFolder->Delimiter(); } - public function Flags() : array - { - return $this->oImapFolder->Flags(); - } - public function FlagsLowerCase() : array { return $this->oImapFolder->FlagsLowerCase(); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php index a6c7a5f9c..11f136c2f 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php @@ -458,7 +458,7 @@ trait Folders foreach ($oFolders as $oFolder) { $aResult[] = $oFolder->FullNameRaw()."|". - implode("|", $oFolder->Flags()).($oFolder->IsSubscribed() ? '1' : '0'); + implode("|", $oFolder->FlagsLowerCase()).($oFolder->IsSubscribed() ? '1' : '0'); $oSub = $oFolder->SubFolders(); if ($oSub && 0 < $oSub->Count())