From b140c154543102c21a207495f2d7845507a0cd2e Mon Sep 17 00:00:00 2001
From: pallo <pallo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sat, 9 Dec 2000 15:18:35 +0000
Subject: [PATCH] Folders below the trash folder are deleted instead of being
 moved to trash when the user delete them.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@879 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/folders_delete.php | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/folders_delete.php b/src/folders_delete.php
index 1e76b406..d13b2d73 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -44,16 +44,27 @@
 
    /** lets see if we CAN move folders to the trash.. otherwise, 
     ** just delete them **/
+
+   // Courier IMAP doesn't like subfolders of Trash
    if (strtolower($imap_server_type) == "courier") {
-      // Courier IMAP doesn't like subfolders of Trash
       $can_move_to_trash = false;
-   } else {
+   } 
+
+   // If it's already a subfolder of trash, we'll have to delete it
+   else if(eregi("^".$trash_folder.".+", $mailbox)) {
+
+      $can_move_to_trash = false;
+
+   }
+
+   // Otherwise, check if trash folder exits and support sub-folders
+   else {
       for ($i = 0; $i < count($boxes); $i++) {
          if ($boxes[$i]["unformatted"] == $trash_folder) {
             $can_move_to_trash = true;
             for ($j = 0; $j < count($boxes[$i]["flags"]); $j++) {
-               if (strtolower($boxes[$i]["flags"][$j]) == "noinferiors")                                                               
-               $can_move_to_trash = false;
+               if (strtolower($boxes[$i]["flags"][$j]) == "noinferiors")
+		  $can_move_to_trash = false;
             }
          }
       }
-- 
2.25.1