diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/main.inc.php.dist | 14 | ||||
| -rw-r--r-- | program/localization/en_US/labels.inc | 2 | ||||
| -rw-r--r-- | program/localization/pl_PL/labels.inc | 1 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 10 | ||||
| -rw-r--r-- | program/steps/settings/save_prefs.inc | 1 |
6 files changed, 20 insertions, 9 deletions
@@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Add 'delete_always' option to user preferences - Support/Require tls:// prefix in 'smtp_server' option for TLS connections - Fix inconsistent behaviour of 'delete_always' option (#1486299) - Fix deleting all messages from last list page (#1486293) diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 2bcd70fc7..61736c298 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -322,14 +322,6 @@ $rcmail_config['spellcheck_languages'] = NULL; // don't let users set pagesize to more than this value if set $rcmail_config['max_pagesize'] = 200; -/** - * 'Delete always' - * This setting reflects if mail should be always deleted - * when moving to Trash fails. This is necessary in some setups - * when user is over quota and Trash is included in the quota. - */ -$rcmail_config['delete_always'] = false; - // Minimal value of user's 'keep_alive' setting (in seconds) // Must be less than 'session_lifetime' $rcmail_config['min_keep_alive'] = 60; @@ -506,5 +498,11 @@ $rcmail_config['force_7bit'] = false; // Please note that folder names should to be in sync with $rcmail_config['default_imap_folders'] $rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); +// 'Delete always' +// This setting reflects if mail should be always deleted +// when moving to Trash fails. This is necessary in some setups +// when user is over quota and Trash is included in the quota. +$rcmail_config['delete_always'] = false; + // end of config file ?> diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 7aaee3721..5e9c968ef 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -288,6 +288,7 @@ $labels['ignore'] = 'ignore'; $labels['readwhendeleted'] = 'Mark the message as read on delete'; $labels['flagfordeletion'] = 'Flag the message for deletion instead of delete'; $labels['skipdeleted'] = 'Do not show deleted messages'; +$labels['deletealways'] = 'When moving messages to Trash fails delete them'; $labels['showremoteimages'] = 'Display remote inline images'; $labels['fromknownsenders'] = 'from known senders'; $labels['always'] = 'always'; @@ -313,7 +314,6 @@ $labels['section'] = 'Section'; $labels['maintenance'] = 'Maintenance'; $labels['newmessage'] = 'New Message'; $labels['listoptions'] = 'List Options'; - $labels['signatureoptions'] = 'Signature Options'; $labels['whenreplying'] = 'When replying'; $labels['replytopposting'] = 'start new message above original'; diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc index 72ba4792c..c00d73c06 100644 --- a/program/localization/pl_PL/labels.inc +++ b/program/localization/pl_PL/labels.inc @@ -241,6 +241,7 @@ $labels['advancedoptions'] = 'opcje zaawansowane'; $labels['readwhendeleted'] = 'Podczas usuwania oznacz wiadomość jako przeczytaną'; $labels['flagfordeletion'] = 'Oznacz wiadomość do usunięcia zamiast ją usuwać'; $labels['skipdeleted'] = 'Ukryj wiadomości oznaczone do usunięcia'; +$labels['deletealways'] = 'Usuń wiadomości, gdy przenoszenie do Kosza zawiedzie'; $labels['autosavedraft'] = 'Automatycznie zapisuj tworzoną wiadomość'; $labels['indexsort'] = 'Stosuj indeks wiadomości do sortowania wg daty'; $labels['keepalive'] = 'Sprawdzaj czy nadeszły nowe wiadomości'; diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 7d59e73f1..91e1e3fd5 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -589,6 +589,16 @@ function rcmail_user_prefs($current=null) ); } + if (!isset($no_override['delete_always'])) { + $field_id = 'rcmfd_delete_always'; + $input_delete_always = new html_checkbox(array('name' => '_delete_always', 'id' => $field_id, 'value' => 1)); + + $blocks['main']['options']['delete_always'] = array( + 'title' => html::label($field_id, Q(rcube_label('deletealways'))), + 'content' => $input_delete_always->show($config['delete_always']?1:0), + ); + } + // Trash purging on logout if (!isset($no_override['logout_purge'])) { $field_id = 'rcmfd_logout_purge'; diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index 8a732bf45..8f0a0e711 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -75,6 +75,7 @@ switch ($CURR_SECTION) 'read_when_deleted' => isset($_POST['_read_when_deleted']) ? TRUE : FALSE, 'skip_deleted' => isset($_POST['_skip_deleted']) ? TRUE : FALSE, 'flag_for_deletion' => isset($_POST['_flag_for_deletion']) ? TRUE : FALSE, + 'delete_always' => isset($_POST['_delete_always']) ? TRUE : FALSE, 'logout_purge' => isset($_POST['_logout_purge']) ? TRUE : FALSE, 'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE, ); |