Talking about stupid... backing out your own changes is stupid.

[squirrelmail.git] / src / folders_create.php
diff --git a/src/folders_create.php b/src/folders_create.php

index b847749c5d1344711c6648a86a780da31266ee00..08bc1928b581c670faeb10856c9bcb3b64870823 100644 (file)
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -3,7 +3,7 @@
  /**
   * folders_create.php
   *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
   * Licensed under the GNU GPL. For full terms see the file COPYING.
   *
   * Creates folders on the IMAP server.
@@ -17,39 +17,36 @@ 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 */
-
-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
-$delimiter = $_SESSION['delimiter'];
-$onetimepad = $_SESSION['onetimepad'];
-$folder_name = $_POST['folder_name'];
-$subfolder = $_POST['subfolder'];
-if (isset($_POST['contain_subs'])) {
-    $contain_subs = $_POST['contain_subs'];
-}
-
+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 */
  
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-
  $folder_name = trim($folder_name);
  
-if (strpos($folder_name, "\"") || strpos($folder_name, "\\") ||
-    strpos($folder_name, "'") || strpos($folder_name, "$delimiter") ||
-    ($folder_name == '')) {
+if (substr_count($folder_name, '"') || substr_count($folder_name, "\\") ||
+    substr_count($folder_name, $delimiter) || ($folder_name == '')) {
      displayPageHeader($color, 'None');
-    echo "<html><body bgcolor=$color[4]>";
-    plain_error_message(_("Illegal folder name.  Please select a different name.")."<BR><A HREF=\"../src/folders.php\">"._("Click here to go back")."</A>.", $color);
-    sqimap_logout($imapConnection);
+
+    plain_error_message(_("Illegal folder name.  Please select a different name.").
+        '<BR><A HREF="../src/folders.php">'._("Click here to go back").'</A>.', $color);
+
      exit;
  }
  
+$folder_name = imap_utf7_encode_local($folder_name);
+
  if (isset($contain_subs) && $contain_subs ) {
-    $folder_name = "$folder_name$delimiter";
+    $folder_name = $folder_name . $delimiter;
  }
  
  if ($folder_prefix && (substr($folder_prefix, -1) != $delimiter)) {
@@ -62,13 +59,17 @@ if ($folder_prefix && (substr($subfolder, 0, strlen($folder_prefix)) != $folder_
      $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");
-sqimap_logout($imapConnection);
+
  ?>