X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_rename_getname.php;h=e8563acee0b12577090bd8f57fd1468ff5830908;hb=030dae845395b0b3d713d008253000bcddb7940a;hp=7896fa5bf6fabdcfe8b57a686119239ef01ec64e;hpb=1c52ba77ca7d72fd34feeb6b338d3e60b6083f07;p=squirrelmail.git

diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php
index 7896fa5b..e8563ace 100644
--- a/src/folders_rename_getname.php
+++ b/src/folders_rename_getname.php
@@ -3,23 +3,45 @@
 /**
  * folders_rename_getname.php
  *
- * Copyright (c) 1999-2002 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
  */
 
-global $delimiter;
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
+define('SM_PATH','../');
 
-require_once('../src/validate.php');
-require_once('../functions/imap.php');
+/* 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');
 
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+/* get globals we may need */
+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 */
 
-echo $old;
+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);
+    exit;
+}
 
 if (substr($old, strlen($old) - strlen($delimiter)) == $delimiter) {
     $isfolder = TRUE;
@@ -28,6 +50,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));
@@ -36,24 +60,25 @@ if (strpos($old, $delimiter)) {
     $old_parent = '';
 }
 
+
 displayPageHeader($color, 'None');
-echo "<br><TABLE align=center border=0 WIDTH=\"95%\" COLS=1>".
-     "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><B>".
-     _("Rename a folder").
-     "</B></TD></TR>".
-     "<TR><TD BGCOLOR=\"$color[4]\" ALIGN=CENTER>".
-     "<FORM ACTION=\"folders_rename_do.php\" METHOD=\"POST\">\n".
+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] ) .
+            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>";
-
-/** Log out this session **/
-sqimap_logout($imapConnection);
+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