From 9a7d463e76114d29c8345a43a599f9028486206e Mon Sep 17 00:00:00 2001
From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 29 Nov 1999 02:58:48 +0000
Subject: [PATCH] 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
---
 src/empty_trash.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/empty_trash.php b/src/empty_trash.php
index caed2019..bbd917e8 100644
--- 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");
 
-- 
2.25.1