X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_create.php;h=9af11417f13a25ec76be3d91c352f919503d37c4;hb=3392dc867232037b2c6e2089ebcab9d64e154db7;hp=4e42dd14a39e7a764864ca4d2883ceae96aa2daf;hpb=d068c0ec5447e8f373ebd536b08ed902c00de0f5;p=squirrelmail.git
diff --git a/src/folders_create.php b/src/folders_create.php
index 4e42dd14..9af11417 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -1,53 +1,68 @@
-
- if (!isset($config_php))
- include("../config/config.php");
- if (!isset($strings_php))
- include("../functions/strings.php");
- if (!isset($page_header_php))
- include("../functions/page_header.php");
- if (!isset($imap_php))
- include("../functions/imap.php");
- if (!isset($display_messages_php))
- include("../functions/display_messages.php");
-
- include("../src/load_prefs.php");
-
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0);
- $dm = sqimap_get_delimiter($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);
+
";
+ 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 (trim($subfolder) == "[ None ]") {
- sqimap_mailbox_create ($imapConnection, $folder_name, "");
+ 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 {
- sqimap_mailbox_create ($imapConnection, $subfolder.$dm.$folder_name, "");
+ $subfolder_orig = $subfolder;
}
- 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 "
";
- echo _("Folder Created!");
- echo "
";
- echo _("The folder has been successfully created.");
- echo "
";
- echo _("Click here");
- echo " ";
- echo _("to continue.");
- echo "";
- echo "";
-// }
-?>
+ 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);
+?>