summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-12-03 08:16:44 +0000
committeralecpl <alec@alec.pl>2008-12-03 08:16:44 +0000
commit3414c57dc81a98123682fb921bcb5743f397fd89 (patch)
treecc98cd3ad4fd517cbb8f8ff9dd36c8341e456333
parenta493ea8e48ddaa28090c2b74251654376462ebb6 (diff)
#1485587: show proper message when using status filter
-rw-r--r--program/steps/mail/list.inc6
-rw-r--r--program/steps/mail/search.inc4
2 files changed, 8 insertions, 2 deletions
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index 2078262eb..5cc2a574d 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -68,7 +68,13 @@ $OUTPUT->command('set_mailboxname', rcmail_get_mailbox_name_text());
// add message rows
if (isset($a_headers) && count($a_headers))
+{
rcmail_js_message_list($a_headers);
+ if ($search_request)
+ $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
+}
+else if ($search_request)
+ $OUTPUT->show_message('searchnomatch', 'notice');
else
$OUTPUT->show_message('nomessagesfound', 'notice');
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index b7ab2e182..aa76f8e43 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -99,12 +99,12 @@ if (!is_array($_SESSION['search']))
// Make sure we got the headers
if (!empty($result_h))
{
+ rcmail_js_message_list($result_h);
if ($search_str) {
$_SESSION['search'][$search_request] = $IMAP->get_search_set();
$_SESSION['last_text_search'] = $str;
+ $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
}
- rcmail_js_message_list($result_h);
- $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
}
else
{