X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_create.php;h=607bbac71d2e006b93cef0e72f42f84e83a8813b;hb=d4e84069d1d9af8760b8e858672d3ea3d4eac8b0;hp=4e42dd14a39e7a764864ca4d2883ceae96aa2daf;hpb=d068c0ec5447e8f373ebd536b08ed902c00de0f5;p=squirrelmail.git
diff --git a/src/folders_create.php b/src/folders_create.php
index 4e42dd14..607bbac7 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -1,53 +1,52 @@
-Click here to go back."), $color);
+ print "";
+ 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 {
+ $subfolder_orig = $subfolder;
+ }
+
+ if (trim($subfolder_orig) == '') {
+ 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 "
";
- 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);
?>