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

Use new FolderStatusAndSelect() on MessageList()

Browse source
This commit is contained in:
the-djmaze 2022-12-05 10:32:12 +01:00
parent a7f93ef864
commit d48b3a74fc
1 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
View file

@ -503,11 +503,7 @@ class MailClient
{ {
list($iCount, $iUnseenCount, $iUidNext, $iHighestModSeq, $iAppendLimit, $sMailboxId) = $this->initFolderValues($sFolderName); list($iCount, $iUnseenCount, $iUidNext, $iHighestModSeq, $iAppendLimit, $sMailboxId) = $this->initFolderValues($sFolderName);
/* /*
// Don't use FolderExamine, else PERMANENTFLAGS is empty in Dovecot $oInfo = $this->oImapClient->FolderStatusAndSelect($sFolderName);
$oInfo = $this->oImapClient->FolderSelect($sFolderName);
$oInfo->UNSEEN = $iUnseenCount;
$oInfo->HIGHESTMODSEQ = $iHighestModSeq;
$oInfo->Hash = $this->GenerateFolderHash($oInfo->FolderName, $oInfo->MESSAGES, $oInfo->UIDNEXT, $oInfo->HIGHESTMODSEQ);
*/ */
$aFlags = array(); $aFlags = array();
if ($oRange && \count($oRange)) { if ($oRange && \count($oRange)) {
@ -539,6 +535,7 @@ class MailClient
// 'Flags' => $oInfo->Flags, // 'Flags' => $oInfo->Flags,
// 'PermanentFlags' => $oInfo->PermanentFlags, // 'PermanentFlags' => $oInfo->PermanentFlags,
'Hash' => $this->GenerateFolderHash($sFolderName, $iCount, $iUidNext, $iHighestModSeq), 'Hash' => $this->GenerateFolderHash($sFolderName, $iCount, $iUidNext, $iHighestModSeq),
// 'Hash' => $this->GenerateFolderHash($sFolderName, $oInfo->MESSAGES, $oInfo->UIDNEXT, $oInfo->HIGHESTMODSEQ);
'MessagesFlags' => $aFlags, 'MessagesFlags' => $aFlags,
'NewMessages' => $this->getFolderNextMessageInformation($sFolderName, $iPrevUidNext, $iUidNext) 'NewMessages' => $this->getFolderNextMessageInformation($sFolderName, $iPrevUidNext, $iUidNext)
); );
@ -820,12 +817,7 @@ class MailClient
$oMessageCollection->ThreadUid = $oParams->iThreadUid; $oMessageCollection->ThreadUid = $oParams->iThreadUid;
$oMessageCollection->Filtered = '' !== \MailSo\Config::$MessageListPermanentFilter; $oMessageCollection->Filtered = '' !== \MailSo\Config::$MessageListPermanentFilter;
list($iMessageRealCount, $iMessageUnseenCount, $iUidNext, $iHighestModSeq) = $this->initFolderValues($oParams->sFolderName); $oInfo = $this->oImapClient->FolderStatusAndSelect($oParams->sFolderName);
// Don't use FolderExamine, else PERMANENTFLAGS is empty in Dovecot
$oInfo = $this->oImapClient->FolderSelect($oParams->sFolderName);
$oInfo->UNSEEN = $iMessageUnseenCount;
$oInfo->HIGHESTMODSEQ = $iHighestModSeq;
// $oInfo->Hash = $this->GenerateFolderHash($oInfo->FolderName, $oInfo->MESSAGES, $oInfo->UIDNEXT, $oInfo->HIGHESTMODSEQ);
$oMessageCollection->FolderInfo = $oInfo; $oMessageCollection->FolderInfo = $oInfo;
$aUids = array(); $aUids = array();
@ -847,19 +839,19 @@ class MailClient
} }
$oMessageCollection->FolderHash = $this->GenerateFolderHash( $oMessageCollection->FolderHash = $this->GenerateFolderHash(
$oParams->sFolderName, $iMessageRealCount, $iUidNext, $oInfo->HIGHESTMODSEQ ?: 0 $oParams->sFolderName, $oInfo->MESSAGES, $oInfo->UIDNEXT, $oInfo->HIGHESTMODSEQ
); );
if (!$oParams->iThreadUid) if (!$oParams->iThreadUid)
{ {
$oMessageCollection->NewMessages = $this->getFolderNextMessageInformation( $oMessageCollection->NewMessages = $this->getFolderNextMessageInformation(
$oParams->sFolderName, $oParams->iPrevUidNext, $iUidNext $oParams->sFolderName, $oParams->iPrevUidNext, $oInfo->UIDNEXT
); );
} }
$bSearch = false; $bSearch = false;
$bMessageListOptimization = 0 < \MailSo\Config::$MessageListCountLimitTrigger && $bMessageListOptimization = 0 < \MailSo\Config::$MessageListCountLimitTrigger &&
\MailSo\Config::$MessageListCountLimitTrigger < $iMessageRealCount; \MailSo\Config::$MessageListCountLimitTrigger < $oInfo->MESSAGES;
if ($bMessageListOptimization) if ($bMessageListOptimization)
{ {
@ -867,7 +859,7 @@ class MailClient
$bUseThreads = false; $bUseThreads = false;
} }
if ($iMessageRealCount && !$bMessageListOptimization) if ($oInfo->MESSAGES && !$bMessageListOptimization)
{ {
if ($bUseThreads) { if ($bUseThreads) {
$aAllThreads = $this->MessageListThreadsMap($oMessageCollection->FolderName, $oMessageCollection->FolderHash, $oParams->oCacher); $aAllThreads = $this->MessageListThreadsMap($oMessageCollection->FolderName, $oMessageCollection->FolderHash, $oParams->oCacher);
@ -932,11 +924,11 @@ class MailClient
); );
} }
} }
else if ($iMessageRealCount) else if ($oInfo->MESSAGES)
{ {
if ($this->oLogger) if ($this->oLogger)
{ {
$this->oLogger->Write('List optimization (count: '.$iMessageRealCount. $this->oLogger->Write('List optimization (count: '.$oInfo->MESSAGES.
', limit:'.\MailSo\Config::$MessageListCountLimitTrigger.')'); ', limit:'.\MailSo\Config::$MessageListCountLimitTrigger.')');
} }
@ -946,8 +938,7 @@ class MailClient
$oMessageCollection->FolderName, $oMessageCollection->FolderHash); $oMessageCollection->FolderName, $oMessageCollection->FolderHash);
$oMessageCollection->MessageResultCount = \count($aUids); $oMessageCollection->MessageResultCount = \count($aUids);
if ($oMessageCollection->MessageResultCount) if ($oMessageCollection->MessageResultCount) {
{
$this->MessageListByRequestIndexOrUids( $this->MessageListByRequestIndexOrUids(
$oMessageCollection, $oMessageCollection,
new SequenceSet(\array_slice($aUids, $oParams->iOffset, $oParams->iLimit)) new SequenceSet(\array_slice($aUids, $oParams->iOffset, $oParams->iLimit))
@ -956,16 +947,14 @@ class MailClient
} }
else else
{ {
$oMessageCollection->MessageResultCount = $iMessageRealCount; $oMessageCollection->MessageResultCount = $oInfo->MESSAGES;
if (1 < $oInfo->MESSAGES) {
if (1 < $iMessageRealCount) {
$end = \max(1, $oInfo->MESSAGES - $oParams->iOffset); $end = \max(1, $oInfo->MESSAGES - $oParams->iOffset);
$start = \max(1, $end - $oParams->iLimit + 1); $start = \max(1, $end - $oParams->iLimit + 1);
$aRequestIndexes = \range($start, $end); $aRequestIndexes = \range($start, $end);
} else { } else {
$aRequestIndexes = \array_slice([1], $oParams->iOffset, 1); $aRequestIndexes = \array_slice([1], $oParams->iOffset, 1);
} }
$this->MessageListByRequestIndexOrUids($oMessageCollection, new SequenceSet($aRequestIndexes, false)); $this->MessageListByRequestIndexOrUids($oMessageCollection, new SequenceSet($aRequestIndexes, false));
} }
} }