Rollback previous commit... seems move complicated

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index b007c0ac789854ec034e7df9fbeb48364bd6a2f2..fa5c3b6ad24c07581ee8d72e71d893819b67fe37 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -677,9 +677,11 @@ function mail_message_listing_beginning ($imapConnection,
      $source_url = $PHP_SELF;
   }
 
-  $moveURL = 'move_messages.php';
-  $moveFields = '<input type="hidden" name="mailbox" value="'.$urlMailbox.'">'.
-                '<input type="hidden" name="startMessage" value="'.$start_msg.'">';
+  if (!isset($msg)) {
+     $msg = '';
+  }
+  $moveURL = "move_messages.php?msg=$msg&amp;mailbox=$urlMailbox"
+    . "&amp;startMessage=$start_msg";
 
   /*
    * This is the beginning of the message list table.
@@ -687,7 +689,6 @@ function mail_message_listing_beginning ($imapConnection,
    */
 
     echo "<FORM name=\"messageList\" method=post action=\"$moveURL\">\n"
-        . $moveFields
         . html_tag( 'table' ,'' , '', '', 'border="0" width="100%" cellpadding="1"  cellspacing="0"' ) .
             html_tag( 'tr',
                 html_tag( 'td' ,

diff --git a/src/move_messages.php b/src/move_messages.php
index 65df617829f9f6976c91ffd56d38dd74904245d0..d43c3b107d959d40f9ab5024319df6cfd3e113d5 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -119,11 +119,11 @@ $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 +131,9 @@ if (isset($_POST['moveButton'])) {
 if (isset($_POST['msg'])) {
     $msg = $_POST['msg'];
 }
+elseif (isset($_GET['msg'])) {
+    $msg = $_GET['msg'];
+}
 if (isset($_POST['expungeButton'])) {
     $expungeButton = $_POST['expungeButton'];
 }