X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_create.php;h=c0b4de483411228e68e160e29a60b9f541e3f72a;hb=c4db9729040739972896dad259bb2c0619050d05;hp=31fe65f496c59176eaf716f323f71d4131e11632;hpb=138f26f6e7092a59ebac3ead587bb6a9b0d28ad3;p=squirrelmail.git
diff --git a/src/folders_create.php b/src/folders_create.php
index 31fe65f4..c0b4de48 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -1,52 +1,53 @@
-"._("Click here to go back")."."), $color);
- exit;
- }
-
- if ($contain_subs == true)
- $folder_name = "$folder_name$dm";
-
- if (trim($subfolder) == "[ None ]") {
- sqimap_mailbox_create ($imapConnection, $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 "";
-// }
-?>
+";
+ plain_error_message(_("Illegal folder name. Please select a different name.")."
"._("Click here to go back").".", $color);
+ sqimap_logout($imapConnection);
+ exit;
+}
+if (isset($contain_subs) && $contain_subs ) {
+ $folder_name = "$folder_name$delimiter";
+}
+
+if ($folder_prefix && (substr($folder_prefix, -1) != $delimiter)) {
+ $folder_prefix = $folder_prefix . $delimiter;
+}
+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) == '') {
+ sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, '');
+} else {
+ sqimap_mailbox_create ($imapConnection, $subfolder.$delimiter.$folder_name, '');
+}
+
+$location = get_location();
+header ("Location: $location/folders.php?success=create");
+sqimap_logout($imapConnection);
+?>