X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_rename_do.php;h=79175d1b379224f1d83a15d5ec62c98f1ab9d088;hb=e27195f777a3555b744ce6956a3855479e6ce856;hp=53686009f3df124fee456d43a1048273283f464f;hpb=390372b45bd353cbfc6843382bc7f4291544fc49;p=squirrelmail.git

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index 53686009..79175d1b 100644
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -1,68 +1,51 @@
 <?php
-   /**
-    **  folders_rename_do.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Does the actual renaming of files on the IMAP server. 
-    **  Called from the folders.php
-    **/
 
-   session_start();
-
-   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");
-
-   include("../src/load_prefs.php");
-
-   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-   $dm = sqimap_get_delimiter($imapConnection);
-
-   if (strpos($orig, $dm))
-      $old_dir = substr($orig, 0, strrpos($orig, $dm));
-   else
-      $old_dir = "";
-
-   if ($old_dir != "")
-      $newone = "$old_dir$dm$new_name";
-   else
-      $newone = "$new_name";
-
-   $orig = stripslashes($orig);
-   $newone = stripslashes($newone);
-
-   fputs ($imapConnection, ". RENAME \"$orig\" \"$newone\"\r\n");
-   $data = sqimap_read_data($imapConnection, ".", true, $a, $b);
-
-   // Renaming a folder doesn't renames the folder but leaves you unsubscribed
-   //    at least on Cyrus IMAP servers.
-   if ($isfolder) {
-      $newone = $newone.$dm;
-      $orig = $orig.$dm;
-   }   
-   sqimap_unsubscribe($imapConnection, $orig);
-   sqimap_subscribe($imapConnection, $newone);
-
-   fputs ($imapConnection, "a001 LSUB \"\" \"$orig*\"\r\n");
-   $data = sqimap_read_data($imapConnection, "a001", true, $a, $b);
-   for ($i=0; $i < count($data); $i++) {
-      $name = find_mailbox_name($data[$i]);
-      sqimap_unsubscribe($imapConnection, $name);
-      $name = substr($name, strlen($orig));
-      $name = $newone . $name;
-      sqimap_subscribe($imapConnection, $name);
-   }
-
-
-   /** Log out this session **/
-   sqimap_logout($imapConnection);
-   $location = get_location();
-   header ("Location: $location/folders.php?success=rename");
+/**
+ * folders_rename_do.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Does the actual renaming of files on the IMAP server.
+ * Called from the folders.php
+ *
+ * $Id$
+ */
+
+global $delimiter, $base_uri;
+
+require_once('../src/validate.php');
+require_once('../functions/imap.php');
+
+$new_name = trim($new_name);
+
+if ($old_name <> $new_name) {
+
+    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+
+    if (strpos($orig, $delimiter)) {
+        $old_dir = substr($orig, 0, strrpos($orig, $delimiter));
+    } else {
+        $old_dir = '';
+    }
+
+    if ($old_dir != '') {
+        $newone = $old_dir . $delimiter . $new_name;
+    } else {
+        $newone = $new_name;
+    }
+
+    // Renaming a folder doesn't renames the folder but leaves you unsubscribed
+    //    at least on Cyrus IMAP servers.
+    if (isset($isfolder)) {
+        $newone = $newone.$delimiter;
+        $orig = $orig.$delimiter;
+    }
+    sqimap_mailbox_rename( $imapConnection, $orig, $newone );
+
+    // Log out this session 
+    sqimap_logout($imapConnection);
+
+}
+header ('Location: ' . $base_uri . 'src/folders.php');
 ?>