diff options
Diffstat (limited to 'program/steps/mail/move_del.inc')
| -rw-r--r-- | program/steps/mail/move_del.inc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc index a42bc90cd..95a456ed5 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.inc @@ -24,8 +24,8 @@ if (!$OUTPUT->ajax_call) return; // 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); // move messages if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) { @@ -33,7 +33,7 @@ if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && strlen($_POST['_targe $target = get_input_value('_target_mbox', RCUBE_INPUT_POST, true); $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true); - $moved = $IMAP->move_message($uids, $target, $mbox); + $moved = $RCMAIL->imap->move_message($uids, $target, $mbox); if (!$moved) { // send error message @@ -54,7 +54,7 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) { $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST)))); $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true); - $del = $IMAP->delete_message($uids, $mbox); + $del = $RCMAIL->imap->delete_message($uids, $mbox); if (!$del) { // send error message @@ -76,8 +76,8 @@ 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(); } if ($_POST['_from'] == 'show') @@ -89,26 +89,26 @@ if ($_POST['_from'] == 'show') } else { - $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) { @@ -123,7 +123,7 @@ else $OUTPUT->command('set_quota', rcmail_quota_content()); $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) @@ -131,7 +131,7 @@ else $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); |