X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_create.php;h=97661a83ed4431da79bed7b0183c68d86be0894d;hb=525b7ae6ddd3cb500999021bb216d010fade1857;hp=da1460468b5ea5bf717f52c885ac4ee0c81d04e3;hpb=d51894be063bf2e1349762bc554358c62d368e36;p=squirrelmail.git
diff --git a/src/folders_create.php b/src/folders_create.php
index da146046..97661a83 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -5,43 +5,32 @@
** 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($strings_php))
- include("../functions/strings.php");
- if (!isset($config_php))
- include("../config/config.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);
+ global $delimiter;
if (strpos($folder_name, "\"") || strpos($folder_name, "\\") ||
- strpos($folder_name, "'") || strpos($folder_name, "$dm")) {
- print "";
+ 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$dm";
+ $folder_name = "$folder_name$delimiter";
- if ($folder_prefix && (substr($folder_prefix, -1) != $dm)) {
- $folder_prefix = $folder_prefix . $dm;
+ 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;
@@ -50,15 +39,13 @@
$subfolder_orig = $subfolder;
}
- if ((trim($subfolder_orig) == "[ None ]") || (trim($subfolder_orig) == "[ None ]")) {
+ if (trim($subfolder_orig) == '') {
sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, "");
} else {
- sqimap_mailbox_create ($imapConnection, $subfolder.$dm.$folder_name, "");
+ sqimap_mailbox_create ($imapConnection, $subfolder.$delimiter.$folder_name, "");
}
- fputs($imapConnection, "1 logout\n");
$location = get_location();
header ("Location: $location/folders.php?success=create");
sqimap_logout($imapConnection);
?>
-