X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_create.php;h=d3309f68120250581d4ec0d02c093fa8efdc36c4;hp=b34a53328d37e8b8d972185267d9575c6984c477;hb=5b8d68ca2263cc828546f629c7cd63a78783a3d0;hpb=7ce342dcef2291f6e57eb53892e09a80d2f63dc9
diff --git a/src/folders_create.php b/src/folders_create.php
index b34a5332..d3309f68 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -1,35 +1,57 @@
-
-
- include("../config/config.php");
- include("../functions/strings.php");
- include("../functions/page_header.php");
- include("../functions/imap.php");
- include("../functions/display_messages.php");
-
- echo "
\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, "\\") ||
- strpos($folder_name, "'") || strpos($folder_name, "$dm")) {
- plain_error_message("Illegal folder name. Please select a different name.
Click here to go back.", $color);
- exit;
- }
-
- if ($contain_subs == true)
- $folder_name = "$folder_name$dm";
-
- if (trim($subfolder) == "[ None ]") {
- createFolder($imapConnection, "$folder_name");
- } else {
- createFolder($imapConnection, "$subfolder$dm$folder_name");
- }
- fputs($imapConnection, "1 logout\n");
-
- echo "
Return";
-?>
-
+";
+ plain_error_message(_("Illegal folder name. Please select a different name.")."
"._("Click here to go back").".", $color);
+ sqimap_logout($imapConnection);
+ exit;
+}
+
+if (isset($contain_subs) && $contain_subs ) {
+ $folder_name = "$folder_name$delimiter";
+}
+
+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) == '') {
+ sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, '');
+} else {
+ sqimap_mailbox_create ($imapConnection, $subfolder.$delimiter.$folder_name, '');
+}
+
+$location = get_location();
+header ("Location: $location/folders.php?success=create");
+sqimap_logout($imapConnection);
+?>