From 119cd17abf74bd98afec2979c4ac4a89af1f0ca7 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 05 Jun 2009 12:24:10 -0400
Subject: [PATCH] - add 'Deleted' to search filter
---
program/localization/en_US/messages.inc | 1 +
program/steps/mail/func.inc | 4 +++-
program/localization/en_US/labels.inc | 1 +
program/localization/pl_PL/labels.inc | 1 +
config/main.inc.php.dist | 5 ++---
program/localization/pl_PL/messages.inc | 1 +
program/localization/en_GB/labels.inc | 1 +
program/localization/en_GB/messages.inc | 1 +
8 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index d7c27b0..29f6e12 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -413,9 +413,8 @@
// False means that a message's read status is not affected by marking it as deleted
$rcmail_config['read_when_deleted'] = TRUE;
-// When a Trash folder is not present and a message is deleted, flag
-// the message for deletion rather than deleting it immediately. Setting this to
-// false causes deleted messages to be permanantly removed if there is no Trash folder
+// Set to TRUE to newer delete messages immediately
+// Use 'Purge' to remove messages marked as deleted
$rcmail_config['flag_for_deletion'] = FALSE;
// Default interval for keep-alive/check-recent requests (in seconds)
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 5f09567..5655605 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -122,6 +122,7 @@
$labels['unread'] = 'Unread';
$labels['flagged'] = 'Flagged';
$labels['unanswered'] = 'Unanswered';
+$labels['deleted'] = 'Deleted';
$labels['invert'] = 'Invert';
$labels['filter'] = 'Filter';
$labels['compact'] = 'Compact';
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index 5823187..137214b 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -46,6 +46,7 @@
$messages['errorsaving'] = 'An error occurred while saving';
$messages['errormoving'] = 'Could not move the message';
$messages['errordeleting'] = 'Could not delete the message';
+$messages['errormarking'] = 'Could not mark the message';
$messages['deletecontactconfirm'] = 'Do you really want to delete the selected contact(s)?';
$messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?';
$messages['deletefolderconfirm'] = 'Do you really want to delete this folder?';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index a18bef1..8cf819e 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -150,6 +150,7 @@
$labels['unread'] = 'Unread';
$labels['flagged'] = 'Flagged';
$labels['unanswered'] = 'Unanswered';
+$labels['deleted'] = 'Deleted';
$labels['invert'] = 'Invert';
$labels['filter'] = 'Filter';
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index c1ba41d..ed233b1 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -46,6 +46,7 @@
$messages['errorsaving'] = 'An error occured while saving';
$messages['errormoving'] = 'Could not move the message';
$messages['errordeleting'] = 'Could not delete the message';
+$messages['errormarking'] = 'Could not mark the message';
$messages['deletecontactconfirm'] = 'Do you really want to delete the selected contact(s)?';
$messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?';
$messages['deletefolderconfirm'] = 'Do you really want to delete this folder?';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 1f2a0d2..f01e20c 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -134,6 +134,7 @@
$labels['unread'] = 'Nieprzeczytane';
$labels['flagged'] = 'Oznaczone';
$labels['unanswered'] = 'Bez odpowiedzi';
+$labels['deleted'] = 'Usunięte';
$labels['invert'] = 'Odwróć';
$labels['filter'] = 'Filtr';
$labels['compact'] = 'Porządkuj';
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index 583580b..53926a2 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -51,6 +51,7 @@
$messages['errorsaving'] = 'Wystąpił błąd podczas zapisu!';
$messages['errormoving'] = 'Nie można przenieść wybranej wiadomości!';
$messages['errordeleting'] = 'Nie można usunąć wiadomości!';
+$messages['errormarking'] = 'Nie można oznaczyć wiadomości!';
$messages['deletecontactconfirm'] = 'Czy na pewno chcesz usunąć wybrane kontakty?';
$messages['deletemessagesconfirm'] = 'Czy na pewno chcesz usunąć wybrane wiadomości?';
$messages['deletefolderconfirm'] = 'Czy na pewno chcesz usunąć wybrany folder?';
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 154fd7e..d5f3a68 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1446,7 +1446,7 @@
function rcmail_search_filter($attrib)
{
- global $OUTPUT;
+ global $OUTPUT, $CONFIG;
if (!strlen($attrib['id']))
$attrib['id'] = 'rcmlistfilter';
@@ -1466,6 +1466,8 @@
$select_filter->add(rcube_label('unread'), 'UNSEEN');
$select_filter->add(rcube_label('flagged'), 'FLAGGED');
$select_filter->add(rcube_label('unanswered'), 'UNANSWERED');
+ if (!$CONFIG['skip_deleted'])
+ $select_filter->add(rcube_label('deleted'), 'DELETED');
$out = $select_filter->show($_SESSION['search_filter']);
--
Gitblit v1.9.1