Fix for [ Bug #125985 ] Random Login Failure. Sometimes funky characters in

[squirrelmail.git] / src / delete_message.php

diff --git a/src/delete_message.php b/src/delete_message.php
index fd274d3e3e9e5490c06ac8d10358237d81b80a7d..4be7772f584af44e4b6b72665460367dcbe06050 100644 (file)
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -29,8 +29,13 @@
 
    sqimap_messages_delete($imapConnection, $message, $message, $mailbox);
    if ($auto_expunge)
-      sqimap_mailbox_expunge($imapConnection, $mailbox);
+      sqimap_mailbox_expunge($imapConnection, $mailbox, true);
 
    $location = get_location();
-   header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=".urlencode($mailbox));
+   if ($where && $what)
+      header ("Location: $location/search.php?where=".urlencode($where)."&what=".urlencode($what)."&mailbox=".urlencode($mailbox));
+   else   
+      header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=".urlencode($mailbox));
+
+   sqimap_logout($imapConnection);
 ?>