Allow sieve filter to "fileinto" INBOX

This commit is contained in:
Martin Stenröse 2017-08-14 14:51:10 +02:00
parent 0f6b70f63e
commit 070e4ee0fb
3 changed files with 7 additions and 1 deletions

View file

@ -2,6 +2,8 @@
import ko from 'ko';
import _ from '_';
import {settingsGet} from 'Storage/Settings';
import {FolderType} from 'Common/Enums';
import {UNUSED_OPTION_VALUE} from 'Common/Consts';
import {isArray, folderListOptionsBuilder} from 'Common/Utils';
@ -35,6 +37,8 @@ class FolderUserStore
this.currentFolder = ko.observable(null).extend({toggleSubscribeProperty: [this, 'selected']});
this.sieveAllowFileintoInbox = !!settingsGet('SieveAllowFileintoInbox');
this.computers();
this.subscribers();
}
@ -117,7 +121,7 @@ class FolderUserStore
this.folderMenuForFilters = ko.computed(
() => folderListOptionsBuilder(
this.folderListSystem(), this.folderList(),
['INBOX'], [['', '']], null, null, null, (item) => (item ? item.localName() : ''))
[(this.sieveAllowFileintoInbox ? '' : 'INBOX')], [['', '']], null, null, null, (item) => (item ? item.localName() : ''))
);
}

View file

@ -1531,6 +1531,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
'DetermineUserDomain' => (bool) $oConfig->Get('login', 'determine_user_domain', false),
'UseLoginWelcomePage' => (bool) $oConfig->Get('login', 'welcome_page', false),
'StartupUrl' => \trim(\ltrim(\trim($oConfig->Get('labs', 'startup_url', '')), '#/')),
'SieveAllowFileintoInbox' => (bool) $oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false),
'ContactsIsAllowed' => false,
'ChangePasswordIsAllowed' => false,
'RequireTwoFactor' => false,

View file

@ -422,6 +422,7 @@ Enables caching in the system'),
'sieve_allow_raw_script' => array(false),
'sieve_utf8_folder_name' => array(true),
'sieve_auth_plain_initial' => array(true),
'sieve_allow_fileinto_inbox' => array(false),
'imap_timeout' => array(300),
'smtp_timeout' => array(60),
'sieve_timeout' => array(10),