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

diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php
index f16f0573..1b8066d7 100644
--- a/src/folders_rename_getname.php
+++ b/src/folders_rename_getname.php
@@ -1,65 +1,78 @@
 <?php
-   /**
-    **  folders_rename_getname.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Gets folder names and enables renaming
-    **  Called from folders.php
-    **/
 
-   session_start();
+/**
+ * folders_rename_getname.php
+ *
+ * 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
+ * Called from folders.php
+ *
+ * $Id$
+ */
 
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
 
-   include("../src/load_prefs.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 */
 
-   $dm = sqimap_get_delimiter($imapConnection);
-   if (substr($old, strlen($old) - strlen($dm)) == $dm) {
-      $isfolder = true;
-      $old = substr($old, 0, strlen($old) - 1);
-   }
-   
-   if (strpos($old, $dm)) {
-      $old_name = substr($old, strrpos($old, $dm)+1, strlen($old));
-      $old_parent = substr($old, 0, strrpos($old, $dm));
-   } else {
-      $old_name = $old;
-      $old_parent = "";
-   }
+if ($old == '') {
+    displayPageHeader($color, 'None');
 
-   $old_name = stripslashes($old_name);
+    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;
+}
 
-   displayPageHeader($color, "None");
-   echo "<br><TABLE align=center border=0 WIDTH=95% COLS=1>";
-   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><B>";
-   echo _("Rename a folder");
-   echo "</B></TD></TR>";
-   echo "<TR><TD BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
-   echo "<FORM ACTION=\"folders_rename_do.php\" METHOD=\"POST\">\n";
-   echo _("New name:");
-   echo " &nbsp;&nbsp;<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=orig VALUE=\"$old\">";
-   echo "<INPUT TYPE=SUBMIT VALUE=\"";
-   echo _("Submit");
-   echo "\">\n";
-   echo "</FORM><BR></TD></TR>";
-   echo "</TABLE>";
+if (substr($old, strlen($old) - strlen($delimiter)) == $delimiter) {
+    $isfolder = TRUE;
+    $old = substr($old, 0, strlen($old) - 1);
+} else {
+    $isfolder = FALSE;
+}
 
-   /** Log out this session **/
-   sqimap_logout($imapConnection);
-?>
+$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));
+} else {
+    $old_name = $old;
+    $old_parent = '';
+}
 
 
+displayPageHeader($color, 'None');
+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">';
+}
+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>';
+
+?>