From f9c107afbe9bb01627a9e6de48efdfbbda8e56e6 Mon Sep 17 00:00:00 2001 From: thomascube Date: Sun, 30 Jul 2006 19:38:06 +0000 Subject: Fixed folder renaming; added confirmation after deleting a folder --- program/steps/settings/manage_folders.inc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'program/steps') diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc index 770bac2fd..457fcb5d2 100644 --- a/program/steps/settings/manage_folders.inc +++ b/program/steps/settings/manage_folders.inc @@ -67,7 +67,7 @@ else if ($_action=='create-folder') else if ($_action=='rename-folder') { if (!empty($_GET['_folder_oldname']) && !empty($_GET['_folder_newname'])) - $rename = $IMAP->rename_mailbox(get_input_value('_folder_oldname', RCUBE_INPUT_GET), trim(get_input_value('_folder_newname', RCUBE_INPUT_GET)), TRUE); + $rename = $IMAP->rename_mailbox(get_input_value('_folder_oldname', RCUBE_INPUT_GET), trim(get_input_value('_folder_newname', RCUBE_INPUT_GET))); if ($rename && $REMOTE_REQUEST) { @@ -89,11 +89,15 @@ else if ($_action=='rename-folder') // delete an existing IMAP mailbox else if ($_action=='delete-folder') { - if (strlen($_GET['_mboxes'])) - $deleted = $IMAP->delete_mailbox(array($_GET['_mboxes'])); + if (!empty($_GET['_mboxes'])) + $deleted = $IMAP->delete_mailbox(array(get_input_value('_mboxes', RCUBE_INPUT_GET))); if ($REMOTE_REQUEST && $deleted) - rcube_remote_response(sprintf("this.remove_folder_row('%s')", rep_specialchars_output($_GET['_mboxes'], 'js'))); + { + $commands = sprintf("this.remove_folder_row('%s');\n", rep_specialchars_output(get_input_value('_mboxes', RCUBE_INPUT_GET), 'js')); + $commands .= show_message('folderdeleted', 'confirmation'); + rcube_remote_response($commands); + } else if ($REMOTE_REQUEST) { $commands = show_message('errorsaving', 'error'); -- cgit v1.2.3