From db1a87cd6c506f2afbd1a37c64cb56ae11120b49 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 17 Dec 2010 10:07:04 -0500
Subject: [PATCH] Update branch for 0.5-rc release
---
program/steps/mail/copy.inc | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/program/steps/mail/copy.inc b/program/steps/mail/copy.inc
index b42ef39..8a7c591 100644
--- a/program/steps/mail/copy.inc
+++ b/program/steps/mail/copy.inc
@@ -23,23 +23,22 @@
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);
-
// move messages
if (!empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) {
$uids = get_input_value('_uid', RCUBE_INPUT_POST);
- $target = get_input_value('_target_mbox', RCUBE_INPUT_POST);
- $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
+ $target = get_input_value('_target_mbox', RCUBE_INPUT_POST, true);
+ $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true);
$copied = $IMAP->copy_message($uids, $target, $mbox);
-
+
if (!$copied) {
// send error message
- $OUTPUT->show_message('errorcopying', 'error');
+ rcmail_display_server_error('errorcopying');
$OUTPUT->send();
exit;
+ }
+ else {
+ $OUTPUT->show_message('messagecopied', 'confirmation');
}
rcmail_send_unread_count($target, true);
@@ -53,5 +52,3 @@
// send response
$OUTPUT->send();
-
-
--
Gitblit v1.9.1