diff options
Diffstat (limited to 'program/steps/mail/mark.inc')
| -rw-r--r-- | program/steps/mail/mark.inc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc index c232d8c48..3b52dfe4f 100644 --- a/program/steps/mail/mark.inc +++ b/program/steps/mail/mark.inc @@ -36,12 +36,12 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va if ($flag == 'DELETED' && $CONFIG['skip_deleted'] && $_POST['_from'] != 'show') { // count messages before changing anything - $old_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL'); - $old_pages = ceil($old_count / $IMAP->page_size); + $old_count = $RCMAIL->imap->messagecount(NULL, $RCMAIL->imap->threading ? 'THREADS' : 'ALL'); + $old_pages = ceil($old_count / $RCMAIL->imap->page_size); $count = sizeof(explode(',', $uids)); } - $marked = $IMAP->set_flag($uids, $flag); + $marked = $RCMAIL->imap->set_flag($uids, $flag); if (!$marked) { // send error message @@ -57,14 +57,14 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va if ($flag == 'DELETED' && $CONFIG['read_when_deleted'] && !empty($_POST['_ruid'])) { $ruids = get_input_value('_ruid', RCUBE_INPUT_POST); - $read = $IMAP->set_flag($ruids, 'SEEN'); + $read = $RCMAIL->imap->set_flag($ruids, 'SEEN'); if ($read && !$CONFIG['skip_deleted']) $OUTPUT->command('flag_deleted_as_read', $ruids); } if ($flag == 'SEEN' || $flag == 'UNSEEN' || ($flag == 'DELETED' && !$CONFIG['skip_deleted'])) { - rcmail_send_unread_count($IMAP->get_mailbox_name()); + rcmail_send_unread_count($RCMAIL->imap->get_mailbox_name()); } else if ($flag == 'DELETED' && $CONFIG['skip_deleted']) { if ($_POST['_from'] == 'show') { @@ -74,30 +74,30 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va $OUTPUT->command('command', 'list'); } else { // refresh saved search set after moving some messages - if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set) { - $_SESSION['search'] = $IMAP->refresh_search(); + if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $RCMAIL->imap->search_set) { + $_SESSION['search'] = $RCMAIL->imap->refresh_search(); } - $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); + $msg_count = $RCMAIL->imap->messagecount(NULL, $RCMAIL->imap->threading ? 'THREADS' : 'ALL'); + $pages = ceil($msg_count / $RCMAIL->imap->page_size); + $nextpage_count = $old_count - $RCMAIL->imap->page_size * $RCMAIL->imap->list_page; + $remaining = $msg_count - $RCMAIL->imap->page_size * ($RCMAIL->imap->list_page - 1); // jump back one page (user removed the whole last page) - if ($IMAP->list_page > 1 && $remaining == 0) { - $IMAP->set_page($IMAP->list_page-1); - $_SESSION['page'] = $IMAP->list_page; + if ($RCMAIL->imap->list_page > 1 && $remaining == 0) { + $RCMAIL->imap->set_page($RCMAIL->imap->list_page-1); + $_SESSION['page'] = $RCMAIL->imap->list_page; $jump_back = true; } // update message count display $OUTPUT->set_env('messagecount', $msg_count); - $OUTPUT->set_env('current_page', $IMAP->list_page); + $OUTPUT->set_env('current_page', $RCMAIL->imap->list_page); $OUTPUT->set_env('pagecount', $pages); // update mailboxlist - $mbox = $IMAP->get_mailbox_name(); - $unseen_count = $msg_count ? $IMAP->messagecount($mbox, 'UNSEEN') : 0; + $mbox = $RCMAIL->imap->get_mailbox_name(); + $unseen_count = $msg_count ? $RCMAIL->imap->messagecount($mbox, 'UNSEEN') : 0; $old_unseen = rcmail_get_unseen_count($mbox); if ($old_unseen != $unseen_count) { @@ -106,7 +106,7 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va } $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox); - if ($IMAP->threading) + if ($RCMAIL->imap->threading) $count = get_input_value('_count', RCUBE_INPUT_POST); // add new rows from next page (if any) @@ -114,7 +114,7 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va $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, + $a_headers = $RCMAIL->imap->list_headers($mbox, NULL, $sort_col, $sort_order, $jump_back ? NULL : $count); rcmail_js_message_list($a_headers, false); |