X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_rename_getname.php;h=e8563acee0b12577090bd8f57fd1468ff5830908;hb=d04cab4213efb37756cced1d8dcbb8bd22280ac2;hp=7d2ba241c642f24074988ee95c28f90f717f8891;hpb=76911253eb850bacde3d86c8cb7b4af072e67ebe;p=squirrelmail.git

diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php
index 7d2ba241..e8563ace 100644
--- a/src/folders_rename_getname.php
+++ b/src/folders_rename_getname.php
@@ -3,40 +3,43 @@
 /**
  * folders_rename_getname.php
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Gets folder names and enables renaming
  * Called from 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');
+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');
+require_once(SM_PATH . 'functions/forms.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 == '') {
     displayPageHeader($color, 'None');
 
     plain_error_message(_("You have not selected a folder to rename. Please do so.").
-        '<BR><A HREF="../src/folders.php">'._("Click here to go back").'</A>.', $color);
+        '<br /><a href="../src/folders.php">'._("Click here to go back").'</a>.', $color);
     exit;
 }
 
@@ -59,22 +62,23 @@ if (strpos($old, $delimiter)) {
 
 
 displayPageHeader($color, 'None');
-echo '<br>' .
+echo '<br />' .
     html_tag( 'table', '', 'center', '', 'width="95%" border="0"' ) .
         html_tag( 'tr',
             html_tag( 'td', '<b>' . _("Rename a folder") . '</b>', 'center', $color[0] )
         ) .
         html_tag( 'tr' ) .
             html_tag( 'td', '', 'center', $color[4] ) .
-            '<FORM ACTION="folders_rename_do.php" METHOD="POST">'.
+            addForm('folders_rename_do.php').
      _("New name:").
-     "<br><B>$old_parent $delimiter </B><INPUT TYPE=TEXT SIZE=25 NAME=new_name VALUE=\"$old_name\"><BR>\n";
+     '<br /><b>' . htmlspecialchars($old_parent) . ' ' . htmlspecialchars($delimiter) . '</b>' .
+     addInput('new_name', $old_name, 25) . '<br />' . "\n";
 if ( $isfolder ) {
-    echo '<INPUT TYPE=HIDDEN NAME="isfolder" VALUE="true">';
+    echo addHidden('isfolder', 'true');
 }
-printf("<INPUT TYPE=HIDDEN NAME=\"orig\" VALUE=\"%s\">\n", $old);
-printf("<INPUT TYPE=HIDDEN NAME=\"old_name\" VALUE=\"%s\">\n", $old_name);
-echo '<INPUT TYPE=SUBMIT VALUE="'._("Submit")."\">\n".
-     '</FORM><BR></td></tr></table>';
+echo addHidden('orig', $old).
+     addHidden('old_name', $old_name).
+     '<input type="submit" value="'._("Submit")."\" />\n".
+     '</form><br /></td></tr></table>';
 
-?>
+?>
\ No newline at end of file