From d2d8d498c67e7193dcdcebe7d806753ec02843fd Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Fri, 05 Apr 2013 09:00:57 -0400 Subject: [PATCH] Fix copying messages to a folder with "empty" name e.g. "0", better error handling --- program/steps/mail/copy.inc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/program/steps/mail/copy.inc b/program/steps/mail/copy.inc index a72378b..8766574 100644 --- a/program/steps/mail/copy.inc +++ b/program/steps/mail/copy.inc @@ -24,10 +24,10 @@ return; // move messages -if (!empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) { - $uids = get_input_value('_uid', RCUBE_INPUT_POST); +if (!empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) { + $uids = get_input_value('_uid', RCUBE_INPUT_POST); $target = get_input_value('_target_mbox', RCUBE_INPUT_POST, true); - $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true); + $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true); $copied = $RCMAIL->storage->copy_message($uids, $target, $mbox); @@ -47,7 +47,7 @@ } // unknown action or missing query param else { - exit; + $OUTPUT->show_message('internalerror', 'error'); } // send response -- Gitblit v1.9.1