redirect fixes

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3685 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/move_messages.php b/src/move_messages.php
index 9829f0c4e8ededc4648c8b51ce672e132f88a94c..0d4b5e7b20b52ed7070c0d61a11e064100db1408 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -120,14 +120,14 @@ function attachSelectedMessages($msg, $imapConnection) {
     return $composesession;
 }
 
+
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-sqimap_mailbox_select($imapConnection, $mailbox);
+$mbx_response=sqimap_mailbox_select($imapConnection, $mailbox);
 
 $location = set_url_var($location,'composenew');
 $location = set_url_var($location,'composesession');
 $location = set_url_var($location,'session');
 
-
 /* remember changes to mailbox setting */
 if (!isset($lastTargetMailbox)) {
     $lastTargetMailbox = 'INBOX';
@@ -139,11 +139,17 @@ if ($targetMailbox != $lastTargetMailbox) {
 
 // expunge-on-demand if user isn't using move_to_trash or auto_expunge
 if(isset($expungeButton)) {
-    sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+    $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+    if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) {
+        if ($startMessage > $show_num) {
+           $location = set_url_var($location,'startMessage',$startMessage-$show_num);
+       } else {
+           $location = set_url_var($location,'startMessage',1);
+       }
+    }
     header("Location: $location");
 } elseif(isset($undeleteButton)) {
     // undelete messages if user isn't using move_to_trash or auto_expunge
-
     if (is_array($msg) == 1) {
         // Removes \Deleted flag from selected messages
         $j = 0;
@@ -186,8 +192,10 @@ if(isset($expungeButton)) {
             $i++;
         }
         if ($auto_expunge) {
-            sqimap_mailbox_expunge($imapConnection, $mailbox, true);
-        }
+            $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+        } else {
+           $cnt = 0;
+       }
         if (isset($attache)) {
            $composesession = attachSelectedMessages($msg, $imapConnection);
            if ($compose_new_win) {
@@ -198,6 +206,14 @@ if(isset($expungeButton)) {
                header ("Location: $location&session=$composesession");
            }
        } else {                
+           if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) {
+              if ($startMessage > $show_num) {
+                  $location = set_url_var($location,'startMessage',$startMessage-$show_num);
+              } else {
+                  $location = set_url_var($location,'startMessage',1);
+              }
+           }
+           echo $location . ' ' .$show_num. ' '.$cnt;
             header ("Location: $location");
         } 
     } else {
@@ -211,7 +227,8 @@ if(isset($expungeButton)) {
         $i = 0;
         // If they have selected nothing msg is size one still, but will be an infinite
         //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
-        while ($j < count($msg)) {
+       $cnt = count($msg);
+        while ($j < $cnt) {
             if (isset($msg[$i])) {
                 /** check if they would like to move it to the trash folder or not */
                 sqimap_messages_copy($imapConnection, $msg[$i], $msg[$i], $targetMailbox);
@@ -221,7 +238,17 @@ if(isset($expungeButton)) {
             $i++;
         }
         if ($auto_expunge) {
-            sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+            $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+       } else {
+           $cnt = 0;
+       }
+       
+       if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) {
+           if ($startMessage > $show_num) {
+               $location = set_url_var($location,'startMessage',$startMessage-$show_num);
+           } else {
+               $location = set_url_var($location,'startMessage',1);
+           }
        }
        header ("Location: $location"); 
     } else {