From f5e7b353079f182d6d57e05b37e1eeb32872bc1a Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 12 Jan 2011 13:25:02 -0500
Subject: [PATCH] Bumbed version; Roundcube development is not Switzerland only
---
program/steps/mail/copy.inc | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/program/steps/mail/copy.inc b/program/steps/mail/copy.inc
index 175994f..a4d6a47 100644
--- a/program/steps/mail/copy.inc
+++ b/program/steps/mail/copy.inc
@@ -4,8 +4,8 @@
+-----------------------------------------------------------------------+
| program/steps/mail/copy.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2010, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -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