mirror of
https://github.com/the-djmaze/snappymail.git
synced 2025-02-25 07:16:21 +08:00
Better hashFolderFullName()
This commit is contained in:
parent
547d66ebcb
commit
b8eb8f83fa
1 changed files with 3 additions and 4 deletions
|
@ -141,9 +141,8 @@ trait Response
|
||||||
|
|
||||||
private function hashFolderFullName(string $sFolderFullName) : string
|
private function hashFolderFullName(string $sFolderFullName) : string
|
||||||
{
|
{
|
||||||
return \in_array(\strtolower($sFolderFullName), array('inbox', 'sent', 'send', 'drafts',
|
// return \strspn(\mb_strtolower($sFolderFullName), ':/#?') ? \md5($sFolderFullName) : $sFolderFullName;
|
||||||
'spam', 'junk', 'bin', 'trash', 'archive', 'allmail', 'all')) ?
|
return \preg_match('/^[a-z0-9]+$/iu', $sFolderFullName) ? $sFolderFullName : \md5($sFolderFullName);
|
||||||
$sFolderFullName : \md5($sFolderFullName);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -394,7 +393,7 @@ trait Response
|
||||||
return \array_merge(
|
return \array_merge(
|
||||||
$mResponse->jsonSerialize(),
|
$mResponse->jsonSerialize(),
|
||||||
array(
|
array(
|
||||||
'FullNameHash' => $this->hashFolderFullName($mResponse->FullName(), $mResponse->FullName()),
|
'FullNameHash' => $this->hashFolderFullName($mResponse->FullName()),
|
||||||
'Checkable' => \in_array($mResponse->FullName(), $this->aCheckableFolder),
|
'Checkable' => \in_array($mResponse->FullName(), $this->aCheckableFolder),
|
||||||
'Extended' => $aExtended,
|
'Extended' => $aExtended,
|
||||||
'SubFolders' => $this->responseObject($mResponse->SubFolders(), $sParent, $aParameters)
|
'SubFolders' => $this->responseObject($mResponse->SubFolders(), $sParent, $aParameters)
|
||||||
|
|
Loading…
Reference in a new issue