- don't add new row to messages list if only marking as deleted (flag_for_deletion=true)

release-0.6
alecpl 16 years ago
parent b8817ea504
commit 9281884ff0

@ -27,25 +27,29 @@ $old_pages = ceil($old_count / $IMAP->page_size);
if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) { if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) {
$count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST)))); $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
$target = get_input_value('_target_mbox', 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) { 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 {
// send error message // send error message
$OUTPUT->command('list_mailbox'); $OUTPUT->command('list_mailbox');
$OUTPUT->show_message('errormoving', 'error'); $OUTPUT->show_message('errormoving', 'error');
$OUTPUT->send(); $OUTPUT->send();
exit; 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 // delete messages
else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) { else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
$count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST)))); $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) { if (!$del) {
// send error message // send error message
@ -54,6 +58,8 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
$OUTPUT->send(); $OUTPUT->send();
exit; exit;
} }
$addrows = true;
} }
// unknown action or missing query param // unknown action or missing query param
else { else {
@ -82,7 +88,6 @@ $OUTPUT->set_env('messagecount', $msg_count);
$OUTPUT->set_env('current_page', $IMAP->list_page); $OUTPUT->set_env('current_page', $IMAP->list_page);
$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count)); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
// update mailboxlist // update mailboxlist
$mbox = $IMAP->get_mailbox_name(); $mbox = $IMAP->get_mailbox_name();
$OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'), ($mbox == 'INBOX')); $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())); $OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota()));
// add new rows from next page (if any) // 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_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']; $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];

Loading…
Cancel
Save