-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 fe29b9aa7d1f0ca5b3e6bd3c0cc92a6ca38b5ddd..549f2c13fd79985670cedee3855b75daf6ba0fac 100644 (file)
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -35,10 +35,10 @@
    else
       $newone = "$new_name";
 
-   $orig = stripslashes($orig);
-   $newone = stripslashes($newone);
+   $orig = sqStripSlashes($orig);
+   $newone = sqStripSlashes($newone);
 
-   fputs ($imapConnection, ". RENAME \"$orig\" \"$newone\"\n");
+   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
@@ -47,27 +47,22 @@
       $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");
-   sqimap_logout($imapConnection);
-   /*
-   displayPageHeader($color, "None");
-   echo "<BR><BR><BR><CENTER><B>";
-   echo _("Folder Renamed!");
-   echo "</B><BR><BR>";
-   echo _("The folder has been successfully renamed.");
-   echo "<BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>";
-   echo _("Click here");
-   echo "</A> ";
-   echo _("to continue.");
-   echo "</CENTER>";
-   
-   echo "</BODY></HTML>"; 
-   */
 ?>