init location field correctly

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 90a644bcc0c54baef9ac97aaec1cad7f99e05e33..0350414450e97b6a6562badce8e196a9acbab1c3 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -433,7 +433,9 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
      } // switch
   } /* if exists > 0 */
 
-  $end_msg = getEndMessage(&$start_msg, $show_num, $num_msgs);
+  $res = getEndMessage($start_msg, $show_num, $num_msgs);
+  $start_msg = $res[0]; 
+  $end_msg = $res[1];
 
   $paginator_str = get_paginator_str($mailbox, $start_msg, $end_msg, 
                                     $num_msgs, $show_num, $sort);
@@ -565,7 +567,9 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg,
     $indent_array, $thread_sort_messages, $allow_server_sort, 
     $server_sort_order, $PHP_SELF;
 
-  $end_msg = getEndMessage(&$start_msg, $show_num, $num_msgs);
+  $res = getEndMessage($start_msg, $show_num, $num_msgs);
+  $start_msg = $res[0]; 
+  $end_msg = $res[1];
 
   $urlMailbox = urlencode($mailbox);
 
@@ -717,7 +721,12 @@ function mail_message_listing_beginning ($imapConnection,
   echo getButton('SUBMIT', 'markRead',_("Read"));
   echo getButton('SUBMIT', 'markUnread',_("Unread"));
   echo getButton('SUBMIT', 'delete',_("Delete")) ."&nbsp\n";
-  echo '<INPUT TYPE="HIDDEN" NAME="location" VALUE="'.$PHP_SELF.'">';
+  if (!strpos($PHP_SELF,'mailbox')) {
+     $location = $PHP_SELF.'?mailbox=INBOX&amp;startMessage=1';
+  } else {
+     $location = $PHP_SELF;
+  }
+  echo '<INPUT TYPE="HIDDEN" NAME="location" VALUE="'.$location.'">';
   echo "</TD>\n"
        . "   </TR>\n";
 
@@ -1237,7 +1246,7 @@ function getEndMessage($start_msg, $show_num, $num_msgs) {
       $start_msg = 1;
     }
   }
-  return $end_msg;
+  return (array($start_msg,$end_msg));
 }
 
 function handleAsSent($mailbox) {