From d2f34a3d66a7cd4d106013dd2d4754bad2fae951 Mon Sep 17 00:00:00 2001
From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 3 Mar 2000 12:04:17 +0000
Subject: [PATCH] fixed problem with wrong messages getting deleted

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@259 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/imap_messages.php | 3 ---
 src/folders_delete.php      | 4 ++++
 src/move_messages.php       | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index f8011799..71492c53 100755
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -9,7 +9,6 @@
     **  Copies specified messages to specified folder
     ******************************************************************************/
    function sqimap_messages_copy ($imap_stream, $start, $end, $mailbox) {
-      echo "a001 COPY $start:$end \"$mailbox\"\n<br>";
       fputs ($imap_stream, "a001 COPY $start:$end \"$mailbox\"\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
    }
@@ -26,8 +25,6 @@
       } else {
          sqimap_messages_flag ($imap_stream, $start, $end, "Deleted");
       }
-      if ($auto_expunge == true)
-         sqimap_mailbox_expunge ($imap_stream, $mailbox);
    }
 
    /******************************************************************************
diff --git a/src/folders_delete.php b/src/folders_delete.php
index d4c493e7..3ba84c9c 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -58,6 +58,8 @@
 
             if ($success == true)
                sqimap_mailbox_delete($imapConnection, $boxes[$i]["unformatted"]);
+            if ($auto_expunge)
+               sqimap_mailbox_expunge($imapConnection, $mailbox);
          }
       }
    } else { /** if they do NOT wish to move messages to the trash (or cannot)**/
@@ -70,6 +72,8 @@
                sqimap_mailbox_delete($imapConnection, $boxes[$i]["unformatted"], $dm);
             }
          }
+         if ($auto_expunge)
+            sqimap_mailbox_expunge($imapConnection, $mailbox);
          fputs($imapConnection, "1 LIST \"$mailbox\" *\n");
          $data = sqimap_read_data($imapConnection , "1", false, $response, $message);
       }
diff --git a/src/move_messages.php b/src/move_messages.php
index dbe4b68b..fb973b34 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -52,12 +52,13 @@
          //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
          while ($j < count($msg)) {
             if ($msg[$i]) {
-               echo $msg[$i] . "<BR>";
                sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
                $j++;
             }
             $i++;
          }
+         if ($auto_expunge)
+            sqimap_mailbox_expunge($imapConnection, $mailbox);
          messages_deleted_message($mailbox, $sort, $startMessage, $color);
       } else {
          error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
@@ -73,7 +74,6 @@
          //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
          while ($j < count($msg)) {
             if ($msg[$i]) {
-               echo $msg[$i] . "<BR>";
                /** check if they would like to move it to the trash folder or not */
                sqimap_messages_copy($imapConnection, $msg[$i], $msg[$i], $targetMailbox);
                sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Deleted");
@@ -82,7 +82,7 @@
             $i++;
          }
          if ($auto_expunge == true)
-            sqimap_mailbox_expunge($imapConnection, $mailbox, $numMessages);
+            sqimap_mailbox_expunge($imapConnection, $mailbox);
 
          messages_moved_message($mailbox, $sort, $startMessage, $color);
       } else {
-- 
2.25.1