From 48ee693f495f6826ed32333e8a564376487f1dea Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 10 Mar 2009 04:09:33 -0400
Subject: [PATCH] Partially reverted r2339 + fix indentation
---
index.php | 1 -
program/steps/mail/check_recent.inc | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/index.php b/index.php
index fba7e81..172d57c 100644
--- a/index.php
+++ b/index.php
@@ -183,7 +183,6 @@
'remove-attachment' => 'attachments.inc',
'display-attachment' => 'attachments.inc',
'upload' => 'attachments.inc',
- 'check-recent' => 'check_recent.inc',
),
'addressbook' => array(
diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
index 438e97b..a066853 100644
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -28,7 +28,7 @@
// refresh saved search set
if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && isset($_SESSION['search'][$search_request])) {
$_SESSION['search'][$search_request] = $IMAP->refresh_search();
- $all_count = $IMAP->messagecount();
+ $all_count = $IMAP->messagecount();
} else {
$all_count = $IMAP->messagecount(NULL, 'ALL', TRUE);
}
@@ -62,12 +62,12 @@
// get the headers
$result_h = $IMAP->list_headers($mbox_name, 1, 'date', 'DESC');
// add to the list
- rcmail_js_message_list($result_h, TRUE);
+ rcmail_js_message_list($result_h, TRUE);
}
}
}
- else if ($IMAP->messagecount($mbox_name, 'UNSEEN', $check_all)) {
- $OUTPUT->command('set_unread_count', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN', $check_all));
+ else if ($unseen = $IMAP->messagecount($mbox_name, 'UNSEEN', $check_all)) {
+ $OUTPUT->command('set_unread_count', $mbox_name, $unseen);
}
}
--
Gitblit v1.9.1