fixed an HTML rendering bug in search display

[squirrelmail.git] / src / folders_rename_do.php

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index 53686009f3df124fee456d43a1048273283f464f..07438e1007fff7706be2ea58c806e0959f049cea 100644 (file)
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -35,8 +35,8 @@
    else
       $newone = "$new_name";
 
-   $orig = stripslashes($orig);
-   $newone = stripslashes($newone);
+   $orig = sqStripSlashes($orig);
+   $newone = sqStripSlashes($newone);
 
    fputs ($imapConnection, ". RENAME \"$orig\" \"$newone\"\r\n");
    $data = sqimap_read_data($imapConnection, ".", true, $a, $b);
@@ -50,16 +50,20 @@
    sqimap_unsubscribe($imapConnection, $orig);
    sqimap_subscribe($imapConnection, $newone);
 
-   fputs ($imapConnection, "a001 LSUB \"\" \"$orig*\"\r\n");
+       fputs ($imapConnection, "a001 LIST \"\" \"$newone*\"\r\n");
    $data = sqimap_read_data($imapConnection, "a001", true, $a, $b);
-   for ($i=0; $i < count($data); $i++) {
+   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 ($name != $newone) # don't try to resubscribe when renaming ab to abc
+      {
+        sqimap_unsubscribe($imapConnection, $name);
+        $name = substr($name, strlen($orig));
+        $name = $newone . $name;
+        sqimap_subscribe($imapConnection, $name);
+      }
+   }
 
    /** Log out this session **/
    sqimap_logout($imapConnection);