-fix for Bug 112604

[squirrelmail.git] / src / folders_rename_do.php

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index 68444932986ab0473dc027e11f5236c9f66b8178..549f2c13fd79985670cedee3855b75daf6ba0fac 100644 (file)
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -1,14 +1,29 @@
-<?
-   include("../config/config.php");
-   include("../functions/strings.php");
-   include("../functions/page_header.php");
-   include("../functions/imap.php");
-   include("../functions/mailbox.php");
+<?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 = loginToImapServer($username, $key, $imapServerAddress, 0);
-   $dm = findMailboxDelimeter($imapConnection);
+   $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));
@@ -20,53 +35,34 @@
    else
       $newone = "$new_name";
 
-   fputs ($imapConnection, ". RENAME \"$orig\" \"$newone\"\n");
-   $data = imapReadData($imapConnection, ".", true, $a, $b);
+   $orig = sqStripSlashes($orig);
+   $newone = sqStripSlashes($newone);
 
-/*   fputs ($imapConnection, ". RENAME \"$old_name\" \"$mailbox\"\n";
+   fputs ($imapConnection, ". RENAME \"$orig\" \"$newone\"\r\n");
+   $data = sqimap_read_data($imapConnection, ".", true, $a, $b);
 
-   selectMailbox($imapConnection, $orig, $numMessages);
-   getFolderList($imapConnection, $boxesFormatted, $boxesUnformatted, $boxesRaw);
+   // 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);
 
-   $mailbox = "$subfolder.$new_name";
-   $old_name = substr($orig, strrpos($orig, ".")+1, strlen($orig));
-   $old_parent = substr($orig, 0, strrpos($orig, "."));
-
-   for ($i = 0; $i < count($boxesUnformatted); $i++) {
-      if (substr($boxesUnformatted[$i], 0, strlen($orig)) == $orig) {
-         $after = substr($boxesUnformatted[$i], strlen($orig)+1, strlen($boxesUnformatted[$i]));
-         selectMailbox($imapConnection, $boxesUnformatted[$i], $numMessages);
-         if (strlen($after) > 0) {
-            createFolder($imapConnection, "$mailbox.$after");
-            if ($numMessages > 0)
-               $success = copyMessages($imapConnection, 1, $numMessages, "$mailbox.$after");
-            else
-               $success = true;
+   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);
+   }
 
-            if ($success == true)
-               removeFolder($imapConnection, "$boxesUnformatted[$i]");
-         }
-         else {
-            createFolder($imapConnection, "$mailbox");
-            if ($numMessages > 0)
-               $success = copyMessages($imapConnection, 1, $numMessages, "$mailbox");
-            else
-               $success = true;
 
-            if ($success == true)
-               removeFolder($imapConnection, "$boxesUnformatted[$i]");
-         }
-      }
-   }
-*/
    /** Log out this session **/
-   fputs($imapConnection, "1 logout");
-
-   echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
-   echo "<BR><BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>";
-   echo _("Return");
-   echo "</A>";
-   echo "</BODY></HTML>";
+   sqimap_logout($imapConnection);
+   $location = get_location();
+   header ("Location: $location/folders.php?success=rename");
 ?>
-
-