Fix copying messages to a folder with "empty" name e.g. "0", better error handling

pull/67/head
Aleksander Machniak 11 years ago
parent 443b92a7ee
commit 4dfae96dcd

@ -24,10 +24,10 @@ if (!$OUTPUT->ajax_call)
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 @@ if (!empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) {
}
// unknown action or missing query param
else {
exit;
$OUTPUT->show_message('internalerror', 'error');
}
// send response

@ -113,7 +113,7 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox);
if ($threading) {
$count = get_input_value('_count', RCUBE_INPUT_POST);
$count = get_input_value('_count', RCUBE_INPUT_POST);
}
// add new rows from next page (if any)
@ -125,9 +125,9 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
}
}
}
$OUTPUT->send();
}
else {
$OUTPUT->show_message('internalerror', 'error');
}
exit;
$OUTPUT->send();

@ -74,6 +74,8 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
}
// unknown action or missing query param
else {
$OUTPUT->show_message('internalerror', 'error');
$OUTPUT->send();
exit;
}

Loading…
Cancel
Save