the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-02-24 23:08:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

Better hashFolderFullName()

Browse source
This commit is contained in:
djmaze 2021-12-01 13:55:14 +01:00
parent 547d66ebcb
commit b8eb8f83fa
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
View file

@ -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)