X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_create.php;h=9af11417f13a25ec76be3d91c352f919503d37c4;hp=e8f08c73626c56b5390c4b1c1fe3a543d9a1b667;hb=d2523fba460000828abde942f000ecc4857a829d;hpb=ecf516587689c2d4cd2b1e0cf95b0bbce9a882ca
diff --git a/src/folders_create.php b/src/folders_create.php
index e8f08c73..9af11417 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -1,61 +1,68 @@
";
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)
- $folder_name = "$folder_name$dm";
+ if (isset($contain_subs) && $contain_subs == true)
+ $folder_name = "$folder_name$delimiter";
- if ($folder_prefix && (substr($folder_prefix, -1) != $dm)) {
- $folder_prefix = $folder_prefix . $dm;
+ 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) == "[ None ]") || (trim(stripslashes($subfolder_orig)) == "[ None ]")) {
+ if (trim($subfolder_orig) == '') {
sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, "");
} else {
- sqimap_mailbox_create ($imapConnection, $subfolder.$dm.$folder_name, "");
+ sqimap_mailbox_create ($imapConnection, $subfolder.$delimiter.$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);
+?>