diff options
| -rw-r--r-- | program/steps/mail/move_del.inc | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc index 5fbb41c55..c8db35b29 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.inc @@ -27,25 +27,29 @@ $old_pages = ceil($old_count / $IMAP->page_size); if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) { $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST)))); $target = get_input_value('_target_mbox', RCUBE_INPUT_POST); - $moved = $IMAP->move_message($uids, $target, get_input_value('_mbox', RCUBE_INPUT_POST)); + $mbox = get_input_value('_mbox', RCUBE_INPUT_POST); + $moved = $IMAP->move_message($uids, $target, $mbox); - if ($moved) { - // flag old messages as read because rcube_imap will not send expunge command after moving - if ($CONFIG['read_when_deleted']) - $IMAP->set_flag($uids, 'SEEN'); - } - else { + if (!$moved) { // send error message $OUTPUT->command('list_mailbox'); $OUTPUT->show_message('errormoving', 'error'); $OUTPUT->send(); exit; } + + // flag old messages as read because rcube_imap will not send expunge command after moving + if ($CONFIG['read_when_deleted']) + $IMAP->set_flag($uids, 'SEEN'); + + if (!$CONFIG['flag_for_deletion']) + $addrows = true; } // delete messages else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) { $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST)))); - $del = $IMAP->delete_message($uids, get_input_value('_mbox', RCUBE_INPUT_POST)); + $mbox = get_input_value('_mbox', RCUBE_INPUT_POST); + $del = $IMAP->delete_message($uids, $mbox); if (!$del) { // send error message @@ -54,6 +58,8 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) { $OUTPUT->send(); exit; } + + $addrows = true; } // unknown action or missing query param else { @@ -82,7 +88,6 @@ $OUTPUT->set_env('messagecount', $msg_count); $OUTPUT->set_env('current_page', $IMAP->list_page); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count)); - // update mailboxlist $mbox = $IMAP->get_mailbox_name(); $OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'), ($mbox == 'INBOX')); @@ -94,7 +99,7 @@ if ($RCMAIL->action=='moveto' && $target) { $OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota())); // add new rows from next page (if any) -if ($_POST['_from']!='show' && ($jump_back || $nextpage_count > 0)) { +if ($addrows && $_POST['_from']!='show' && ($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']; |