Page MenuHomePhorge
Files F224418

No OneTemporary
Actions

View Options

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
@@ -1,109 +1,114 @@
<?php
/*
+-----------------------------------------------------------------------+
| program/steps/mail/move_del.inc |
| |
| This file is part of the RoundCube Webmail client |
| Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
| Move the submitted messages to a specific mailbox or delete them |
| |
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
$Id$
*/
// count messages before changing anything
$old_count = $IMAP->messagecount();
$old_pages = ceil($old_count / $IMAP->page_size);
// move messages
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
$OUTPUT->command('list_mailbox');
$OUTPUT->show_message('errordeleting', 'error');
$OUTPUT->send();
exit;
}
+
+ $addrows = true;
}
// unknown action or missing query param
else {
exit;
}
// refresh saved search set after moving some messages
if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set) {
$_SESSION['search'][$search_request] = $IMAP->refresh_search();
}
$msg_count = $IMAP->messagecount();
$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) {
$IMAP->set_page($IMAP->list_page-1);
$_SESSION['page'] = $IMAP->list_page;
$jump_back = true;
}
// update message count display
$OUTPUT->set_env('pagecount', $pages);
$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'));
if ($RCMAIL->action=='moveto' && $target) {
$OUTPUT->command('set_unread_count', $target, $IMAP->messagecount($target, 'UNSEEN'));
}
$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'];
$a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order);
if (!$jump_back) {
$a_headers = array_slice($a_headers, -$count, $count);
}
rcmail_js_message_list($a_headers);
}
// send response
$OUTPUT->send();

File Metadata

Mime Type
text/x-diff
Expires
Sat, Mar 1, 9:52 AM (14 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
166603
Default Alt Text
(5 KB)

Event Timeline