mirror of
https://github.com/the-djmaze/snappymail.git
synced 2025-01-10 00:38:04 +08:00
Disable unused folder_list_limit as MailSo\Mail\MailClient->folderListOptimization() was removed
This commit is contained in:
parent
d7e93d8229
commit
77669cfcc7
3 changed files with 11 additions and 11 deletions
|
@ -35,7 +35,7 @@ class Settings extends \MailSo\Net\ConnectSettings
|
|||
|
||||
public int
|
||||
$body_text_limit = 0,
|
||||
$folder_list_limit = 200,
|
||||
// $folder_list_limit = 200,
|
||||
$message_list_limit = 0,
|
||||
$thread_limit = 50;
|
||||
|
||||
|
@ -64,7 +64,7 @@ class Settings extends \MailSo\Net\ConnectSettings
|
|||
}
|
||||
$options = [
|
||||
// 'body_text_limit',
|
||||
'folder_list_limit',
|
||||
// 'folder_list_limit',
|
||||
'message_list_limit',
|
||||
// 'thread_limit',
|
||||
];
|
||||
|
@ -91,7 +91,7 @@ class Settings extends \MailSo\Net\ConnectSettings
|
|||
'use_expunge_all_on_delete' => $this->expunge_all_on_delete,
|
||||
// 'body_text_limit' => $this->body_text_limit,
|
||||
'fast_simple_search' => $this->fast_simple_search,
|
||||
'folder_list_limit' => $this->folder_list_limit,
|
||||
// 'folder_list_limit' => $this->folder_list_limit,
|
||||
'force_select' => $this->force_select,
|
||||
'message_all_headers' => $this->message_all_headers,
|
||||
'message_list_limit' => $this->message_list_limit,
|
||||
|
|
|
@ -933,10 +933,6 @@ class MailClient
|
|||
return null;
|
||||
}
|
||||
|
||||
$iOptimizationLimit = $this->oImapClient->Settings->folder_list_limit;
|
||||
$oFolderCollection = new FolderCollection;
|
||||
$oFolderCollection->Optimized = 10 < $iOptimizationLimit && \count($aFolders) > $iOptimizationLimit;
|
||||
|
||||
foreach ($aFolders as $sFullName => /* @var $oImapFolder \MailSo\Imap\Folder */ $oImapFolder) {
|
||||
if (($bUseListSubscribeStatus && (null === $aImapSubscribedFoldersHelper || \in_array($sFullName, $aImapSubscribedFoldersHelper))) || $oImapFolder->IsInbox()) {
|
||||
$oImapFolder->setSubscribed();
|
||||
|
@ -964,6 +960,9 @@ class MailClient
|
|||
}
|
||||
}
|
||||
|
||||
$oFolderCollection = new FolderCollection;
|
||||
// $iOptimizationLimit = $this->oImapClient->Settings->folder_list_limit;
|
||||
// $oFolderCollection->Optimized = 10 < $iOptimizationLimit && \count($aFolders) > $iOptimizationLimit;
|
||||
$oFolderCollection->exchangeArray(\array_values($aFolders));
|
||||
|
||||
return $oFolderCollection;
|
||||
|
|
|
@ -115,15 +115,16 @@
|
|||
}"></div>
|
||||
|
||||
<h4 data-i18n="POPUPS_DOMAIN/LIMITS"></h4>
|
||||
<div class="control-group">
|
||||
<label data-i18n="POPUPS_DOMAIN/FOLDERS"></label>
|
||||
<input name="IMAP[folder_list_limit]" type="number" min="0" step="1" class="span1" data-bind="textInput: imapFolder_list_limit">
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label data-i18n="POPUPS_DOMAIN/MESSAGES"></label>
|
||||
<input name="IMAP[message_list_limit]" type="number" min="0" step="1" class="span1" data-bind="textInput: imapMessage_list_limit">
|
||||
</div>
|
||||
<!--
|
||||
<div class="control-group">
|
||||
<label data-i18n="POPUPS_DOMAIN/FOLDERS"></label>
|
||||
<input name="IMAP[folder_list_limit]" type="number" min="0" step="1" class="span1" data-bind="textInput: imapFolder_list_limit">
|
||||
</div>
|
||||
|
||||
"use_expunge_all_on_delete": false,
|
||||
"fast_simple_search": true,
|
||||
"force_select": false,
|
||||
|
|
Loading…
Reference in a new issue