Patch contained in "[ Bug #128309 ] m$ exchange bug workaround". Exchange was

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index baa59f69e5f34f366acdbb19b93e88f41ccdbd00..925679d8292751061031e6ef5f1ad2615c5748c1 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -73,7 +73,7 @@
                break;
             case 5: # flags
                $stuff = false;
-               echo "   <td bgcolor=$hlt_color width=1% nowrap><b><small>\n";
+               echo "   <td bgcolor=$hlt_color align=center width=1% nowrap><b><small>\n";
                if ($msg["FLAG_ANSWERED"] == true) {
                   echo "A\n";
                   $stuff = true;
@@ -113,7 +113,7 @@
       global $message_highlight_list;
       global $auto_expunge;
 
-      sqimap_mailbox_expunge($imapConnection, $mailbox, false);
+         if ($auto_expunge == true) sqimap_mailbox_expunge($imapConnection, $mailbox, false);
       sqimap_mailbox_select($imapConnection, $mailbox);
 
       if (!$use_cache) {
@@ -399,9 +399,9 @@
                echo "$More</td><td align=right>\n";
                if (!$startMessage) $startMessage=1;
       if ( $checkall == "1")
-         echo "\n<A HREF=\"right_main.php?mailbox=$mailbox&startMessage=$startMessage&sort=$sort\">" . _("Unselect All") . "</A>\n";
+         echo "\n<A HREF=\"right_main.php?mailbox=$mailbox&startMessage=$real_startMessage&sort=$sort\">" . _("Unselect All") . "</A>\n";
       else
-         echo "\n<A HREF=\"right_main.php?mailbox=$mailbox&startMessage=$startMessage&sort=$sort&checkall=1\">" . _("Select All") . "</A>\n";
+         echo "\n<A HREF=\"right_main.php?mailbox=$mailbox&startMessage=$real_startMessage&sort=$sort&checkall=1\">" . _("Select All") . "</A>\n";
 
                echo "</td></tr></table>";
                echo "</td></tr>";
@@ -419,7 +419,7 @@
     * $More is a second line that is left aligned
     */
    function mail_message_listing_beginning($imapConnection, $moveURL,
-       $mailbox = '', $sort = -1, $Message = '', $More = '', $startmessage = 1)
+       $mailbox = '', $sort = -1, $Message = '', $More = '', $startMessage = 1)
    {
       global $color, $index_order, $auto_expunge, $move_to_trash;
                global $checkall;
@@ -436,7 +436,6 @@
       echo "<TR BGCOLOR=\"$color[4]\"><TD>";
                echo "<table width=100% cellpadding=0 cellspacing=0 border=0><tr><td>";
                echo "$More</td><td align=right>\n";
-               if (!$startMessage) $startMessage=1;
       if ( $checkall == "1")
          echo "\n<A HREF=\"right_main.php?mailbox=$mailbox&startMessage=$startMessage&sort=$sort\">" . _("Unselect All") . "</A>\n";
       else
@@ -463,7 +462,7 @@
             $boxes[$i]["flags"][1] != "noselect" &&
             $boxes[$i]["flags"][2] != "noselect") {
             $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
+            $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
             echo "         <OPTION VALUE=\"$box\">$box2</option>\n";
     }
       }
@@ -508,6 +507,7 @@
                   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";
                elseif ($sort != -1)
                   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";
+                                       echo "</TD>";
                break;
                
             case 3: # date
@@ -520,6 +520,7 @@
                   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";
                elseif ($sort != -1)
                   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";
+                                       echo "</TD>";
                break;
                
             case 4: # subject
@@ -530,6 +531,7 @@
                   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";
                elseif ($sort != -1)
                   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 "</TD>";
                break;
                
             case 6: # size