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

Fix broken Metadata

Browse source
This commit is contained in:
djmaze 2021-11-03 12:02:27 +01:00
parent 0055eb6016
commit 88f603ac3d
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@ class ImapClient extends \MailSo\Net\NetClient
{ {
use Traits\ResponseParser; use Traits\ResponseParser;
// use Commands\ACL; // use Commands\ACL;
use Commands\Metadata;
const const
TAG_PREFIX = 'TAG'; TAG_PREFIX = 'TAG';
@ -730,7 +731,7 @@ class ImapClient extends \MailSo\Net\NetClient
* $aParams[1][] = MODSEQ * $aParams[1][] = MODSEQ
*/ */
$oResult = $this->SendRequestGetResponse(($bIndexIsUid ? 'UID ' : '').'FETCH', $aParams); $oResult = $this->SendRequestGetResponse($bIndexIsUid ? 'UID FETCH' : 'FETCH', $aParams);
} finally { } finally {
$this->aFetchCallbacks = array(); $this->aFetchCallbacks = array();
} }
@ -827,8 +828,6 @@ class ImapClient extends \MailSo\Net\NetClient
*/ */
public function MessageSimpleSearch(string $sSearchCriterias = 'ALL', bool $bReturnUid = true, string $sCharset = '') : array public function MessageSimpleSearch(string $sSearchCriterias = 'ALL', bool $bReturnUid = true, string $sCharset = '') : array
{ {
$sCommandPrefix = ($bReturnUid) ? 'UID ' : '';
$aRequest = array(); $aRequest = array();
if (\strlen($sCharset)) if (\strlen($sCharset))
{ {
@ -838,9 +837,7 @@ class ImapClient extends \MailSo\Net\NetClient
$aRequest[] = !\strlen($sSearchCriterias) || '*' === $sSearchCriterias ? 'ALL' : $sSearchCriterias; $aRequest[] = !\strlen($sSearchCriterias) || '*' === $sSearchCriterias ? 'ALL' : $sSearchCriterias;
$sCmd = 'SEARCH'; $sCont = $this->SendRequest($bReturnUid ? 'UID SEARCH' : 'SEARCH', $aRequest, true);
$sCont = $this->SendRequest($sCommandPrefix.$sCmd, $aRequest, true);
$oResult = $this->getResponse(); $oResult = $this->getResponse();
if ('' !== $sCont) if ('' !== $sCont)
{ {
@ -895,8 +892,7 @@ class ImapClient extends \MailSo\Net\NetClient
\MailSo\Log\Enumerations\Type::ERROR, true); \MailSo\Log\Enumerations\Type::ERROR, true);
} }
$sCommandPrefix = ($bIndexIsUid) ? 'UID ' : ''; $this->SendRequestGetResponse($bReturnUid ? 'UID COPY' : 'COPY',
$this->SendRequestGetResponse($sCommandPrefix.'COPY',
array($sIndexRange, $this->EscapeString($sToFolder))); array($sIndexRange, $this->EscapeString($sToFolder)));
return $this; return $this;
} }
@ -922,8 +918,7 @@ class ImapClient extends \MailSo\Net\NetClient
\MailSo\Log\Enumerations\Type::ERROR, true); \MailSo\Log\Enumerations\Type::ERROR, true);
} }
$sCommandPrefix = ($bIndexIsUid) ? 'UID ' : ''; $this->SendRequestGetResponse($bReturnUid ? 'UID MOVE' : 'MOVE',
$this->SendRequestGetResponse($sCommandPrefix.'MOVE',
array($sIndexRange, $this->EscapeString($sToFolder))); array($sIndexRange, $this->EscapeString($sToFolder)));
return $this; return $this;
} }
@ -969,8 +964,10 @@ class ImapClient extends \MailSo\Net\NetClient
* $sStoreAction[] = (UNCHANGEDSINCE $modsequence) * $sStoreAction[] = (UNCHANGEDSINCE $modsequence)
*/ */
$sCmd = ($bIndexIsUid) ? 'UID STORE' : 'STORE'; $this->SendRequestGetResponse(
$this->SendRequestGetResponse($sCmd, array($sIndexRange, $sStoreAction, $aInputStoreItems)); $bIndexIsUid ? 'UID STORE' : 'STORE',
array($sIndexRange, $sStoreAction, $aInputStoreItems)
);
return $this; return $this;
} }