Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 00:17:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable unused folder_list_limit as MailSo\Mail\MailClient->folderListOptimization() was removed

Browse source
This commit is contained in:
the-djmaze 2022-12-14 14:04:30 +01:00
parent d7e93d8229
commit 77669cfcc7
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
View file

@ -35,7 +35,7 @@ class Settings extends \MailSo\Net\ConnectSettings
public int public int
$body_text_limit = 0, $body_text_limit = 0,
$folder_list_limit = 200, // $folder_list_limit = 200,
$message_list_limit = 0, $message_list_limit = 0,
$thread_limit = 50; $thread_limit = 50;
@ -64,7 +64,7 @@ class Settings extends \MailSo\Net\ConnectSettings
} }
$options = [ $options = [
// 'body_text_limit', // 'body_text_limit',
'folder_list_limit', // 'folder_list_limit',
'message_list_limit', 'message_list_limit',
// 'thread_limit', // 'thread_limit',
]; ];
@ -91,7 +91,7 @@ class Settings extends \MailSo\Net\ConnectSettings
'use_expunge_all_on_delete' => $this->expunge_all_on_delete, 'use_expunge_all_on_delete' => $this->expunge_all_on_delete,
// 'body_text_limit' => $this->body_text_limit, // 'body_text_limit' => $this->body_text_limit,
'fast_simple_search' => $this->fast_simple_search, '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, 'force_select' => $this->force_select,
'message_all_headers' => $this->message_all_headers, 'message_all_headers' => $this->message_all_headers,
'message_list_limit' => $this->message_list_limit, 'message_list_limit' => $this->message_list_limit,

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

@ -933,10 +933,6 @@ class MailClient
return null; 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) { foreach ($aFolders as $sFullName => /* @var $oImapFolder \MailSo\Imap\Folder */ $oImapFolder) {
if (($bUseListSubscribeStatus && (null === $aImapSubscribedFoldersHelper || \in_array($sFullName, $aImapSubscribedFoldersHelper))) || $oImapFolder->IsInbox()) { if (($bUseListSubscribeStatus && (null === $aImapSubscribedFoldersHelper || \in_array($sFullName, $aImapSubscribedFoldersHelper))) || $oImapFolder->IsInbox()) {
$oImapFolder->setSubscribed(); $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)); $oFolderCollection->exchangeArray(\array_values($aFolders));
return $oFolderCollection; return $oFolderCollection;

9
snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
View file

@ -115,15 +115,16 @@
}"></div> }"></div>
<h4 data-i18n="POPUPS_DOMAIN/LIMITS"></h4> <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"> <div class="control-group">
<label data-i18n="POPUPS_DOMAIN/MESSAGES"></label> <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"> <input name="IMAP[message_list_limit]" type="number" min="0" step="1" class="span1" data-bind="textInput: imapMessage_list_limit">
</div> </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, "use_expunge_all_on_delete": false,
"fast_simple_search": true, "fast_simple_search": true,
"force_select": false, "force_select": false,