X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_create.php;h=1f25070b0f76b45ed195910971633183f32d5fa1;hp=335aaeb227dbf294d10a457f5cde0671bc4aa5b4;hb=056d0da203c7b9ff86261d6869324a9c6e399e29;hpb=d3cdb279bd61b172926b51d41d09c8a691d6c347
diff --git a/src/folders_create.php b/src/folders_create.php
index 335aaeb2..1f25070b 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -1,37 +1,51 @@
-
-\n";
- displayPageHeader($color, "None");
-
- $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
- $dm = findMailboxDelimeter($imapConnection);
-
- if (strpos($folder_name, "\"") || strpos($folder_name, ".") ||
- strpos($folder_name, "/") || strpos($folder_name, "\\") ||
+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 ]") {
- 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 {
- createFolder($imapConnection, "$subfolder$dm$folder_name");
+ $subfolder_orig = $subfolder;
}
- fputs($imapConnection, "1 logout\n");
- echo "
Return";
-?>
-
+ 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