X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_create.php;h=607bbac71d2e006b93cef0e72f42f84e83a8813b;hb=709a1a6d2b6881c1e57e542579436a8f9a909ac3;hp=e668ac2da3c2017a1201349090355d8d9a46b030;hpb=91f999f6777c170dfa84465f1ccfec69ff06b3a5;p=squirrelmail.git
diff --git a/src/folders_create.php b/src/folders_create.php
index e668ac2d..607bbac7 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -1,41 +1,52 @@
-
-\n";
- displayPageHeader($color, "None");
-
- $imapConnection = loginToImapServer($username, $key, $imapServerAddress, 0);
- $dm = findMailboxDelimeter($imapConnection);
-
- if (strpos($folder_name, "\"") || strpos($folder_name, ".") ||
- strpos($folder_name, "/") || strpos($folder_name, "\\") ||
+ if (strpos($folder_name, "\"") || strpos($folder_name, "\\") ||
strpos($folder_name, "'") || strpos($folder_name, "$dm")) {
- plain_error_message(_("Illegal folder name. Please select a different name.
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 ]") {
- createFolder($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 {
- createFolder($imapConnection, "$subfolder$folder_name");
+ sqimap_mailbox_create ($imapConnection, $subfolder.$dm.$folder_name, "");
}
- fputs($imapConnection, "1 logout\n");
- echo "";
- echo "
" . _("Folder Created!") . "
";
- echo _("You will be automatically forwarded.") . "
" . _("If not,") . " " . _("click here") . ".";
- echo "";
-
+ $location = get_location();
+ header ("Location: $location/folders.php?success=create");
+ sqimap_logout($imapConnection);
?>
-