X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_rename_getname.php;h=1b8066d72218af09f99a5a052969173af9ea8815;hb=107ae60cd69934271b6cb6ca93a3bd72e74ce468;hp=f6e4225026ab298e94d4ee7b8a6bf11e254504fc;hpb=eb47b7175cea87747bbd30379904ac5f40db7706;p=squirrelmail.git

diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php
index f6e42250..1b8066d7 100644
--- 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
@@ -12,12 +12,31 @@
  * $Id$
  */
 
-global $delimiter;
+/* Path for SquirrelMail required files. */
+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');
 
-$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 */
+
+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;
@@ -26,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));
@@ -34,24 +55,24 @@ 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] ) .
+            '<FORM ACTION="folders_rename_do.php" METHOD="POST">'.
      _("New name:").
      "<br><B>$old_parent $delimiter </B><INPUT TYPE=TEXT SIZE=25 NAME=new_name VALUE=\"$old_name\"><BR>\n";
 if ( $isfolder ) {
-    echo "<INPUT TYPE=HIDDEN NAME=isfolder VALUE=\"true\">";
+    echo '<INPUT TYPE=HIDDEN NAME="isfolder" VALUE="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);
-?>
\ No newline at end of file
+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>';
+
+?>