and back in sync again

[squirrelmail.git] / src / folders_rename_getname.php

diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php
index 6e494aa763ba35c29621e4623ac9d70be1b476f3..1b8066d72218af09f99a5a052969173af9ea8815 100644 (file)
--- a/src/folders_rename_getname.php
+++ b/src/folders_rename_getname.php
@@ -3,7 +3,7 @@
 /**
  * folders_rename_getname.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.
  *
  * Gets folder names and enables renaming
@@ -17,18 +17,17 @@ 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_mailbox.php');
 require_once(SM_PATH . 'functions/html.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'];
-
-$old = $_POST['old'];
-    
+sqgetGlobalVar('key',       $key,           SQ_COOKIE);
+sqgetGlobalVar('username',  $username,      SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION);
+sqgetGlobalVar('old',       $old,           SQ_POST);
 /* end of get globals */
 
 if ($old == '') {
@@ -46,6 +45,8 @@ if (substr($old, strlen($old) - strlen($delimiter)) == $delimiter) {
     $isfolder = FALSE;
 }
 
+$old = imap_utf7_decode_local($old);
+
 if (strpos($old, $delimiter)) {
     $old_name = substr($old, strrpos($old, $delimiter)+1, strlen($old));
     $old_parent = substr($old, 0, strrpos($old, $delimiter));
@@ -54,6 +55,7 @@ if (strpos($old, $delimiter)) {
     $old_parent = '';
 }
 
+
 displayPageHeader($color, 'None');
 echo '<br>' .
     html_tag( 'table', '', 'center', '', 'width="95%" border="0"' ) .