From 60b0fb4b35a62e184591e39ddd83083d389dc119 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Thu, 4 Nov 2021 10:28:51 +0100
Subject: [PATCH] Better fix for #1 and RainLoop#2081 The RainLoop
 skipSquareBracketParse wasn't perfect either

---
 .../MailSo/Imap/ResponseCollection.php        | 43 +-------------
 .../MailSo/Imap/Traits/ResponseParser.php     | 56 ++++++++++---------
 2 files changed, 33 insertions(+), 66 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php
index f99d38809..102267fc6 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php
@@ -88,34 +88,6 @@ class ResponseCollection extends \MailSo\Base\Collection
 		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 getFolderMetadataResult() : array
 	{
 		$aReturn = array();
@@ -154,21 +126,10 @@ class ResponseCollection extends \MailSo\Base\Collection
 				}
 				$aReturn[$sFullNameRaw]->setStatusFromResponse($oResponse);
 			}
-			else if ($sStatus === $oResponse->StatusOrIndex && 5 <= count($oResponse->ResponseList)) {
+			else if ($sStatus === $oResponse->StatusOrIndex && 5 == \count($oResponse->ResponseList)) {
 				try
 				{
-					/**
-					 * A bug in the parser converts folder names that start with '[' into arrays,
-					 * and subfolders are in $oResponse->ResponseList[5+]
-					 * https://github.com/the-djmaze/snappymail/issues/1
-					 * https://github.com/the-djmaze/snappymail/issues/70
-					 */
-					$aFullNameRawList = \array_slice($oResponse->ResponseList, 4);
-					foreach ($aFullNameRawList as &$sName) {
-						$sName = $this->getArrayNameToStringName($sName);
-					}
-
-					$sFullNameRaw = \implode('', $aFullNameRawList);
+					$sFullNameRaw = $oResponse->ResponseList[4];
 
 					/**
 					 * $oResponse->ResponseList[0] = *
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php
index 11a894842..623b5894d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php
@@ -42,15 +42,23 @@ trait ResponseParser
 		return $oResponse;
 	}
 
-	private function skipBracketParse(?Response $oImapResponse) : bool
+	/**
+	 * A bug in the parser converts folder names that start with '[' into arrays.
+	 * https://github.com/the-djmaze/snappymail/issues/1
+	 * https://github.com/the-djmaze/snappymail/issues/70
+	 * The fix RainLoop implemented isn't correct either.
+	 * This one should as RFC 3501 only mentions:
+	 *
+	 * 	Status responses are OK, NO, BAD, PREAUTH and BYE.
+	 *
+	 *	Status responses MAY include an OPTIONAL "response code".  A response
+	 *	code consists of data inside square brackets in the form of an atom,
+	 *	possibly followed by a space and arguments.
+	 */
+	private function skipSquareBracketParse(?Response $oImapResponse) : bool
 	{
-		return $oImapResponse &&
-			$oImapResponse->ResponseType === ResponseType::UNTAGGED &&
-			(
-				($oImapResponse->StatusOrIndex === 'STATUS' && 2 === \count($oImapResponse->ResponseList)) ||
-				($oImapResponse->StatusOrIndex === 'LIST' && 4 === \count($oImapResponse->ResponseList)) ||
-				($oImapResponse->StatusOrIndex === 'LSUB' && 4 === \count($oImapResponse->ResponseList))
-			);
+		return $oImapResponse
+			&& !($oImapResponse->IsStatusResponse && 2 < \count($oImapResponse->ResponseList));
 	}
 
 	/**
@@ -234,18 +242,16 @@ trait ResponseParser
 			switch (true)
 			{
 				case ']' === $sChar:
-				case ')' === $sChar:
-					if ($this->skipBracketParse($oImapResponse))
-					{
+					if ($this->skipSquareBracketParse($oImapResponse)) {
 						$bIsGotoDefault = true;
 						$bIsGotoNotAtomBracket = false;
+						break 2;
 					}
-					else
-					{
-						++$iPos;
-						$sPreviousAtomUpperCase = null;
-					}
+				case ')' === $sChar:
+					++$iPos;
+					$sPreviousAtomUpperCase = null;
 					break 2;
+
 				case ' ' === $sChar:
 					if ($bTreatAsAtom)
 					{
@@ -253,7 +259,13 @@ trait ResponseParser
 					}
 					++$iPos;
 					break;
+
 				case '[' === $sChar:
+					if ($this->skipSquareBracketParse($oImapResponse)) {
+						$bIsGotoDefault = true;
+						$bIsGotoNotAtomBracket = false;
+						break;
+					}
 				case '(' === $sChar:
 					$sOpenBracket = $sChar;
 					$sClosingBracket = '[' === $sChar ? ']' : ')';
@@ -263,19 +275,13 @@ trait ResponseParser
 						$bIsGotoAtomBracket = true;
 						$this->iResponseBufParsedPos = ++$iPos;
 					}
-					else if ($this->skipBracketParse($oImapResponse))
-					{
-						$sOpenBracket = '';
-						$sClosingBracket = '';
-						$bIsGotoDefault = true;
-						$bIsGotoNotAtomBracket = false;
-					}
 					else
 					{
 						$bIsGotoNotAtomBracket = true;
 						$this->iResponseBufParsedPos = ++$iPos;
 					}
 					break;
+
 				case '{' === $sChar:
 					$bIsLiteralParsed = false;
 					$mLiteralEndPos = \strpos($this->sResponseBuffer, '}', $iPos);
@@ -297,6 +303,7 @@ trait ResponseParser
 					}
 					$sPreviousAtomUpperCase = null;
 					break;
+
 				case '"' === $sChar:
 					$bIsQuotedParsed = false;
 					while (true)
@@ -402,8 +409,7 @@ trait ResponseParser
 						$sCharDef = $this->sResponseBuffer[$iPos];
 						switch (true)
 						{
-							case ('[' === $sCharDef || ']' === $sCharDef || '(' === $sCharDef || ')' === $sCharDef) &&
-								$this->skipBracketParse($oImapResponse):
+							case ('[' === $sCharDef || ']' === $sCharDef) && $this->skipSquareBracketParse($oImapResponse):
 								++$iPos;
 								break;
 							case '[' === $sCharDef: