fixes attachment links when viewing messages from search results

[squirrelmail.git] / src / move_messages.php

diff --git a/src/move_messages.php b/src/move_messages.php
index 65df617829f9f6976c91ffd56d38dd74904245d0..11d498649b755eef040e21fc54ed8ddc11923a52 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -118,12 +118,11 @@ $key  = $_COOKIE['key'];
 $onetimepad = $_SESSION['onetimepad'];
 $base_uri = $_SESSION['base_uri'];
 $delimiter = $_SESSION['delimiter'];
-
-if (isset($_POST['mailbox'])) {
-    $mailbox = $_POST['mailbox'];
+if (isset($_GET['mailbox'])) {
+    $mailbox = $_GET['mailbox'];
 }
-if (isset($_POST['startMessage'])) {
-    $startMessage = $_POST['startMessage'];
+if (isset($_GET['startMessage'])) {
+    $startMessage = $_GET['startMessage'];
 }
 if (isset($_POST['moveButton'])) {
     $moveButton = $_POST['moveButton'];
@@ -131,6 +130,15 @@ if (isset($_POST['moveButton'])) {
 if (isset($_POST['msg'])) {
     $msg = $_POST['msg'];
 }
+elseif (isset($_GET['msg'])) {
+    $msg = $_GET['msg'];
+}
+
+if (isset($_SESSION['msgs'])) {
+    $msgs = $_SESSION['msgs'];
+}
+
+
 if (isset($_POST['expungeButton'])) {
     $expungeButton = $_POST['expungeButton'];
 }
@@ -156,6 +164,13 @@ if (isset($_POST['attache'])) {
     $attache = $_POST['attache'];
 }
 
+if (isset($_POST['location'])) {
+    $location = $_POST['location'];
+}
+
+if (isset($_SESSION['composesession'])) {
+    $composesession = $_SESSION['composesession'];
+}
 /* end of get globals */
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
@@ -185,6 +200,7 @@ if(isset($expungeButton)) {
        }
     }
     header("Location: $location");
+    exit;
 } elseif(isset($undeleteButton)) {
     // undelete messages if user isn't using move_to_trash or auto_expunge
     if (is_array($msg) == 1) {
@@ -201,6 +217,7 @@ if(isset($expungeButton)) {
             $i++;
         }
        header ("Location: $location"); 
+       exit;
     } else {
         displayPageHeader($color, $mailbox);
         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
@@ -237,10 +254,12 @@ if(isset($expungeButton)) {
            $composesession = attachSelectedMessages($msg, $imapConnection);
            if ($compose_new_win) {
                header ("Location: $location&composenew=1&session=$composesession");
+               exit;
            } else {
                $location = str_replace('search.php','compose.php',$location);
                $location = str_replace('right_main.php','compose.php',$location);
                header ("Location: $location&session=$composesession");
+               exit;
            }
        } else {                
            if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) {
@@ -251,6 +270,7 @@ if(isset($expungeButton)) {
               }
            }
             header ("Location: $location");
+           exit;
         } 
     } else {
         displayPageHeader($color, $mailbox);
@@ -286,7 +306,8 @@ if(isset($expungeButton)) {
                $location = set_url_var($location,'startMessage',1);
            }
        }
-       header ("Location: $location"); 
+       header ("Location: $location");
+       exit;
     } else {
         displayPageHeader($color, $mailbox);
         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
@@ -294,6 +315,5 @@ if(isset($expungeButton)) {
 }
 // Log out this session
 sqimap_logout($imapConnection);
-
 ?>
 </BODY></HTML>