diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | program/localization/en_US/labels.inc | 1 | ||||
| -rw-r--r-- | program/localization/pl_PL/labels.inc | 1 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 13 | ||||
| -rw-r--r-- | program/steps/settings/save_prefs.inc | 1 |
5 files changed, 16 insertions, 2 deletions
@@ -2,8 +2,10 @@ CHANGELOG RoundCube Webmail --------------------------- 2008/10/03 (alec) +---------- - Add support for SJIS, GB2312, BIG5 in rc_detect_encoding() - Fix vCard file encoding detection for non-UTF-8 strings (#1485410) +- Add 'skip_deleted' option in User Preferences (#1485445) 2008/10/02 (alec) ---------- diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 64e2506ab..1fdf75389 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -278,6 +278,7 @@ $labels['autosend'] = 'send automatically'; $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['showinlineimages'] = 'Display attached images below the message'; $labels['autosavedraft'] = 'Automatically save draft'; $labels['everynminutes'] = 'every $n minutes'; diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc index f635c69ca..d8c94f414 100644 --- a/program/localization/pl_PL/labels.inc +++ b/program/localization/pl_PL/labels.inc @@ -227,6 +227,7 @@ $labels['2047folding'] = 'zgodne z RFC 2047 (inne)'; $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['autosavedraft'] = 'Automatyczny zapis tworzonej wiadomości'; $labels['everynminutes'] = 'co $n minut'; $labels['never'] = 'nigdy'; diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 04079e16f..e98ce1b47 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -285,7 +285,16 @@ function rcmail_user_prefs_form($attrib) $table->add('title', html::label($field_id, Q(rcube_label('flagfordeletion')))); $table->add(null, $input_flagfordeletion->show($config['flag_for_deletion']?1:0)); } - + + // don't show deleted messages + if (!isset($no_override['skip_deleted'])) { + $field_id = 'rcmfd_skip_deleted'; + $input_purge = new html_checkbox(array('name' => '_skip_deleted', 'id' => $field_id, 'value' => 1)); + + $table->add('title', html::label($field_id, Q(rcube_label('skipdeleted')))); + $table->add(null, $input_purge->show($config['skip_deleted']?1:0)); + } + // Trash purging on logout if (!isset($no_override['logout_purge'])) { $field_id = 'rcmfd_logout_purge'; @@ -294,7 +303,7 @@ function rcmail_user_prefs_form($attrib) $table->add('title', html::label($field_id, Q(rcube_label('logoutclear')))); $table->add(null, $input_purge->show($config['logout_purge']?1:0)); } - + // INBOX compacting on logout if (!isset($no_override['logout_expunge'])) { $field_id = 'rcmfd_logout_expunge'; diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index b3b75ffe4..beeb1df0f 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -31,6 +31,7 @@ $a_user_prefs = array( 'inline_images' => isset($_POST['_inline_images']) ? TRUE : FALSE, 'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE, '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, 'logout_purge' => isset($_POST['_logout_purge']) ? TRUE : FALSE, 'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE, |