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

RainLoop: Fix folder names parser

Browse source 
9bcb8ae02c
This commit is contained in:
djmaze 2021-05-13 01:00:02 +02:00
parent df8de36f91
commit 53333bd56a
1 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

37
snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
View file

@ -1093,6 +1093,17 @@ class ImapClient extends \MailSo\Net\NetClient
return $oResult; return $oResult;
} }
private function skipBracketParse(?Response $oImapResponse) : bool
{
return $oImapResponse &&
$oImapResponse->ResponseType === \MailSo\Imap\Enumerations\ResponseType::UNTAGGED &&
(
($oImapResponse->StatusOrIndex === 'STATUS' && 2 === \count($oImapResponse->ResponseList)) ||
($oImapResponse->StatusOrIndex === 'LIST' && 4 === \count($oImapResponse->ResponseList)) ||
($oImapResponse->StatusOrIndex === 'LSUB' && 4 === \count($oImapResponse->ResponseList))
);
}
/** /**
* @return array|string * @return array|string
* @throws \MailSo\Net\Exceptions\Exception * @throws \MailSo\Net\Exceptions\Exception
@ -1276,8 +1287,16 @@ class ImapClient extends \MailSo\Net\NetClient
{ {
case ']' === $sChar: case ']' === $sChar:
case ')' === $sChar: case ')' === $sChar:
++$iPos; if ($this->skipBracketParse($oImapResponse))
$sPreviousAtomUpperCase = null; {
$bIsGotoDefault = true;
$bIsGotoNotAtomBracket = false;
}
else
{
++$iPos;
$sPreviousAtomUpperCase = null;
}
break 2; break 2;
case ' ' === $sChar: case ' ' === $sChar:
if ($bTreatAsAtom) if ($bTreatAsAtom)
@ -1294,12 +1313,20 @@ class ImapClient extends \MailSo\Net\NetClient
{ {
$sAtomBuilder .= $sChar; $sAtomBuilder .= $sChar;
$bIsGotoAtomBracket = true; $bIsGotoAtomBracket = true;
$this->iResponseBufParsedPos = ++$iPos;
}
else if ($this->skipBracketParse($oImapResponse))
{
$sOpenBracket = '';
$sClosingBracket = '';
$bIsGotoDefault = true;
$bIsGotoNotAtomBracket = false;
} }
else else
{ {
$bIsGotoNotAtomBracket = true; $bIsGotoNotAtomBracket = true;
$this->iResponseBufParsedPos = ++$iPos;
} }
$this->iResponseBufParsedPos = ++$iPos;
break; break;
case '{' === $sChar: case '{' === $sChar:
$bIsLiteralParsed = false; $bIsLiteralParsed = false;
@ -1427,6 +1454,10 @@ class ImapClient extends \MailSo\Net\NetClient
$sCharDef = $this->sResponseBuffer[$iPos]; $sCharDef = $this->sResponseBuffer[$iPos];
switch (true) switch (true)
{ {
case ('[' === $sCharDef || ']' === $sCharDef || '(' === $sCharDef || ')' === $sCharDef) &&
$this->skipBracketParse($oImapResponse):
++$iPos;
break;
case '[' === $sCharDef: case '[' === $sCharDef:
if (null === $sAtomBuilder) if (null === $sAtomBuilder)
{ {