From b8eb8f83fa7a4063af47c4f67a3d41c91d6f0073 Mon Sep 17 00:00:00 2001 From: djmaze Date: Wed, 1 Dec 2021 13:55:14 +0100 Subject: [PATCH] Better hashFolderFullName() --- .../v/0.0.0/app/libraries/RainLoop/Actions/Response.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php index bed308d94..1b72151b9 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php @@ -141,9 +141,8 @@ trait Response private function hashFolderFullName(string $sFolderFullName) : string { - return \in_array(\strtolower($sFolderFullName), array('inbox', 'sent', 'send', 'drafts', - 'spam', 'junk', 'bin', 'trash', 'archive', 'allmail', 'all')) ? - $sFolderFullName : \md5($sFolderFullName); +// return \strspn(\mb_strtolower($sFolderFullName), ':/#?') ? \md5($sFolderFullName) : $sFolderFullName; + return \preg_match('/^[a-z0-9]+$/iu', $sFolderFullName) ? $sFolderFullName : \md5($sFolderFullName); } /** @@ -394,7 +393,7 @@ trait Response return \array_merge( $mResponse->jsonSerialize(), array( - 'FullNameHash' => $this->hashFolderFullName($mResponse->FullName(), $mResponse->FullName()), + 'FullNameHash' => $this->hashFolderFullName($mResponse->FullName()), 'Checkable' => \in_array($mResponse->FullName(), $this->aCheckableFolder), 'Extended' => $aExtended, 'SubFolders' => $this->responseObject($mResponse->SubFolders(), $sParent, $aParameters)