From e019f2d0f2dc2fbfa345ab5d7ae85e67bfdd76b8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 25 Sep 2010 09:03:53 -0400
Subject: [PATCH] - s/RoundCube/Roundcube/
---
program/steps/mail/mark.inc | 55 +++++++++++++++++++++++++++----------------------------
1 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index c065b3f..a24714e 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -3,8 +3,8 @@
+-----------------------------------------------------------------------+
| program/steps/mail/mark.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -36,13 +36,13 @@
if ($flag == 'DELETED' && $CONFIG['skip_deleted'] && $_POST['_from'] != 'show') {
// count messages before changing anything
- $old_count = $IMAP->messagecount();
+ $old_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
$old_pages = ceil($old_count / $IMAP->page_size);
$count = sizeof(explode(',', $uids));
}
$marked = $IMAP->set_flag($uids, $flag);
-
+
if ($marked == -1) {
// send error message
if ($_POST['_from'] != 'show')
@@ -52,22 +52,16 @@
exit;
}
- if($flag == 'DELETED' && $CONFIG['read_when_deleted'] && !empty($_POST['_ruid'])) {
- $uids = get_input_value('_ruid', RCUBE_INPUT_POST);
- $read = $IMAP->set_flag($uids, 'SEEN');
-
+ if ($flag == 'DELETED' && $CONFIG['read_when_deleted'] && !empty($_POST['_ruid'])) {
+ $ruids = get_input_value('_ruid', RCUBE_INPUT_POST);
+ $read = $IMAP->set_flag($ruids, 'SEEN');
+
if ($read != -1 && !$CONFIG['skip_deleted'])
- $OUTPUT->command('flag_deleted_as_read', $uids);
+ $OUTPUT->command('flag_deleted_as_read', $ruids);
}
-
+
if ($flag == 'SEEN' || $flag == 'UNSEEN' || ($flag == 'DELETED' && !$CONFIG['skip_deleted'])) {
- $mbox_name = $IMAP->get_mailbox_name();
- $unseen = $IMAP->messagecount($mbox_name, 'UNSEEN');
- $old_unseen = $_SESSION['unseen_count'][$mbox_name];
- if ($old_unseen != $unseen) {
- $OUTPUT->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX'));
- $_SESSION['unseen_count'][$mbox_name] = $unseen;
- }
+ rcmail_send_unread_count($IMAP->get_mailbox_name());
}
else if ($flag == 'DELETED' && $CONFIG['skip_deleted']) {
if ($_POST['_from'] == 'show') {
@@ -81,13 +75,13 @@
$_SESSION['search'][$search_request] = $IMAP->refresh_search();
}
- $msg_count = $IMAP->messagecount();
+ $msg_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
$pages = ceil($msg_count / $IMAP->page_size);
$nextpage_count = $old_count - $IMAP->page_size * $IMAP->list_page;
$remaining = $msg_count - $IMAP->page_size * ($IMAP->list_page - 1);
// jump back one page (user removed the whole last page)
- if ($IMAP->list_page > 1 && $nextpage_count <= 0 && $remaining == 0) {
+ if ($IMAP->list_page > 1 && $remaining == 0) {
$IMAP->set_page($IMAP->list_page-1);
$_SESSION['page'] = $IMAP->list_page;
$jump_back = true;
@@ -102,26 +96,31 @@
$mbox = $IMAP->get_mailbox_name();
$unseen_count = $msg_count ? $IMAP->messagecount($mbox, 'UNSEEN') : 0;
$old_unseen = $_SESSION['unseen_count'][$mbox];
+
if ($old_unseen != $unseen_count) {
$OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX'));
- $_SESSION['unseen_count'][$mbox] = $unseen_count;
+ $_SESSION['unseen_count'][$mbox] = $unseen_count;
}
$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
+ if ($IMAP->threading)
+ $count = get_input_value('_count', RCUBE_INPUT_POST);
+
// add new rows from next page (if any)
- if (($jump_back || $nextpage_count > 0)) {
+ if ($count && $uids != '*' && ($jump_back || $nextpage_count > 0)) {
$sort_col = isset($_SESSION['sort_col']) ? $_SESSION['sort_col'] : $CONFIG['message_sort_col'];
$sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];
-
- $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order, $count);
-
- rcmail_js_message_list($a_headers, false, false);
+
+ $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order,
+ $jump_back ? NULL : $count);
+
+ rcmail_js_message_list($a_headers, false);
}
}
}
-
+
$OUTPUT->send();
}
-
+
exit;
-?>
+
--
Gitblit v1.9.1