|
@@ -26,7 +26,7 @@
|
|
|
echo " <td width=1% align=center><input type=checkbox name=\"msg[$t]\" value=".$msg["ID"]."></TD>\n";
|
|
|
echo " <td>$bold$flag$senderName$flag_end$bold_end</td>\n";
|
|
|
echo " <td nowrap width=1%><center>$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end</center></td>\n";
|
|
|
- echo " <td>$bold<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&sort=$sort&startMessage=$startMessage&show_more=0\">$flag$subject$flag_end</a>$ans$bold_end</td>\n";
|
|
|
+ echo " <td>$bold<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&startMessage=$startMessage&show_more=0\">$flag$subject$flag_end</a>$ans$bold_end</td>\n";
|
|
|
|
|
|
echo "</tr>\n";
|
|
|
}
|
|
@@ -159,23 +159,23 @@
|
|
|
|
|
|
echo "<TR BGCOLOR=\"$color[4]\"><TD>";
|
|
|
if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
|
|
|
- echo "<A HREF=\"right_main.php?use_mailbox_cache=1&sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A>\n";
|
|
|
- echo "<A HREF=\"right_main.php?use_mailbox_cache=1sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\n";
|
|
|
+ echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A>\n";
|
|
|
+ echo "<A HREF=\"right_main.php?use_mailbox_cache=1&&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\n";
|
|
|
}
|
|
|
else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
|
|
|
- echo "<A HREF=\"right_main.php?use_mailbox_cache=1&sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A>\n";
|
|
|
+ echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A>\n";
|
|
|
echo "<FONT COLOR=\"$color[9]\">Next</FONT>\n";
|
|
|
}
|
|
|
else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
|
|
|
echo "<FONT COLOR=\"$color[9]\">Previous</FONT>\n";
|
|
|
- echo "<A HREF=\"right_main.php?use_mailbox_cache=1&sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\n";
|
|
|
+ echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\n";
|
|
|
}
|
|
|
echo "</TD></TR>\n";
|
|
|
|
|
|
/** The delete and move options */
|
|
|
echo "<TR><TD BGCOLOR=\"$color[0]\">";
|
|
|
|
|
|
- echo "\n\n\n<FORM name=messageList method=post action=\"move_messages.php?msg=$msg&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage\">";
|
|
|
+ echo "\n\n\n<FORM name=messageList method=post action=\"move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage\">";
|
|
|
echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0>\n";
|
|
|
echo " <TR>\n";
|
|
|
echo " <TD WIDTH=60% ALIGN=LEFT>\n";
|
|
@@ -207,27 +207,27 @@
|
|
|
/** FROM HEADER **/
|
|
|
echo " <TD WIDTH=25%><B>". _("From") ."</B>";
|
|
|
if ($sort == 2)
|
|
|
- echo " <A HREF=\"right_main.php?sort=3&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
|
|
|
+ echo " <A HREF=\"right_main.php?newsort=3&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
|
|
|
else if ($sort == 3)
|
|
|
- echo " <A HREF=\"right_main.php?sort=2&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
|
|
|
+ echo " <A HREF=\"right_main.php?newsort=2&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
|
|
|
else
|
|
|
- echo " <A HREF=\"right_main.php?sort=3&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
|
|
|
+ echo " <A HREF=\"right_main.php?newsort=3&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
|
|
|
/** DATE HEADER **/
|
|
|
echo " <TD WIDTH=15%><B>". _("Date") ."</B>";
|
|
|
if ($sort == 0)
|
|
|
- echo " <A HREF=\"right_main.php?sort=1&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
|
|
|
+ echo " <A HREF=\"right_main.php?newsort=1&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
|
|
|
else if ($sort == 1)
|
|
|
- echo " <A HREF=\"right_main.php?sort=0&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
|
|
|
+ echo " <A HREF=\"right_main.php?newsort=0&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
|
|
|
else
|
|
|
- echo " <A HREF=\"right_main.php?sort=0&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
|
|
|
+ echo " <A HREF=\"right_main.php?newsort=0&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
|
|
|
/** SUBJECT HEADER **/
|
|
|
echo " <TD WIDTH=%><B>". _("Subject") ."</B>\n";
|
|
|
if ($sort == 4)
|
|
|
- echo " <A HREF=\"right_main.php?sort=5&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
|
|
|
+ echo " <A HREF=\"right_main.php?newsort=5&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
|
|
|
else if ($sort == 5)
|
|
|
- echo " <A HREF=\"right_main.php?sort=4&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
|
|
|
+ echo " <A HREF=\"right_main.php?newsort=4&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
|
|
|
else
|
|
|
- echo " <A HREF=\"right_main.php?sort=5&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
|
|
|
+ echo " <A HREF=\"right_main.php?newsort=5&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
|
|
|
echo "</TR>";
|
|
|
|
|
|
|
|
@@ -268,16 +268,16 @@
|
|
|
|
|
|
echo "<TR BGCOLOR=\"$color[4]\"><TD>";
|
|
|
if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
|
|
|
- echo "<A HREF=\"right_main.php?use_mailbox_cache=1&sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Previous") . "</A>\n";
|
|
|
- echo "<A HREF=\"right_main.php?use_mailbox_cache=1&sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Next") . "</A>\n";
|
|
|
+ echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Previous") . "</A>\n";
|
|
|
+ echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Next") . "</A>\n";
|
|
|
}
|
|
|
else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
|
|
|
- echo "<A HREF=\"right_main.php?use_mailbox_cache=1&sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Previous") . "</A>\n";
|
|
|
+ echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Previous") . "</A>\n";
|
|
|
echo "<FONT COLOR=\"$color[9]\">" . _("Next") . "</FONT>\n";
|
|
|
}
|
|
|
else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
|
|
|
echo "<FONT COLOR=\"$color[9]\">Previous</FONT>\n";
|
|
|
- echo "<A HREF=\"right_main.php?use_mailbox_cache=1&sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Next") . "</A>\n";
|
|
|
+ echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Next") . "</A>\n";
|
|
|
}
|
|
|
echo "</TD></TR></TABLE>"; /** End of message-list table */
|
|
|
}
|