X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_rename_getname.php;h=7896fa5bf6fabdcfe8b57a686119239ef01ec64e;hb=6205dc7d906803edb6c0fa29bf678fa4a66285f2;hp=ca143f9b7fac91115e2f5f29b659d7fb79bfca55;hpb=d51894be063bf2e1349762bc554358c62d368e36;p=squirrelmail.git

diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php
index ca143f9b..7896fa5b 100644
--- a/src/folders_rename_getname.php
+++ b/src/folders_rename_getname.php
@@ -1,64 +1,59 @@
 <?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
-    **
-    **  $Id$
-    **/
-
-   session_start();
-
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-
-   include("../src/load_prefs.php");
-
-   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-
-   $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 = "";
-   }
-
-   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 "<br><B>$old_parent . </B><INPUT TYPE=TEXT SIZE=25 NAME=new_name VALUE=\"$old_name\"><BR>\n";
-   if (isset($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";
-   echo "</FORM><BR></TD></TR>";
-   echo "</TABLE>";
-
-   /** Log out this session **/
-   sqimap_logout($imapConnection);
-?>
-
 
+/**
+ * folders_rename_getname.php
+ *
+ * Copyright (c) 1999-2002 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$
+ */
+
+global $delimiter;
+
+require_once('../src/validate.php');
+require_once('../functions/imap.php');
+
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+
+echo $old;
+
+if (substr($old, strlen($old) - strlen($delimiter)) == $delimiter) {
+    $isfolder = TRUE;
+    $old = substr($old, 0, strlen($old) - 1);
+} else {
+    $isfolder = FALSE;
+}
+
+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><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".
+     _("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>";
+
+/** Log out this session **/
+sqimap_logout($imapConnection);
+?>
\ No newline at end of file