the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 23:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added large thread limit setting [labs.imap_large_thread_limit = 100] (Closes #339)

Browse source
This commit is contained in:
RainLoop Team 2014-10-07 00:51:23 +04:00
parent d63dc10e5b
commit c8bd765e12
4 changed files with 109 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rainloop/v/0.0.0/app/libraries/MailSo/Config.php
View file

@ -38,6 +38,11 @@ class Config
*/
public static $MessageListDateFilter = 0;
/**
* @var int
*/
public static $LargeThreadLimit = 100;
/**
* @var bool
*/

122
rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
View file

@ -1375,7 +1375,9 @@ class MailClient
/**
* @param string $sFolderName
* @param string $sFolderHash
* @param array $aIndexOrUids
* @param \MailSo\Cache\CacheClient $oCacher
* @param int $iThreadLimit = 100
*
* @return array
*
@ -1383,8 +1385,10 @@ class MailClient
* @throws \MailSo\Net\Exceptions\Exception
* @throws \MailSo\Imap\Exceptions\Exception
*/
public function MessageListThreadsMap($sFolderName, $sFolderHash, $oCacher)
public function MessageListThreadsMap($sFolderName, $sFolderHash, $aIndexOrUids, $oCacher, $iThreadLimit = 100)
{
$iThreadLimit = \is_int($iThreadLimit) && 0 < $iThreadLimit ? $iThreadLimit : 0;
$sSearchHash = '';
if (0 < \MailSo\Config::$MessageListDateFilter)
{
@ -1402,7 +1406,8 @@ class MailClient
if ($oCacher && $oCacher->IsInited())
{
$sSerializedHash =
'ThreadsMap/'.$sSearchHash.'/'.
'ThreadsMapSorted/'.$sSearchHash.'/'.
'Limit='.$iThreadLimit.'/'.
$this->oImapClient->GetLogginedUser().'@'.
$this->oImapClient->GetConnectedHost().':'.
$this->oImapClient->GetConnectedPort().'/'.
@ -1455,6 +1460,95 @@ class MailClient
}
}
$aParentsMap = array();
foreach ($aIndexOrUids as $iUid)
{
if (isset($aResult[$iUid]) && \is_array($aResult[$iUid]))
{
foreach ($aResult[$iUid] as $iTempUid)
{
$aParentsMap[$iTempUid] = $iUid;
if (isset($aResult[$iTempUid]))
{
unset($aResult[$iTempUid]);
}
}
}
}
$aSortedThreads = array();
foreach ($aIndexOrUids as $iUid)
{
if (isset($aResult[$iUid]))
{
$aSortedThreads[$iUid] = $iUid;
}
}
foreach ($aIndexOrUids as $iUid)
{
if (!isset($aSortedThreads[$iUid]) &&
isset($aParentsMap[$iUid]) &&
isset($aSortedThreads[$aParentsMap[$iUid]]))
{
if (!\is_array($aSortedThreads[$aParentsMap[$iUid]]))
{
$aSortedThreads[$aParentsMap[$iUid]] = array();
}
$aSortedThreads[$aParentsMap[$iUid]][] = $iUid;
}
}
$aResult = $aSortedThreads;
unset($aParentsMap, $aSortedThreads);
$aTemp = array();
foreach ($aResult as $iUid => $mValue)
{
if (0 < $iThreadLimit && \is_array($mValue) && $iThreadLimit < \count($mValue))
{
$aParts = \array_chunk($mValue, $iThreadLimit);
if (0 < count($aParts))
{
foreach ($aParts as $iIndex => $aItem)
{
if (0 === $iIndex)
{
$aResult[$iUid] = $aItem;
}
else if (0 < $iIndex && \is_array($aItem))
{
$mFirst = \array_shift($aItem);
if (!empty($mFirst))
{
$aTemp[$mFirst] = 0 < \count($aItem) ? $aItem : $mFirst;
}
}
}
}
}
}
foreach ($aTemp as $iUid => $mValue)
{
$aResult[$iUid] = $mValue;
}
unset($aTemp);
$aLastResult = array();
foreach ($aIndexOrUids as $iUid)
{
if (isset($aResult[$iUid]))
{
$aLastResult[$iUid] = $aResult[$iUid];
}
}
$aResult = $aLastResult;
unset($aLastResult);
if ($oCacher && $oCacher->IsInited() && !empty($sSerializedHash))
{
$oCacher->Set($sSerializedHash, serialize($aResult));
@ -1762,25 +1856,12 @@ class MailClient
$oMessageCollection->FolderName, $oMessageCollection->FolderHash,
$bUseSortIfSupported, $bUseESearchOrESortRequest, $oCacher);
$aThreads = $this->MessageListThreadsMap($oMessageCollection->FolderName, $oMessageCollection->FolderHash, $oCacher);
$aThreads = $this->MessageListThreadsMap($oMessageCollection->FolderName, $oMessageCollection->FolderHash, $aIndexOrUids,
$oCacher, \MailSo\Config::$LargeThreadLimit);
$aExpandedThreadsUids = \is_array($aExpandedThreadsUids) ? $aExpandedThreadsUids : array();
$bWatchExpanded = 0 < \count($aExpandedThreadsUids);
foreach ($aIndexOrUids as $iUid)
{
if (isset($aThreads[$iUid]) && \is_array($aThreads[$iUid]))
{
foreach ($aThreads[$iUid] as $iTempUid)
{
if (isset($aThreads[$iTempUid]))
{
unset($aThreads[$iTempUid]);
}
}
}
}
$aNewIndexOrUids = array();
foreach ($aIndexOrUids as $iUid)
{
@ -1792,12 +1873,9 @@ class MailClient
if ($bWatchExpanded && \in_array($iUid, $aExpandedThreadsUids))
{
$aSubArray = $aThreads[$iUid];
foreach ($aIndexOrUids as $iSubRootUid)
foreach ($aSubArray as $iSubRootUid)
{
if (\in_array($iSubRootUid, $aSubArray))
{
$aNewIndexOrUids[] = $iSubRootUid;
}
$aNewIndexOrUids[] = $iSubRootUid;
}
}
else

3
rainloop/v/0.0.0/app/libraries/RainLoop/Api.php
View file

@ -85,6 +85,9 @@ class Api
\MailSo\Config::$MessageListDateFilter =
(int) \RainLoop\Api::Config()->Get('labs', 'imap_message_list_date_filter', 0);
\MailSo\Config::$LargeThreadLimit =
(int) \RainLoop\Api::Config()->Get('labs', 'imap_large_thread_limit', 100);
\MailSo\Config::$SystemLogger = \RainLoop\Api::Logger();
}
}

1
rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -246,6 +246,7 @@ Enables caching in the system'),
'imap_message_list_fast_simple_search' => array(true),
'imap_message_list_count_limit_trigger' => array(0),
'imap_message_list_date_filter' => array(0),
'imap_large_thread_limit' => array(100),
'smtp_show_server_errors' => array(false),
'curl_proxy' => array(''),
'curl_proxy_auth' => array(''),