Format fix

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 53ff3087a4b2aa1a8070d0f46272dec2b1bc64e0..a2dba11923b44b0b21dd0883b01bf3b053323b31 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -488,7 +488,8 @@
          } while ($i && $i < $endVar);
       }
 
-      echo "<TR BGCOLOR=\"$color[5]\"><TD colspan=5><table width=100%><tr ><td>$lMore$mMore$rMore</td><td align=right>$Message</td></tr></table></td></tr></table>";
+      echo '</table>;
+      echo "<table width=100%><tr ><td>$lMore$mMore$rMore</td><td align=right>$Message</td></tr></table>";
       /** End of message-list table */
 
       do_hook('mailbox_index_after');
@@ -515,20 +516,18 @@
 
       echo "<TR BGCOLOR=\"$color[4]\"><TD>";
 
+      echo  "<table bgcolor=\"$color[4]\" cellpadding=2".
+           ' width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td>' .
+           "$More</td><td align=right>";
+      ShowSelectAllLink($startMessage, $sort);
+      echo "</td></tr></table>\n</td></tr>";
+
       /** The delete and move options */
       echo "<TR><TD BGCOLOR=\"$color[0]\">";
 
       echo "\n<FORM name=messageList method=post action=\"$moveURL\">\n";
       echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0 width=100%>\n";
 
-
-      echo "<tr  bgcolor=\"$color[4]\"><td colspan=3>\n" .
-           "<table bgcolor=\"$color[4]\" cellpadding=2".
-           ' width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td>' .
-           "$More</td><td align=right>";
-      ShowSelectAllLink($startMessage, $sort);
-      echo "</td></tr></table>\n</td></tr>";
-
       echo "   <TR>\n" .
            "      <TD ALIGN=LEFT VALIGN=CENTER NOWRAP>\n" .
            '         <SMALL>&nbsp;' . _("Move selected to:") . "</SMALL>\n" .
@@ -641,22 +640,18 @@
    function ShowSelectAllLink($startMessage, $sort) {
        global $checkall, $PHP_SELF, $what, $where, $mailbox;
 
-       ?>&nbsp;
-<script language="JavaScript">
-<!--
-function CheckAll() {
-  for (var i = 0; i < document.messageList.elements.length; i++) {
-    if( document.messageList.elements[i].type == 'checkbox' ) {
-      document.messageList.elements[i].checked =
-        !(document.messageList.elements[i].checked);
-    }
-  }
-}
-window.document.write('<input type=button onClick="CheckAll();" value="<?php echo
- _("Toggle All") ?>">');
-//-->
-</script><noscript>
-<?PHP
+       echo '&nbsp;<script language="JavaScript">' .
+            "\n<!-- \n" .
+            "function CheckAll() {\n" .
+            "   for (var i = 0; i < document.messageList.elements.length; i++) {\n" .
+            "       if( document.messageList.elements[i].type == 'checkbox' ) {\n" .
+            "           document.messageList.elements[i].checked = !(document.messageList.elements[i].checked);\n".
+            "       }\n" .
+            "   }\n" .
+            "}\n" .
+            'window.document.write(\'<a href=# onClick="CheckAll();">' . _("Toggle All") . "</a>');\n" .
+            "//-->\n" .
+            "</script>\n<noscript>\n";
 
        echo "<a href=\"$PHP_SELF?mailbox=" . urlencode($mailbox) .
           "&startMessage=$startMessage&sort=$sort&checkall=";
@@ -705,4 +700,4 @@ window.document.write('<input type=button onClick="CheckAll();" value="<?php ech
       return substr($subject, 0, $trim_val) . '...';
    }
 
-?>
+?>
\ No newline at end of file