From 9b3d7f743f21f0ae27bb314faa61e04f43411be0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 3 Oct 2008 13:09:25 +0000
Subject: - Add 'skip_deleted' option in User Preferences (#1485445)

---
 program/steps/settings/func.inc       | 13 +++++++++++--
 program/steps/settings/save_prefs.inc |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'program/steps/settings')

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,
-- 
cgit v1.2.3