Next/previous is working a bit better

[squirrelmail.git] / src / right_main.php3

diff --git a/src/right_main.php3 b/src/right_main.php3
index b647a6badf24753982f3fdebaabd4ea6eeb1b53e..ab5cd7dc3dd203debb5534d5f1cd7ea2fb38e07b 100644 (file)
--- a/src/right_main.php3
+++ b/src/right_main.php3
@@ -74,58 +74,19 @@
 
    // switch to the mailbox, and get the number of messages in it.
    selectMailbox($imapConnection, $mailbox, $numMessages);
+//   $numMessages = $numMessages - 1;  // I did this so it's 0 based like the message array
 
    // make a URL safe $mailbox for use in the links
    $urlMailbox = urlencode($mailbox);
-  
-   displayPageHeader($mailbox);
-   $i = 1;
-   while ($i <= $numMessages) {
-      getMessageHeaders($imapConnection, $i, $from, $subject, $date);
-
-      $messages[$i]["DATE"] = getTimeStamp(explode(" ", trim($date)));
-      $messages[$i]["ID"] = $i;
-      $messages[$i]["FROM"] = $from;
-      $messages[$i]["SUBJECT"] = $subject;
-      $i++;
-   }
-
-   if ($sort == 0)
-      $msgs = ary_sort($messages, "DATE", -1);
-   else
-      $msgs = ary_sort($messages, "DATE", 1);
-
-   if ($endMessage > 24) {
-      echo "<A HREF=\"right_main.php3?sort=1&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">Next</FONT></A>&nbsp&nbsp&nbsp";
-      $endMessage = 24;
-   }
-
-   /** Display "Next, Previous" on top */
-
-   /** This is the beginning of the message list table.  It wraps around all messages */
-   echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1>";
-   echo "<TR><TD BGCOLOR=DCDCDC>";
-   echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=FFFFFF>";
-   echo "<TR BGCOLOR=FFFFCC ALIGN=\"center\">";
-   echo "   <TD WIDTH=5%><FONT FACE=\"Arial,Helvetica\"><B>Num</B></FONT></TD>";
-   echo "   <TD WIDTH=25%><FONT FACE=\"Arial,Helvetica\"><B>From</B></FONT></TD>";
-   echo "   <TD WIDTH=15%><FONT FACE=\"Arial,Helvetica\"><B>Date</B></FONT>";
-   if ($sort == 0)
-      echo "   <A HREF=\"right_main.php3?sort=1&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
-   else
-      echo "   <A HREF=\"right_main.php3?sort=0&startMessage=0&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
-   echo "   <TD WIDTH=*><FONT FACE=\"Arial,Helvetica\"><B>Subject</B></FONT></TD>\n";
-   echo "</TR>";
 
-   // loop through and display the info for each message.
-   for ($i = $startMessage;$i <= $endMessage; $i++) {
-      printMessageInfo($imapConnection, $msgs[$i]["ID"], $msgs[$i]["FROM"], $msgs[$i]["SUBJECT"], $msgs[$i]["DATE"]);
-   }
+   // Display the header at the top of the page
+   displayPageHeader($mailbox);
 
-   echo "</TABLE>\n";
-   echo "</TD></TR></TABLE>"; /** End of message-list table */
+   // Get the list of messages for this mailbox
+   echo "$numMessages : $startMessage : $sort<BR><BR>";
+   showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort);
 
-   /** Display "Next, Previous" on bottom */
+   // close the connection
    fclose($imapConnection);
 ?>
 </FONT>