fixed minor bug with deleting folders that had quotes in them

[squirrelmail.git] / src / move_messages.php

diff --git a/src/move_messages.php b/src/move_messages.php
index dbe4b68bbef3b63aed0f6611342b7107f8c59866..56e96e7404a558be3022fa6a08a21b99f843c337 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -37,7 +37,7 @@
       }
    }
 
-   $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0);
+   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
    sqimap_mailbox_select($imapConnection, $mailbox);
 
    // If the delete button was pressed, the moveButton variable will not be set.
@@ -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 {