Fix some more HTML.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2831 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/display_messages.php b/functions/display_messages.php
index f0291ab26829d0aec3cb9267127ed5dd2149ece5..3e91a4d176c6e0294cb111e72d1bb57e82a54964 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -48,11 +48,11 @@ function error_username_password_incorrect() {
                 '<TR BGCOLOR="' . $color[0] . '">'.
                     '<TH>' . _("ERROR") . '</TH>'.
                 '</TR>' .
                 '<TR BGCOLOR="' . $color[0] . '">'.
                     '<TH>' . _("ERROR") . '</TH>'.
                 '</TR>' .

-                '<TR><TD>'.
-                    '<CENTER><BR>' . _("Unknown user or password incorrect.") .
+                '<TR><TD ALIGN="center">'.
+                    '<BR>' . _("Unknown user or password incorrect.") .

                     '<BR><A HREF="' . sqm_baseuri() . '"login.php" TARGET='.
                     $frame_top.'>' . _("Click here to try again") .
                     '<BR><A HREF="' . sqm_baseuri() . '"login.php" TARGET='.
                     $frame_top.'>' . _("Click here to try again") .

-                    '</A>.</CENTER>'.
+                    '</A>.'.

                 '</TD></TR>'.
                 '</TABLE>'.
             '</BODY></HTML>';
                 '</TD></TR>'.
                 '</TABLE>'.
             '</BODY></HTML>';


@@ -62,12 +62,12 @@ function error_message($message, $mailbox, $sort, $startMessage, $color) {
     $urlMailbox = urlencode($mailbox);
 
     echo '<BR>'.
     $urlMailbox = urlencode($mailbox);
 
     echo '<BR>'.

-         "<TABLE COLS=1 WIDTH=\"70%\" BORDER=\"0\" BGCOLOR=\"$color[4]\" ALIGN=CENTER>".
+         "<TABLE WIDTH=\"70%\" BORDER=\"0\" BGCOLOR=\"$color[4]\" ALIGN=CENTER>".

             '<TR>'.
             '<TR>'.

-               "<TD BGCOLOR=\"$color[0]\">".
-                  "<FONT COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") . '</CENTER></B></FONT>'.
-            '</TD></TR><TR><TD>'.
-               "<CENTER><BR>$message<BR>\n".
+               "<TD BGCOLOR=\"$color[0]\" ALIGN=\"center\">".
+                  "<FONT COLOR=\"$color[2]\"><B>" . _("ERROR") . '</B></FONT>'.
+            '</TD></TR><TR><TD ALIGN="center">'.
+               "<BR>$message<BR>\n".

                '<BR>'.
                   "<A HREF=\"" . sqm_baseuri() 
                   . "src/right_main.php?sort=$sort&amp;startMessage=$startMessage"
                '<BR>'.
                   "<A HREF=\"" . sqm_baseuri() 
                   . "src/right_main.php?sort=$sort&amp;startMessage=$startMessage"


@@ -79,13 +79,12 @@ function error_message($message, $mailbox, $sort, $startMessage, $color) {
 }
 
 function plain_error_message($message, $color) {
 }
 
 function plain_error_message($message, $color) {

-    echo "<br><TABLE COLS=1 WIDTH=\"70%\" BORDER=\"0\" BGCOLOR=\"$color[4]\" ALIGN=CENTER>".
+    echo "<br><TABLE WIDTH=\"70%\" BORDER=\"0\" BGCOLOR=\"$color[4]\" ALIGN=CENTER>".

             '<TR>'.
             '<TR>'.

-               "<TD BGCOLOR=\"$color[0]\">".
-                  "<FONT COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") . '</CENTER></B></FONT>'.
-            '</TD></TR><TR><TD>'.
-               "<CENTER><BR>$message".
-               '</CENTER>'.
+               "<TD BGCOLOR=\"$color[0]\" ALIGN=\"center\">".
+                  "<FONT COLOR=\"$color[2]\"><B>" . _("ERROR") . '</B></FONT>'.
+            '</TD></TR><TR><TD ALIGN="center">'.
+               "<BR>$message".

             '</TD></TR>'.
          '</TABLE>';
 }
             '</TD></TR>'.
          '</TABLE>';
 }


@@ -146,18 +145,18 @@ function logout_error( $errString, $errTitle = '' ) {
            '<SMALL>' . sprintf (_("SquirrelMail version %s"), $version) . "<BR>\n".
            '  ' . _("By the SquirrelMail Development Team") . "<BR></SMALL>\n" ) .
          "<table cellspacing=1 cellpadding=0 bgcolor=\"$color[1]\" width=\"70%\"><tr><td>".
            '<SMALL>' . sprintf (_("SquirrelMail version %s"), $version) . "<BR>\n".
            '  ' . _("By the SquirrelMail Development Team") . "<BR></SMALL>\n" ) .
          "<table cellspacing=1 cellpadding=0 bgcolor=\"$color[1]\" width=\"70%\"><tr><td>".

-         "<TABLE COLS=1 WIDTH=\"100%\" BORDER=\"0\" BGCOLOR=\"$color[4]\" ALIGN=CENTER>".
-            "<TR><TD BGCOLOR=\"$color[0]\">".
-                  "<FONT COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") .
-                  '</CENTER></B></FONT></TD></TR>'.
-            '<TR><TD><CENTER>' . $errString . '</CENTER></TD></TR>'.
-            "<TR><TD BGCOLOR=\"$color[0]\">".
-                  "<FONT COLOR=\"$color[2]\"><B><CENTER>".
+         "<TABLE WIDTH=\"100%\" BORDER=\"0\" BGCOLOR=\"$color[4]\" ALIGN=CENTER>".
+            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=\"center\">".
+                  "<FONT COLOR=\"$color[2]\"><B>" . _("ERROR") .
+                  '</B></FONT></TD></TR>'.
+            '<TR><TD ALIGN="center">' . $errString . '</TD></TR>'.
+            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=\"center\">".
+                  "<FONT COLOR=\"$color[2]\"><B>".

                   '<a href="' . $base_uri . 'src/login.php" target="' .
                   $frame_top . '">' .
                   '<a href="' . $base_uri . 'src/login.php" target="' .
                   $frame_top . '">' .

-                  _("Go to the login page") . "</a></CENTER></B></FONT>".
+                  _("Go to the login page") . "</a></B></FONT>".

             '</TD></TR>'.
             '</TD></TR>'.

-         '</TABLE></td></tr></table></body></html>';
+         '</TABLE></td></tr></table></center></body></html>';

 }
 
 ?>
 }
 
 ?>

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 065479971fdf555c4b9756892bfdd03e1911badf..1ef91de866ef7dd42f3b0927241e99a813c2bf35 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -643,7 +643,7 @@ function mail_message_listing_beginning ($imapConnection, $moveURL,
    * This is the beginning of the message list table.
    * It wraps around all messages
    */
    * This is the beginning of the message list table.
    * It wraps around all messages
    */

-  echo "<FORM name=messageList method=post action=\"$moveURL\">\n"
+  echo "<FORM name=\"messageList\" method=post action=\"$moveURL\">\n"

     . "<TABLE WIDTH=\"100%\" BORDER=\"0\" CELLPADDING=\"1\" "
     . "CELLSPACING=\"0\">\n<TR BGCOLOR=\"$color[0]\"><TD>"
     . "    <TABLE BGCOLOR=\"$color[4]\" width=\"100%\" CELLPADDING=\"2\" "
     . "<TABLE WIDTH=\"100%\" BORDER=\"0\" CELLPADDING=\"1\" "
     . "CELLSPACING=\"0\">\n<TR BGCOLOR=\"$color[0]\"><TD>"
     . "    <TABLE BGCOLOR=\"$color[4]\" width=\"100%\" CELLPADDING=\"2\" "


@@ -654,7 +654,7 @@ function mail_message_listing_beginning ($imapConnection, $moveURL,
     . "  </TR></TABLE>\n"
     . '</TD></TR>'
     . "<TR><TD BGCOLOR=\"$color[0]\">\n"
     . "  </TR></TABLE>\n"
     . '</TD></TR>'
     . "<TR><TD BGCOLOR=\"$color[0]\">\n"

-    . "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0"
+    . "<TABLE BGCOLOR=\"$color[0]\" BORDER=0 cellpadding=0 "

     . "cellspacing=0 width=\"100%\">\n"
     . "   <TR>\n"
     . "      <TD ALIGN=LEFT VALIGN=MIDDLE NOWRAP>\n"
     . "cellspacing=0 width=\"100%\">\n"
     . "   <TR>\n"
     . "      <TD ALIGN=LEFT VALIGN=MIDDLE NOWRAP>\n"


@@ -804,7 +804,7 @@ function ShowSortButton($sort, $mailbox, $Up, $Down) {
   echo ' <a href="right_main.php?newsort=' . $which
     . '&amp;startMessage=1&amp;mailbox=' . urlencode($mailbox)
     . '"><IMG SRC="../images/' . $img
   echo ' <a href="right_main.php?newsort=' . $which
     . '&amp;startMessage=1&amp;mailbox=' . urlencode($mailbox)
     . '"><IMG SRC="../images/' . $img

-    . '" BORDER=0 WIDTH=12 HEIGHT=10></a>';
+    . '" BORDER=0 WIDTH=12 HEIGHT=10 ALT="sort"></a>';

 }
 
 function get_selectall_link($start_msg, $sort) {
 }
 
 function get_selectall_link($start_msg, $sort) {

diff --git a/src/help.php b/src/help.php
index b60902b5ff88d97f18decdf1f8613903825412ba..7b65faee71a914b183b9ccd38898762053ccb9c2 100644 (file)
--- a/src/help.php
+++ b/src/help.php
@@ -222,5 +222,4 @@ if ($help_exists == true) {
 do_hook('help_bottom');
 ?>
 <tr><td bgcolor="<?php echo $color[0] ?>">&nbsp;</td></tr></table>
 do_hook('help_bottom');
 ?>
 <tr><td bgcolor="<?php echo $color[0] ?>">&nbsp;</td></tr></table>

-<td></tr></table>

 </body></html>
 </body></html>