From 4a1788b3e077b76324ab68d6c555015f3606e098 Mon Sep 17 00:00:00 2001
From: kink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Tue, 22 Jul 2003 09:17:42 +0000
Subject: [PATCH] Fix bug that after sending reply user was returned to the
 first page of the message list, which should be te last-active page (use
 startMessage).

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5384 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/compose.php   | 16 +++++++++-------
 src/read_body.php |  1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/compose.php b/src/compose.php
index 88ab7077..d4a669d8 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -73,7 +73,7 @@ sqgetGlobalVar('draft_id',$draft_id);
 sqgetGlobalVar('ent_num',$ent_num);
 sqgetGlobalVar('saved_draft',$saved_draft);
 sqgetGlobalVar('delete_draft',$delete_draft);
-
+sqgetGlobalVar('startmessage',$startMessage);
 
 /** POST VARS */
 sqgetGlobalVar('sigappend',             $sigappend,             SQ_POST);
@@ -385,7 +385,7 @@ if ($send) {
         }
         else {
             Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort".
-                   "&startMessage=1");
+                   "&startMessage=$startMessage");
         }
     } else {
         if ($compose_new_win == '1') {
@@ -840,7 +840,7 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
 }
 
 function showInputForm ($session, $values=false) {
-    global $send_to, $send_to_cc, $body,
+    global $send_to, $send_to_cc, $body, $startMessage,
            $passed_body, $color, $use_signature, $signature, $prefix_sig,
            $editor_size, $attachments, $subject, $newmail,
            $use_javascript_addr_book, $send_to_bcc, $passed_id, $mailbox,
@@ -877,12 +877,14 @@ function showInputForm ($session, $values=false) {
              "// -->\n</SCRIPT>\n\n";
     }
 
-    echo "\n" . '<FORM name=compose action="compose.php" METHOD=POST ' .
-         'ENCTYPE="multipart/form-data"';
-    do_hook("compose_form");
+    echo "\n" . '<form name="compose" action="compose.php" method="post" ' .
+         'enctype="multipart/form-data"';
+    do_hook('compose_form');
 
     echo ">\n";
 
+    echo '<input type="hidden" name="startMessage" value="' . $startMessage . "\">\n";
+
     if ($action == 'draft') {
         echo '<input type="hidden" name="delete_draft" value="' . $passed_id . "\">\n";
     }
@@ -903,7 +905,7 @@ function showInputForm ($session, $values=false) {
     if ($mail_sent == 'yes') {
         echo '<BR><CENTER><B>'. _("Your Message has been sent").'</CENTER></B>';
     }
-    echo '<TABLE ALIGN=center CELLSPACING=0 BORDER=0>' . "\n";
+    echo '<table align="center" cellspacing="0" border="0">' . "\n";
     if ($compose_new_win == '1') {
         echo '<TABLE ALIGN=CENTER BGCOLOR="'.$color[0].'" WIDTH="100%" BORDER=0>'."\n" .
              '   <TR><TD></TD>'. html_tag( 'td', '', 'right' ) . '<INPUT TYPE="BUTTON" NAME="Close" onClick="return self.close()" VALUE='._("Close").'></TD></TR>'."\n";
diff --git a/src/read_body.php b/src/read_body.php
index 74d393d9..f5e79510 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -502,6 +502,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
     $comp_uri = 'src/compose.php' .
                             '?passed_id=' . $passed_id .
                             '&amp;mailbox=' . $urlMailbox .
+                            '&amp;startMessage=' . $startMessage .
                             (isset($passed_ent_id)?'&amp;passed_ent_id='.$passed_ent_id:'');
 
     if (($mailbox == $draft_folder) && ($save_as_draft)) {
-- 
2.25.1