X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_create.php;h=1f25070b0f76b45ed195910971633183f32d5fa1;hb=9487c2ff3a9d36af3dc93bd231a6f85fe7a6f762;hp=7d090337a16c13fae7c8c10b7206815a4278a07f;hpb=7aaa81fcf8383ee72ee0e4fd3cb2fd8d5f9708b5;p=squirrelmail.git
diff --git a/src/folders_create.php b/src/folders_create.php
index 7d090337..1f25070b 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -5,36 +5,28 @@
** Copyright (c) 1999-2000 The SquirrelMail development team
** Licensed under the GNU GPL. For full terms see the file COPYING.
**
- ** Creates folders on the IMAP server.
+ ** Creates folders on the IMAP server.
** Called from folders.php
+ **
+ ** $Id$
**/
- session_start();
-
- 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");
+ require_once('../src/validate.php');
+ require_once('../functions/imap.php');
+ require_once('../functions/display_messages.php');
$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, "$dm")) {
+ 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 ($folder_prefix && (substr($folder_prefix, -1) != $dm)) {
@@ -47,28 +39,13 @@
$subfolder_orig = $subfolder;
}
- if ((trim($subfolder_orig) == "[ None ]") || (trim(sqStripSlashes($subfolder_orig)) == "[ None ]")) {
+ if (trim($subfolder_orig) == '') {
sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, "");
} else {
sqimap_mailbox_create ($imapConnection, $subfolder.$dm.$folder_name, "");
}
- fputs($imapConnection, "1 logout\n");
$location = get_location();
header ("Location: $location/folders.php?success=create");
sqimap_logout($imapConnection);
- /*
- 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 "";
- */
-?>
-
+?>
\ No newline at end of file