X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_create.php;h=2aa59316155a8a3fbde75755307d5f30ba2bbb46;hb=21366e951879b247d668a5ccac18afd6966608bc;hp=9af11417f13a25ec76be3d91c352f919503d37c4;hpb=355861846a51d35efe50848869d680fd3b4a5316;p=squirrelmail.git
diff --git a/src/folders_create.php b/src/folders_create.php
index 9af11417..2aa59316 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -3,66 +3,74 @@
/**
* folders_create.php
*
- * Copyright (c) 1999-2001 The Squirrelmail Development Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Creates folders on the IMAP server.
* Called from folders.php
*
* $Id$
+ * @package squirrelmail
*/
-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/
-/*** + Base level indent should begin at left margin, as ***/
-/*** the require_once below looks. ***/
-/*** + All identation should consist of four space blocks ***/
-/*** + Tab characters are evil. ***/
-/*** + all comments should use "slash-star ... star-slash" ***/
-/*** style -- no pound characters, no slash-slash style ***/
-/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/
-/*** ALWAYS USE { AND } CHARACTERS!!! ***/
-/*** + Please use ' instead of ", when possible. Note " ***/
-/*** should always be used in _( ) function calls. ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
-
-require_once('../src/validate.php');
-require_once('../functions/imap.php');
-require_once('../functions/display_messages.php');
-
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
- global $delimiter;
-
- if (strpos($folder_name, "\"") || strpos($folder_name, "\\") ||
- strpos($folder_name, "'") || strpos($folder_name, "$delimiter")) {
- echo "";
- 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 == true)
- $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);
+/** Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/display_messages.php');
+
+/* get globals we may need */
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+sqgetGlobalVar('folder_name', $folder_name, SQ_POST);
+sqgetGlobalVar('subfolder', $subfolder, SQ_POST);
+sqgetGlobalVar('contain_subs', $contain_subs, SQ_POST);
+/* end of get globals */
+
+$folder_name = trim($folder_name);
+
+if (substr_count($folder_name, '"') || substr_count($folder_name, "\\") ||
+ substr_count($folder_name, $delimiter) || ($folder_name == '')) {
+ displayPageHeader($color, 'None');
+
+ plain_error_message(_("Illegal folder name. Please select a different name.").
+ '
'._("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");
+
?>