Deleting subfolders of trash works, but it's not very pretty

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@37 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/empty_trash.php b/src/empty_trash.php
index caed2019673792fcd03caa5ce4f1b7746fc2d39e..bbd917e807f580fbe278785bcb0eac8a5291f7a3 100644 (file)
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -32,24 +32,20 @@
       }
    }
 
-   $trash = getFolderNameMinusINBOX($trash_folder);
-   $trash = "user.$username.$trash";
    // mark them as deleted
    setMessageFlag($imapConnection, 1, $numMessages, "Deleted");
    expungeBox($imapConnection, $mailbox);
 
    // remove subfolders
    for ($i = 0; $i < count($folders); $i++) {
-      if ($folders[$i] != "NONE") {
-         $trash = getFolderNameMinusINBOX($folders[$i]);
-         $trash = "user.$username.$trash";
-         echo "$trash<BR>";
-         removeFolder($imapConnection, $trash);
+      if (($folders[$i] == "NOPE") || ($folders[$i] == "$trash_folder")) {
+      } else {
+         $thisfolder = getFolderNameMinusINBOX($folders[$i]);
+         $thisfolder = "user.$username.$thisfolder";
+         removeFolder($imapConnection, $thisfolder);
       }
    }
 
-   createFolder($imapConnection, "user.$username.$trash_folder");
-
    // Log out this session
    fputs($imapConnection, "1 logout");