From c5f5cd59ce813278e7c70a1ffa9ffb11115b74bd Mon Sep 17 00:00:00 2001
From: nehresma <nehresma@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 5 Mar 2000 04:08:57 +0000
Subject: [PATCH] think finally fixed the deleting of folders stuff.. :)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@268 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/empty_trash.php    | 2 +-
 src/folders.php        | 8 ++++----
 src/folders_delete.php | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/empty_trash.php b/src/empty_trash.php
index 2460d8f8..ba62c085 100644
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -37,7 +37,7 @@
    $j = 0;
    for ($i = 0;$i < count($boxes);$i++) {
       if (substr($boxes[$i]["unformatted"], 0, strlen($mailbox . $dm)) == ($mailbox . $dm)) {
-         addChildNodeToTree($boxes[$i]["unformatted"], $foldersTree);
+         addChildNodeToTree($boxes[$i]["unformatted"], $boxes[$i]["unformatted-dm"], $foldersTree);
       }
    }
    
diff --git a/src/folders.php b/src/folders.php
index 7b9c99bb..87f32799 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -74,8 +74,8 @@
       echo "<OPTION>[ None ]\n";
 
    for ($i = 0; $i < count($boxes); $i++) {
-      for ($j = 0; $j < count($boxes[$i]["flags"]); $j++) {
-         if ($boxes[$i]["flags"][$j] != "noinferiors") {
+//      for ($j = 0; $j < count($boxes[$i]["flags"]); $j++) {
+//         if ($boxes[$i]["flags"][$j] != "noinferiors") {
             if (($boxes[$i]["unformatted"] == $special_folders[0]) && ($default_sub_of_inbox == true)) {
                $box = $boxes[$i]["unformatted"];
                $box2 = replace_spaces($boxes[$i]["formatted"]);
@@ -85,8 +85,8 @@
                $box2 = replace_spaces($boxes[$i]["formatted"]);
                echo "<OPTION VALUE=\"$box\">$box2\n";
             }
-         }   
-      }
+//         }   
+//      }
    }
    echo "</SELECT></TT><BR>\n";
    echo "<FONT FACE=\"Arial,Helvetica\">";
diff --git a/src/folders_delete.php b/src/folders_delete.php
index 7290dc8f..a1c67ca0 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -58,7 +58,6 @@
    $j = 0;
    for ($i = 0;$i < count($boxes);$i++) {
       if (substr($boxes[$i]["unformatted"], 0, strlen($mailbox_no_dm . $dm)) == ($mailbox_no_dm . $dm)) {
-//         echo "<B>".$boxes[$i]["unformatted-dm"] . "</b><BR>";
          addChildNodeToTree($boxes[$i]["unformatted"], $boxes[$i]["unformatted-dm"], $foldersTree);
       }
    }
-- 
2.25.1