Changeset 1931 in subversion

Timestamp:

Oct 3, 2008 9:09:25 AM (5 years ago)

Author:

alec

Message:

• Add 'skip_deleted' option in User Preferences (#1485445)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (1 diff)
• program/localization/pl_PL/labels.inc (modified) (1 diff)
• program/steps/settings/func.inc (modified) (2 diffs)
• program/steps/settings/save_prefs.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -3 +3 @@
 
 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)

trunk/roundcubemail/program/localization/en_US/labels.inc

@@ -279 +279 @@
 $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';

trunk/roundcubemail/program/localization/pl_PL/labels.inc

@@ -256 +256 @@
 $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';

trunk/roundcubemail/program/steps/settings/func.inc

@@ -286 +286 @@
     $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'])) {
@@ -295 +304 @@
     $table->add(null, $input_purge->show($config['logout_purge']?1:0));
   }
-
+  
   // INBOX compacting on logout
   if (!isset($no_override['logout_expunge'])) {

trunk/roundcubemail/program/steps/settings/save_prefs.inc

@@ -32 +32 @@
   '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,