Ticket #1485445: skip_deleted.patch

diff -u -r trunk.1930/roundcubemail/program/include/rcmail.php trunk/roundcubemail/program/include/rcmail.php
--- trunk.1930/roundcubemail/program/include/rcmail.php 2008-10-03 12:55:14.799835000 +0200
+++ trunk/roundcubemail/program/include/rcmail.php      2008-10-03 12:56:44.876746818 +0200
@@ -286,7 +286,7 @@
     if (!($this->output instanceof rcube_template))
       $this->output = new rcube_template($this->task, $framed);
 
-    foreach (array('flag_for_deletion','read_when_deleted') as $js_config_var) {
+    foreach (array('flag_for_deletion','read_when_deleted','skip_deleted') as $js_config_var) {
       $this->output->set_env($js_config_var, $this->config->get($js_config_var));
     }
 
diff -u -r trunk.1930/roundcubemail/program/localization/en_US/labels.inc trunk/roundcubemail/program/localization/en_US/labels.inc
--- trunk.1930/roundcubemail/program/localization/en_US/labels.inc      2008-10-03 12:55:22.703563000 +0200
+++ trunk/roundcubemail/program/localization/en_US/labels.inc   2008-10-03 12:58:45.504610973 +0200
@@ -278,6 +278,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['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft']  = 'Automatically save draft';
 $labels['everynminutes']  = 'every $n minutes';
Tylko w trunk/roundcubemail/program/localization/en_US: labels.inc.orig
diff -u -r trunk.1930/roundcubemail/program/localization/pl_PL/labels.inc trunk/roundcubemail/program/localization/pl_PL/labels.inc
--- trunk.1930/roundcubemail/program/localization/pl_PL/labels.inc      2008-10-03 12:55:21.319611000 +0200
+++ trunk/roundcubemail/program/localization/pl_PL/labels.inc   2008-10-03 12:59:52.226323316 +0200
@@ -227,6 +227,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['autosavedraft'] = 'Automatyczny zapis tworzonej wiadomości';
 $labels['everynminutes'] = 'co $n minut';
 $labels['never'] = 'nigdy';
Tylko w trunk/roundcubemail/program/localization/pl_PL: labels.inc.orig
diff -u -r trunk.1930/roundcubemail/program/steps/settings/func.inc trunk/roundcubemail/program/steps/settings/func.inc
--- trunk.1930/roundcubemail/program/steps/settings/func.inc    2008-10-03 12:55:30.951281000 +0200
+++ trunk/roundcubemail/program/steps/settings/func.inc 2008-10-03 12:56:44.880747221 +0200
@@ -285,7 +285,16 @@
     $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 @@
     $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 -u -r trunk.1930/roundcubemail/program/steps/settings/save_prefs.inc trunk/roundcubemail/program/steps/settings/save_prefs.inc
--- trunk.1930/roundcubemail/program/steps/settings/save_prefs.inc      2008-10-03 12:55:30.951281000 +0200
+++ trunk/roundcubemail/program/steps/settings/save_prefs.inc   2008-10-03 12:56:44.880747221 +0200
@@ -31,6 +31,7 @@
   '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,