whoops.. forgot to add these files

[squirrelmail.git] / src / empty_trash.php
diff --git a/src/empty_trash.php b/src/empty_trash.php

index caed2019673792fcd03caa5ce4f1b7746fc2d39e..ea38697ef29e2de6bcfaa7a7acb3829eef94c51b 100644 (file)
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -32,29 +32,23 @@
        }
     }
  
-   $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");
-
+   selectMailbox($imapConnection, $trash_folder, $numMessages);
     echo "<HTML><BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000EE\" VLINK=\"#0000EE\" ALINK=\"#0000EE\">";
     displayPageHeader($mailbox);
-
-   messages_deleted_message($mailbox, $sort, $startMessage);
+   messages_deleted_message($trash_folder, $sort, $startMessage);
+   fputs($imapConnection, "1 logout");
  ?>