X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_create.php;h=6a0db857227b841a757ca9211ba9902f9e20e143;hb=5917742752bea11a547aeba6e4102dd3655b4800;hp=4a722b38daed4c080bd60cab0ddccf18cfce4967;hpb=bd8bf4916ce19acd6151da6c2404488d731d8fd6;p=squirrelmail.git
diff --git a/src/folders_create.php b/src/folders_create.php
index 4a722b38..6a0db857 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -1,46 +1,62 @@
-
-\n";
- displayPageHeader($color, "None");
-
- $imapConnection = loginToImapServer($username, $key, $imapServerAddress, 0);
- $dm = findMailboxDelimeter($imapConnection);
+ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 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);
exit;
}
if ($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;
+ }
+
+ if (trim($subfolder_orig) == "[ None ]") {
+ 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 "
";
- echo _("Folder Created!");
- echo "
";
- echo _("The folder has been successfully created.");
- echo "
";
- echo _("Click here");
- echo " ";
- echo _("to continue.");
- echo "";
+// if ($auto_forward == true) {
+// header ("Location: webmail.php?right_frame=folders.php");
+// } else {
+ echo "\n";
+ displayPageHeader($color, "None");
+ echo "
";
+ echo _("Folder Created!");
+ echo "
";
+ echo _("The folder has been successfully created.");
+ echo "
";
+ echo _("Click here");
+ echo " ";
+ echo _("to continue.");
+ echo "";
+ echo "";
+// }
?>
-