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

Sieve always allow fileinto INBOX #1510

Browse source
This commit is contained in:
the-djmaze 2024-03-24 14:18:08 +01:00
parent 60de50da64
commit b45459d645
3 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/Sieve/View/Filter.js
View file

@ -30,8 +30,6 @@ const
sDeepPrefix = '\u00A0\u00A0\u00A0', sDeepPrefix = '\u00A0\u00A0\u00A0',
showUnsubscribed = true/*!SettingsUserStore.hideUnsubscribed()*/, showUnsubscribed = true/*!SettingsUserStore.hideUnsubscribed()*/,
disabled = rl.settings.get('sieveAllowFileintoInbox') ? '' : 'INBOX',
foldersWalk = folders => { foldersWalk = folders => {
folders.forEach(oItem => { folders.forEach(oItem => {
if (showUnsubscribed || oItem.hasSubscriptions() || !oItem.exists) { if (showUnsubscribed || oItem.hasSubscriptions() || !oItem.exists) {
@ -39,7 +37,7 @@ const
id: oItem.fullName, id: oItem.fullName,
name: sDeepPrefix.repeat(oItem.deep) + oItem.detailedName(), name: sDeepPrefix.repeat(oItem.deep) + oItem.detailedName(),
system: false, system: false,
disabled: !oItem.selectable() || disabled == oItem.fullName disabled: !oItem.selectable()
}); });
} }

3
snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -603,8 +603,7 @@ class Actions
'showNextMessage' => (bool) $oConfig->Get('defaults', 'view_show_next_message', false), 'showNextMessage' => (bool) $oConfig->Get('defaults', 'view_show_next_message', false),
'AutoLogout' => (int) $oConfig->Get('defaults', 'autologout', 30), 'AutoLogout' => (int) $oConfig->Get('defaults', 'autologout', 30),
'AllowDraftAutosave' => (bool) $oConfig->Get('defaults', 'allow_draft_autosave', true), 'AllowDraftAutosave' => (bool) $oConfig->Get('defaults', 'allow_draft_autosave', true),
'ContactsAutosave' => (bool) $oConfig->Get('defaults', 'contacts_autosave', true), 'ContactsAutosave' => (bool) $oConfig->Get('defaults', 'contacts_autosave', true)
'sieveAllowFileintoInbox' => (bool)$oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false)
], ],
// MainAccount or AdditionalAccount // MainAccount or AdditionalAccount
$this->getAccountData($oAccount) $this->getAccountData($oAccount)

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

@ -421,7 +421,6 @@ Enables caching in the system'),
'log_ajax_response_write_limit' => array(300), 'log_ajax_response_write_limit' => array(300),
'smtp_show_server_errors' => array(false), 'smtp_show_server_errors' => array(false),
'sieve_auth_plain_initial' => array(true), 'sieve_auth_plain_initial' => array(true),
'sieve_allow_fileinto_inbox' => array(false),
'mail_func_clear_headers' => array(true, 'PHP mail() remove To and Subject headers'), 'mail_func_clear_headers' => array(true, 'PHP mail() remove To and Subject headers'),
'mail_func_additional_parameters' => array(false, 'PHP mail() set -f emailaddress'), 'mail_func_additional_parameters' => array(false, 'PHP mail() set -f emailaddress'),
'folders_spec_limit' => array(50), 'folders_spec_limit' => array(50),