X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_delete.php;h=8bc2ff5aa91340893f7ac99460a3d6971de108e0;hp=f211a4bf57d8f1dd6449c580a8b66600b7f43204;hb=7c1b84d979f4bbbcc8ce5d7423421123c4155107;hpb=2aa12d5e029f04fa8c778ec1d3487418d0c3b62d;ds=sidebyside

diff --git a/src/folders_delete.php b/src/folders_delete.php
index f211a4bf..8bc2ff5a 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -3,35 +3,31 @@
    include("../functions/strings.php");
    include("../functions/page_header.php");
    include("../functions/imap.php");
+   include("../functions/mailbox.php");
 
    $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
 
    // switch to the mailbox, and get the number of messages in it.
    selectMailbox($imapConnection, $mailbox, $numMessages);
 
-   // Marks the selected messages ad 'Deleted'
-   $j = 0;
-   $i = 0;
-
-   while ($j < count($msg)) {
-      if ($msg[$i]) {
-         /** check if they would like to move it to the trash folder or not */
-         if ($move_to_trash == true) {
-            createFolder($imapConnection, "user.$username.$folder");
-            $success = copyMessages($imapConnection, $msg[$i], $msg[$i], $trash_folder);
-            if ($success == true)
-               setMessageFlag($imapConnection, $msg[$i], $msg[$i], "Deleted");
-         } else {
-            setMessageFlag($imapConnection, $msg[$i], "Deleted");
-         }
-         $j++;
-      }
-      $i++;
+   $folder = getFolderNameMinusINBOX($mailbox);
+   $trash = getFolderNameMinusINBOX($trash_folder);
+
+   /** check if they would like to move it to the trash folder or not */
+   if ($move_to_trash == true) {
+      createFolder($imapConnection, "user.$username.$trash.$folder");
+      echo "CREATING FOLDER:  user.$username.$trash.$folder<BR>";
+      if ($numMessages > 0)
+         $success = copyMessages($imapConnection, 1, $numMessages, $trash_folder);
+      else
+         $success = true;
+
+      if ($success == true)
+         removeFolder($imapConnection, "user.$username.$folder");
+   } else {
+      removeFolder($imapConnection, "user.$username.$folder");
    }
 
-   if ($auto_expunge == true)
-      expungeBox($imapConnection, $mailbox, $numMessages);
-
    // Log out this session
    fputs($imapConnection, "1 logout");