Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

RainLoop: Improve getFoldersFromResult fix

Browse source 
46c3e305d7
This commit is contained in:
djmaze 2021-05-13 01:08:47 +02:00
parent 53333bd56a
commit 30ff459535
1 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

41
snappymail/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php
View file

@ -91,6 +91,34 @@ class ResponseCollection extends \MailSo\Base\Collection
return $aReturn; return $aReturn;
} }
/**
* @param array|string $mName
*/
private function getArrayNameToStringName($mName) : string
{
if (\is_string($mName))
{
return $mName;
}
if (\is_array($mName))
{
if (0 === \count($mName))
{
return '[]';
}
foreach ($mName as &$mSubName)
{
$mSubName = "[{$this->getArrayNameToStringName($mSubName)}]";
}
return \implode('', $mName);
}
return '';
}
public function getFoldersResult(string $sStatus, bool $bUseListStatus = false) : array public function getFoldersResult(string $sStatus, bool $bUseListStatus = false) : array
{ {
$aReturn = array(); $aReturn = array();
@ -110,15 +138,12 @@ class ResponseCollection extends \MailSo\Base\Collection
* https://github.com/the-djmaze/snappymail/issues/1 * https://github.com/the-djmaze/snappymail/issues/1
* https://github.com/the-djmaze/snappymail/issues/70 * https://github.com/the-djmaze/snappymail/issues/70
*/ */
$sFullNameRaw = \array_slice($oResponse->ResponseList, 4); $aFullNameRawList = \array_slice($oResponse->ResponseList, 4);
foreach ($sFullNameRaw as &$name) { foreach ($aFullNameRawList as &$sName) {
if (\is_array($name)) { $sName = $this->getArrayNameToStringName($sName);
$name = "[{$name[0]}]";
} else if (!\is_string($name)) {
$name = '';
} }
}
$sFullNameRaw = \implode('', $sFullNameRaw); $sFullNameRaw = \implode('', $aFullNameRawList);
$oFolder = new Folder($sFullNameRaw, $oFolder = new Folder($sFullNameRaw,
$oResponse->ResponseList[3], $oResponse->ResponseList[2]); $oResponse->ResponseList[3], $oResponse->ResponseList[2]);