X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_create.php;h=8c68b9dea07338604fe216f4cbf2f8ee0d2b4818;hb=e50f5ac2682d655013d18d97f9a2aa30b7ed9485;hp=4a722b38daed4c080bd60cab0ddccf18cfce4967;hpb=bd8bf4916ce19acd6151da6c2404488d731d8fd6;p=squirrelmail.git
diff --git a/src/folders_create.php b/src/folders_create.php
index 4a722b38..8c68b9de 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -1,46 +1,79 @@
-
-
- include("../config/config.php");
- include("../functions/strings.php");
- include("../functions/page_header.php");
- include("../functions/imap.php");
- include("../functions/display_messages.php");
-
- include("../src/load_prefs.php");
-
- echo "
\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, "\\") ||
- 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$folder_name");
- }
- fputs($imapConnection, "1 logout\n");
-
- echo "";
- echo "
";
- echo _("Folder Created!");
- echo "
";
- echo _("The folder has been successfully created.");
- echo "
";
- echo _("Click here");
- echo " ";
- echo _("to continue.");
- echo "";
-?>
-
+'._("Click here to go back").'.', $color);
+
+ exit;
+}
+
+$folder_name = imap_utf7_encode_local($folder_name);
+
+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;
+}
+
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+
+if (trim($subfolder_orig) == '') {
+ sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, '');
+} else {
+ sqimap_mailbox_create ($imapConnection, $subfolder.$delimiter.$folder_name, '');
+}
+
+sqimap_logout($imapConnection);
+
+$location = get_location();
+header ("Location: $location/folders.php?success=create");
+
+?>
\ No newline at end of file