X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_create.php;h=1f25070b0f76b45ed195910971633183f32d5fa1;hp=31fe65f496c59176eaf716f323f71d4131e11632;hb=b5efadfa18aae0a9730fa1fe597b9745bdcc3238;hpb=138f26f6e7092a59ebac3ead587bb6a9b0d28ad3
diff --git a/src/folders_create.php b/src/folders_create.php
index 31fe65f4..1f25070b 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -1,52 +1,51 @@
-"._("Click here to go back")."."), $color);
+ echo "";
+ 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 (trim($subfolder) == "[ None ]") {
- sqimap_mailbox_create ($imapConnection, $folder_name, "");
+ if ($folder_prefix && (substr($folder_prefix, -1) != $dm)) {
+ $folder_prefix = $folder_prefix . $dm;
+ }
+ if ($folder_prefix && (substr($subfolder, 0, strlen($folder_prefix)) != $folder_prefix)){
+ $subfolder_orig = $subfolder;
+ $subfolder = $folder_prefix . $subfolder;
} else {
- sqimap_mailbox_create ($imapConnection, $subfolder.$dm.$folder_name, "");
+ $subfolder_orig = $subfolder;
}
- 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 "";
-// }
-?>
+ if (trim($subfolder_orig) == '') {
+ sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, "");
+ } else {
+ sqimap_mailbox_create ($imapConnection, $subfolder.$dm.$folder_name, "");
+ }
+ $location = get_location();
+ header ("Location: $location/folders.php?success=create");
+ sqimap_logout($imapConnection);
+?>
\ No newline at end of file