Replacing tabs with spaces, trimming white space at EOL and newline at EOF

[squirrelmail.git] / src / folders_rename_do.php

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index a7aba128d4ce9ec29bc678cd61cbbd1e1525bf29..f3afc591c08885c6545d3bea5f9fb63ff7fd2636 100644 (file)
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -3,33 +3,36 @@
 /**
  * folders_rename_do.php
  *
 /**
  * folders_rename_do.php
  *

- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team

  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Does the actual renaming of files on the IMAP server.
  * Called from the folders.php
  *
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Does the actual renaming of files on the IMAP server.
  * Called from the folders.php
  *

- * $Id$
+ * @version $Id$
+ * @package squirrelmail

  */
 
  */
 

-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */

 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
 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');
 
 /* globals */
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 
 /* globals */

-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
-$delimiter = $_SESSION['delimiter'];
-$onetimepad = $_SESSION['onetimepad'];
-
-$orig = $_POST['orig'];
-$old_name = $_POST['old_name'];
-$new_name = $_POST['new_name'];
-
+sqgetGlobalVar('key',       $key,           SQ_COOKIE);
+sqgetGlobalVar('username',  $username,      SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
+sqgetGlobalVar('orig',      $orig,          SQ_POST);
+sqgetGlobalVar('old_name',  $old_name,      SQ_POST);
+sqgetGlobalVar('new_name',  $new_name,      SQ_POST);

 /* end globals */
 
 $new_name = trim($new_name);
 /* end globals */
 
 $new_name = trim($new_name);


@@ -38,8 +41,8 @@ if (substr_count($new_name, '"') || substr_count($new_name, "\\") ||
     substr_count($new_name, $delimiter) || ($new_name == '')) {
     displayPageHeader($color, 'None');
 
     substr_count($new_name, $delimiter) || ($new_name == '')) {
     displayPageHeader($color, 'None');
 

-    plain_error_message(_("Illegal folder name.  Please select a different name.").
-        '<BR><A HREF="../src/folders.php">'._("Click here to go back").'</A>.', $color);
+    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;
 }
 
     exit;
 }


@@ -72,11 +75,11 @@ if ($old_name <> $new_name) {
     }
     sqimap_mailbox_rename( $imapConnection, $orig, $newone );
 
     }
     sqimap_mailbox_rename( $imapConnection, $orig, $newone );
 

-    // Log out this session 
+    // Log out this session

     sqimap_logout($imapConnection);
 
 }
 
 header ('Location: ' . get_location() . '/folders.php?success=rename');
 
     sqimap_logout($imapConnection);
 
 }
 
 header ('Location: ' . get_location() . '/folders.php?success=rename');
 

-?>
+?>
\ No newline at end of file