X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_create.php;h=da1460468b5ea5bf717f52c885ac4ee0c81d04e3;hb=91dc6e4e1605dc5aee40e3cae9f11d79f785b834;hp=9cddfc87ed7831ac1674fb6e794c78ee74415cb9;hpb=5479d7092f359d69ca0186daf8cf399ef4d12922;p=squirrelmail.git diff --git a/src/folders_create.php b/src/folders_create.php index 9cddfc87..da146046 100644 --- a/src/folders_create.php +++ b/src/folders_create.php @@ -1,8 +1,22 @@ -"; plain_error_message(_("Illegal folder name. Please select a different name.")."
"._("Click here to go back").".", $color); + sqimap_logout($imapConnection); exit; } - if ($contain_subs == true) + if (isset($contain_subs) && $contain_subs == true) $folder_name = "$folder_name$dm"; if ($folder_prefix && (substr($folder_prefix, -1) != $dm)) { @@ -31,30 +46,19 @@ if ($folder_prefix && (substr($subfolder, 0, strlen($folder_prefix)) != $folder_prefix)){ $subfolder_orig = $subfolder; $subfolder = $folder_prefix . $subfolder; + } else { + $subfolder_orig = $subfolder; } - if (trim($subfolder_orig) == "[ None ]") { + if ((trim($subfolder_orig) == "[ None ]") || (trim($subfolder_orig) == "[ None ]")) { sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, ""); } else { sqimap_mailbox_create ($imapConnection, $subfolder.$dm.$folder_name, ""); } fputs($imapConnection, "1 logout\n"); -// if ($auto_forward == true) { -// header ("Location: webmail.php?right_frame=folders.php"); -// } else { - echo "\n"; - displayPageHeader($color, "None"); - echo "


"; - echo _("Folder Created!"); - echo "

"; - echo _("The folder has been successfully created."); - echo "
"; - echo _("Click here"); - echo " "; - echo _("to continue."); - echo "
"; - echo ""; -// } + $location = get_location(); + header ("Location: $location/folders.php?success=create"); + sqimap_logout($imapConnection); ?>