some more html cleanup provided by Dave Huang

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

diff --git a/ChangeLog b/ChangeLog
index 1905b643ef95579c0926c94440515dc126ed1dde..b1f34e23eaa9e146a4aa6e63c67788164f17b46b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,8 @@ Version 1.2.2 -- ??
   - Fixed an infinite loop in printer friendly when wrapping option 
     is not in the prefs. 
     Bug reported by Boris Manojlovic <steki@verat.net>  
-
+  - Html cleanup, with patch from Dave Huang (#496712)
+       
 Version 1.2.1 -- 25 December 2001
 ---------------------------------
 

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 3c8e72e6b054e12b7ef7dba14a3ae46a21877857..9c06da2eac54d4433c8ab762ccef407d888b255a 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -15,7 +15,7 @@
 function error_username_password_incorrect() {
 
     echo '<BR>'.
-                '<TABLE COLS=1 WIDTH=75% NOBORDER BGCOLOR="#FFFFFF" ALIGN=CENTER>'.
+                '<TABLE COLS=1 WIDTH="75%" NOBORDER BGCOLOR="#FFFFFF" ALIGN=CENTER>'.
                 '<TR BGCOLOR="#DCDCDC">'.
                     '<TH>' . _("ERROR") . '</TH>'.
                 '</TR>' .
@@ -31,15 +31,15 @@ function error_username_password_incorrect() {
 
 function general_info($motd, $org_logo, $version, $org_name, $color) {
     echo '<BR>';
-    echo "<TABLE COLS=1 WIDTH=80% CELLSPACING=0 CELLPADDING=2 NOBORDER ALIGN=CENTER><TR><TD BGCOLOR=\"$color[9]\">";
-    echo '<TABLE COLS=1 WIDTH=100% CELLSPACING=0 CELLPADDING=3 NOBORDER BGCOLOR="#FFFFFF" ALIGN=CENTER>';
+    echo "<TABLE COLS=1 WIDTH=\"80%\" CELLSPACING=0 CELLPADDING=2 NOBORDER ALIGN=CENTER><TR><TD BGCOLOR=\"$color[9]\">";
+    echo '<TABLE COLS=1 WIDTH="100%" CELLSPACING=0 CELLPADDING=3 NOBORDER BGCOLOR="#FFFFFF" ALIGN=CENTER>';
     echo '   <TR>';
     echo "      <TD BGCOLOR=\"$color[0]\">";
     echo '         <B><CENTER>';
     printf (_("Welcome to %s's WebMail system"), $org_name);
     echo '         </CENTER></B>';
     echo '   <TR><TD BGCOLOR="#FFFFFF">';
-    echo '      <TABLE COLS=2 WIDTH=90% CELLSPACING=0 CELLPADDING=3 NOBORDER align="center">';
+    echo '      <TABLE COLS=2 WIDTH="90%" CELLSPACING=0 CELLPADDING=3 NOBORDER align="center">';
     echo '         <TR>';
     echo '            <TD BGCOLOR="#FFFFFF"><CENTER>';
     if ( strlen($org_logo) > 3 ) {
@@ -65,7 +65,7 @@ function error_message($message, $mailbox, $sort, $startMessage, $color) {
     $urlMailbox = urlencode($mailbox);
     
     echo '<BR>';
-    echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
+    echo "<TABLE COLS=1 WIDTH=\"70%\" NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
     echo '   <TR>';
     echo "      <TD BGCOLOR=\"$color[0]\">";
     echo "         <FONT COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") . '</CENTER></B></FONT>';
@@ -81,7 +81,7 @@ function error_message($message, $mailbox, $sort, $startMessage, $color) {
 
 function plain_error_message($message, $color) {
     echo '<BR>';
-    echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
+    echo "<TABLE COLS=1 WIDTH=\"70%\" NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
     echo '   <TR>';
     echo "      <TD BGCOLOR=\"$color[0]\">";
     echo "         <FONT COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") . '</CENTER></B></FONT>';

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index d92acc80129c0d0c4a5381445e83b8e8ba800d75..e9e53fb648fab7ba9c51d7b97d09cb27100667c5 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -48,7 +48,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start
     echo "<TR>\n";
 
     if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) {
-        $flag = "<font color=$color[2]>";
+        $flag = "<font color=\"$color[2]\">";
         $flag_end = '</font>';
     } else {
         $flag = '';
@@ -105,16 +105,16 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start
     for ($i=1; $i <= count($index_order); $i++) {
         switch ($index_order[$i]) {
         case 1: /* checkbox */
-            echo "   <td bgcolor=$hlt_color align=center><input type=checkbox name=\"msg[$t]\" value=".$msg["ID"]."$checked></TD>\n";
+            echo "   <td bgcolor=\"$hlt_color\" align=center><input type=checkbox name=\"msg[$t]\" value=".$msg["ID"]."$checked></TD>\n";
             break;
         case 2: /* from */
-            echo "   <td bgcolor=$hlt_color>$italic$bold$flag$fontstr$senderName$fontstr_end$flag_end$bold_end$italic_end</td>\n";
+            echo "   <td bgcolor=\"$hlt_color\">$italic$bold$flag$fontstr$senderName$fontstr_end$flag_end$bold_end$italic_end</td>\n";
             break;
         case 3: /* date */
-            echo "   <td nowrap bgcolor=$hlt_color><center>$bold$flag$fontstr".$msg["DATE_STRING"]."$fontstr_end$flag_end$bold_end</center></td>\n";
+            echo "   <td nowrap bgcolor=\"$hlt_color\"><center>$bold$flag$fontstr".$msg["DATE_STRING"]."$fontstr_end$flag_end$bold_end</center></td>\n";
             break;
         case 4: /* subject */
-            echo "   <td bgcolor=$hlt_color>$bold";
+            echo "   <td bgcolor=\"$hlt_color\">$bold";
                 if (! isset($search_stuff)) { $search_stuff = ''; }
             echo "<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&startMessage=$start_msg&show_more=0$search_stuff\"";
             do_hook("subject_link");
@@ -130,7 +130,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start
             break;
         case 5: /* flags */
             $stuff = false;
-            echo "   <td bgcolor=$hlt_color align=center nowrap><b><small>\n";
+            echo "   <td bgcolor=\"$hlt_color\" align=center nowrap><b><small>\n";
             if (isset($msg['FLAG_ANSWERED']) &&
                 $msg['FLAG_ANSWERED'] == true) {
                 echo "A\n";
@@ -142,11 +142,11 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start
             }
             if ($default_use_priority) {
                 if (ereg('(1|2)',substr($msg['PRIORITY'],0,1))) {
-                    echo "<font color=$color[1]>!</font>\n";
+                    echo "<font color=\"$color[1]\">!</font>\n";
                     $stuff = true;
                 }
                 if (ereg('(5)',substr($msg['PRIORITY'],0,1))) {
-                    echo "<font color=$color[8]>?</font>\n";
+                    echo "<font color=\"$color[8]\">?</font>\n";
                     $stuff = true;
                 }
             }
@@ -161,7 +161,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start
             echo "</small></b></td>\n";
             break;
         case 6: /* size */
-            echo "   <td bgcolor=$hlt_color>$bold$fontstr" .
+            echo "   <td bgcolor=\"$hlt_color\">$bold$fontstr" .
                  show_readable_size($msg['SIZE']) .
                  "$fontstr_end$bold_end</td>\n";
             break;
@@ -445,11 +445,11 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, &$msgs, $ms
     }
 
     echo '</table>'.
-        "<table bgcolor=\"$color[9]\" width=100% border=0 cellpadding=1 cellspacing=1>" .
-            "<tr BGCOLOR=\"$color[4]\">" .
-                "<table width=100% BGCOLOR=\"$color[4]\" border=0 cellpadding=1 cellspacing=0><tr><td>$paginator_str</td>".
+        "<table bgcolor=\"$color[9]\" width=\"100%\" border=0 cellpadding=1 cellspacing=1>" .
+            "<tr BGCOLOR=\"$color[4]\"><td>" .
+                "<table width=\"100%\" BGCOLOR=\"$color[4]\" border=0 cellpadding=1 cellspacing=0><tr><td>$paginator_str</td>".
                 "<td align=right>$msg_cnt_str</td></tr></table>".
-            "</tr>".
+            "</td></tr>".
         "</table>";
     /** End of message-list table */
 
@@ -478,7 +478,8 @@ function mail_message_listing_beginning
     * This is the beginning of the message list table.
     * It wraps around all messages
     */
-    echo "<TABLE WIDTH=\"100%\" BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"0\">\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\" CELLSPACING=\"0\" BORDER=\"0\"><TR>\n"
        . "    <TD ALIGN=LEFT>$paginator</TD>\n"
@@ -486,10 +487,9 @@ function mail_message_listing_beginning
        . "  </TR></TABLE>\n"
        . '</TD></TR>'
        . "<TR><TD BGCOLOR=\"$color[0]\">\n"
-       . "<FORM name=messageList method=post action=\"$moveURL\">\n"
        . "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0 width=\"100%\">\n"
        . "   <TR>\n"
-       . "      <TD ALIGN=LEFT VALIGN=CENTER NOWRAP>\n"
+       . "      <TD ALIGN=LEFT VALIGN=MIDDLE NOWRAP>\n"
        . '         <SMALL>&nbsp;' . _("Move Selected To:") . "</SMALL>\n"
        . "      </TD>\n"
        . "      <TD ALIGN=RIGHT NOWRAP>\n"
@@ -497,7 +497,7 @@ function mail_message_listing_beginning
        . "      </TD>\n"
        . "   </TR>\n"
        . "   <TR>\n"
-       . "      <TD ALIGN=LEFT VALIGN=CENTER NOWRAP>\n"
+       . "      <TD ALIGN=LEFT VALIGN=MIDDLE NOWRAP>\n"
        . '         <SMALL>&nbsp;<TT><SELECT NAME="targetMailbox">';
 
     $boxes = sqimap_mailbox_list($imapConnection);
@@ -525,7 +525,7 @@ function mail_message_listing_beginning
     echo '</TD></TR>'.
 
         "<TR><TD BGCOLOR=\"$color[0]\">".
-        "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=";
+        "<TABLE WIDTH=\"100%\" BORDER=0 CELLPADDING=2 CELLSPACING=";
     if ($GLOBALS['alt_index_colors']) {
         echo "0";
     } else {
@@ -611,7 +611,7 @@ function get_selectall_link($start_msg, $sort) {
             "   }\n" .
             "}\n" .
             "//-->\n" .
-            '</script><a href=# onClick="CheckAll();">' . _("Toggle All") . "</a>\n";
+            '</script><a href=\"#\" onClick="CheckAll();">' . _("Toggle All") . "</a>\n";
     } else {
         $result .= "<a href=\"$PHP_SELF?mailbox=" . urlencode($mailbox)
                     . "&startMessage=$start_msg&sort=$sort&checkall=";

diff --git a/functions/mime.php b/functions/mime.php
index 9b65e9c9ab5431fd351cd8b499ec0541c0a0d1d9..24e11590200449eec14dbe2840d0437525c915a3 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -642,7 +642,7 @@ class msg_header {
       if ($ShownHTML == 0) {
             $ShownHTML = 1;
 
-            $body .= "<TABLE WIDTH=100% CELLSPACING=0 CELLPADDING=2 BORDER=0 BGCOLOR=\"$color[0]\"><TR>\n" .
+            $body .= "<TABLE WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2 BORDER=0 BGCOLOR=\"$color[0]\"><TR>\n" .
                      "<TH ALIGN=\"left\" BGCOLOR=\"$color[9]\"><B>\n" .
                      _("Attachments") . ':' .
                      "</B></TH></TR><TR><TD>\n" .

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 49fd3b63aafdfb47e3aaaa0923b30d66ae9df94c..51d2b538e77d27c168dfe862c3e325363fa9f9a9 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -111,7 +111,7 @@ $abook = addressbook_init();
 ?>
 
 <br>
-<table width=95% align=center cellpadding=2 cellspacing=2 border=0>
+<table width="95%" align=center cellpadding=2 cellspacing=2 border=0>
 <tr><td bgcolor="<?php echo $color[0] ?>">
    <center><b><?php echo _("Address Book Search") ?></b></center>
 </td></tr></table>

diff --git a/src/addressbook.php b/src/addressbook.php
index 550b430eded0605ccf19e649581caa0a2ad07698..43e3677751264b29386ae5244770ce412d9ae449 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -161,11 +161,11 @@ if($REQUEST_METHOD == 'POST') {
                         /* Display the "new address" form */
                         echo '<FORM ACTION="' . $PHP_SELF . '" METHOD="POST">' .
                              "\n" .
-                             '<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>' . "\n" .
+                             '<TABLE WIDTH="100%" COLS=1 ALIGN=CENTER>' . "\n" .
                              '<TR><TD BGCOLOR="' . $color[0] .
                              '" ALIGN=CENTER>' . "\n" . '<STRONG>' .
                              _("Update address") .
-                             "<STRONG>\n</TD></TR>\n</TABLE>\n";
+                             "</STRONG>\n</TD></TR>\n</TABLE>\n";
                         address_form("editaddr", _("Update address"), $olddata);
                         echo '<INPUT TYPE=hidden NAME=oldnick VALUE="' . 
                              htmlspecialchars($olddata["nickname"]) . "\">\n" .
@@ -184,20 +184,20 @@ if($REQUEST_METHOD == 'POST') {
                         /* Handle error messages */
                         if (!$r) {
                             /* Display error */
-                            echo '<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>' .
+                            echo '<TABLE WIDTH="100%" COLS=1 ALIGN=CENTER>' .
                                  "\n" . '<TR><TD ALIGN=CENTER>' . "\n" .
                                  '<br><STRONG><FONT COLOR="' . $color[2] .
                                  '">' . _("ERROR") . ": " . $abook->error .
-                                 '</FONT><STRONG>' . "\n</TD></TR>\n</TABLE>\n";
+                                 '</FONT></STRONG>' . "\n</TD></TR>\n</TABLE>\n";
 
                             /* Display the "new address" form again */
                             echo '<FORM ACTION="' . $PHP_SELF .
                                  '" METHOD="POST">' . "\n" .
-                                 '<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>' .
+                                 '<TABLE WIDTH="100%" COLS=1 ALIGN=CENTER>' .
                                  "\n" . '<TR><TD BGCOLOR="' . $color[0] .
                                  '" ALIGN=CENTER>' . "\n" . '<STRONG>' .
                                  _("Update address") .
-                                 "<STRONG>\n</TD></TR>\n</TABLE>\n";
+                                 "</STRONG>\n</TD></TR>\n</TABLE>\n";
                             address_form("editaddr", _("Update address"), $newdata);
                             echo '<INPUT TYPE=hidden NAME=oldnick VALUE="' .
                                  htmlspecialchars($oldnick) . "\">\n" .
@@ -233,10 +233,10 @@ if($REQUEST_METHOD == 'POST') {
 
 /* Display error messages */
 if (!empty($formerror)) {
-    echo '<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>' . "\n" .
+    echo '<TABLE WIDTH="100%" COLS=1 ALIGN=CENTER>' . "\n" .
          '<TR><TD ALIGN=CENTER>' . "\n" . '<br><STRONG>' .
          '<FONT COLOR="' . $color[2]. '">' . _("ERROR") . ': ' . $formerror .
-         '</FONT><STRONG>' . "\n</TD></TR>\n</TABLE>\n";
+         '</FONT></STRONG>' . "\n</TD></TR>\n</TABLE>\n";
 }
 
 
@@ -275,7 +275,7 @@ if ($showaddrlist) {
             echo '<TABLE WIDTH="95%" COLS=1 ALIGN=CENTER>' . "\n" .
                  '<TR><TD BGCOLOR="' . $color[0] . '" ALIGN=CENTER>' . "\n" .
                  '<STRONG>' . $row['source'] .
-                 "<STRONG>\n</TD></TR>\n</TABLE>\n" .
+                 "</STRONG>\n</TD></TR>\n</TABLE>\n" .
                  '<TABLE COLS="5" BORDER="0" CELLPADDING="1" CELLSPACING="0"' .
                  ' WIDTH="90%" ALIGN="center">' .
                  '<TR BGCOLOR="' . $color[9] .
@@ -321,18 +321,19 @@ if ($showaddrlist) {
              '<INPUT TYPE=submit NAME=editaddr VALUE="' . _("Edit selected") .
              "\">\n" .
              '<INPUT TYPE=submit NAME=deladdr VALUE="' . _("Delete selected") .
-             "\">\n" . '</TR></TABLE></FORM>';
+             "\">\n" . '</TR></TABLE>';
     }
+    echo '</FORM>'
 } /* end of addresslist */
 
 
 /* Display the "new address" form */
 echo '<a name="AddAddress"></a>' . "\n" .
      '<FORM ACTION="' . $PHP_SELF . '" NAME=f_add METHOD="POST">' . "\n" .
-     '<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>' . "\n" .
+     '<TABLE WIDTH="100%" COLS=1 ALIGN=CENTER>' . "\n" .
      '<TR><TD BGCOLOR="' . $color[0] . '" ALIGN=CENTER>' . "\n" . '<STRONG>',
      sprintf(_("Add to %s"), $abook->localbackendname) .
-     "<STRONG>\n</TD></TR>\n" .
+     "</STRONG>\n</TD></TR>\n" .
      "</TABLE>\n";
 address_form('addaddr', _("Add address"), $defdata);
 echo '</FORM>';

diff --git a/src/download.php b/src/download.php
index 2ee84adf250f8dd10bbf6daa77b4e6f830958365..6ba0939e9582b890ec5d59247809f3e041683353 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -44,7 +44,7 @@ require_once('../functions/date.php');
       
       displayPageHeader($color, 'None');
 
-      echo "<BR><TABLE WIDTH=100% BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";
+      echo "<BR><TABLE WIDTH=\"100%\" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";
       echo "<B><CENTER>";
       echo _("Viewing a text attachment") . " - ";
       if ($where && $what) {
@@ -61,7 +61,7 @@ require_once('../functions/date.php');
       echo "</CENTER></B>";
       echo "</TD></TR></TABLE>";
 
-      echo "<TABLE WIDTH=98% BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";
+      echo "<TABLE WIDTH=\"98%\" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";
       echo "<TR><TD BGCOLOR=\"$color[4]\"><TT>";
 
       if ($type1 == 'html') {

diff --git a/src/folders.php b/src/folders.php
index 577818b47c1ab9c1d5805e43ace7a2f6201c19ea..eb7d634d7daba771b659e4bc4aa0f0d0b252e223 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -275,10 +275,9 @@ if ($box && $box2) {
 } else {
     echo _("No folders were found to subscribe to!") . "</td></tr></table>";
 }
-?>
-
 
-  <?php do_hook("folders_bottom"); ?>
+do_hook("folders_bottom");
+?>
 
 
     </td></tr>

diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php
index 8d6b1a23c57249a00801c9613c609ba651da5f94..c5a85c99e71a941bcb3790c835e17b6db85efe98 100644 (file)
--- a/src/folders_rename_getname.php
+++ b/src/folders_rename_getname.php
@@ -48,7 +48,7 @@ require_once('../functions/imap.php');
    }
 
    displayPageHeader($color, 'None');
-   echo "<br><TABLE align=center border=0 WIDTH=95% COLS=1>";
+   echo "<br><TABLE align=center border=0 WIDTH=\"95%\" COLS=1>";
    echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><B>";
    echo _("Rename a folder");
    echo "</B></TD></TR>";

diff --git a/src/image.php b/src/image.php
index 2a323a2a6fb2f4b3c6f8167916b85ac85785160e..5da6858787c6f2af5eab46b558bfea9fdbaaf46f 100644 (file)
--- a/src/image.php
+++ b/src/image.php
@@ -35,7 +35,7 @@ require_once('../src/load_prefs.php');
    displayPageHeader($color, 'None');
 
    echo '<BR>' . 
-        '<TABLE WIDTH=100% BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>' .
+        '<TABLE WIDTH=\"100%\" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>' .
         "\n" .
         '<TR><TD BGCOLOR="' . $color[0] . '">' .
         '<B><CENTER>' .

diff --git a/src/login.php b/src/login.php
index 033e9efc3acca446e37a18525fc60c753829a246..27e9bc18f43dc968b42668fa10249f6e56a8f78b 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -113,7 +113,7 @@ if (isset($emailaddress)) {
                  "</script>\n", FALSE );
 
     /* Set the title of this page. */
-    echo "<BODY TEXT=#000000 BGCOLOR=#FFFFFF LINK=#0000CC VLINK=#0000CC ALINK=#0000CC onLoad='squirrelmail_loginpage_onload();'>\n".
+    echo "<BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000CC\" VLINK=\"#0000CC\" ALINK=\"#0000CC\" onLoad='squirrelmail_loginpage_onload();'>\n".
          "<FORM ACTION=\"redirect.php\" METHOD=\"POST\" NAME=f>\n";
 
     $username_form_name = 'login_username';
@@ -131,13 +131,13 @@ if (isset($emailaddress)) {
 
          "<CENTER>\n".
          "<TABLE COLS=1 WIDTH=350>\n".
-         "   <TR><TD BGCOLOR=#DCDCDC>\n".
-         '      <B><CENTER>' . sprintf (_("%s Login"), $org_name) . "</CENTER></B>\n".
+         "   <TR><TD ALIGN=CENTER BGCOLOR=\"#DCDCDC\">\n".
+         '      <B>' . sprintf (_("%s Login"), $org_name) . "</B>\n".
          "   </TD></TR>".
          "   <TR><TD BGCOLOR=\"#FFFFFF\"><TABLE COLS=2 WIDTH=\"100%\">\n".
          "      <TR>\n".
-         '         <TD WIDTH=30% ALIGN=right>' . _("Name:") . "</TD>\n".
-         "         <TD WIDTH=* ALIGN=left>\n".
+         '         <TD WIDTH="30%" ALIGN=right>' . _("Name:") . "</TD>\n".
+         "         <TD WIDTH=\"*\" ALIGN=left>\n".
          "            <INPUT TYPE=TEXT NAME=\"$username_form_name\" VALUE=\"$loginname_value\">\n".
          "         </TD>\n".
          "      </TR>\n".

diff --git a/src/options.php b/src/options.php
index 4f4c7688e9e44a55d4c26cec8fd1d1d1be199f85..b89cf21f036f68ea57328904cf4d582875c36ac3 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -305,7 +305,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
     $first_optpage = false;
     echo "<TABLE BGCOLOR=\"$color[4]\" WIDTH=\"100%\" CELLPADDING=0 CELLSPACING=\"5\" BORDER=\"0\">" .
                 '<TR><TD VALIGN="TOP">' .
-                   "<TABLE BGCOLOR=\"$color[4]\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" BORDER=\"0\">";
+                   "<TABLE BGCOLOR=\"$color[4]\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" BORDER=\"0\"><TR><TD>";
     foreach ($optpage_blocks as $next_optpage) {
         if ($first_optpage == false) {
             $first_optpage = $next_optpage;
@@ -319,7 +319,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
         print_optionpages_row($first_optpage);
     }
 
-    echo "</TABLE></TD></TR></TABLE>\n";
+    echo "</TD></TR></TABLE></TD></TR></TABLE>\n";
 
     do_hook('options_link_and_description');
 
@@ -329,9 +329,9 @@ if ($optpage == SMOPT_PAGE_MAIN) {
 /*************************************************************************/
 } else {
     echo '<FORM NAME="f" ACTION="options.php" METHOD="POST"><BR>' . "\n"
-       . '<TABLE WIDTH="100%" CELLPADDING=2 CELLSPACING=0 BORDER=0>' . "\n"
        . create_optpage_element($optpage)
-       . create_optmode_element(SMOPT_MODE_SUBMIT);
+       . create_optmode_element(SMOPT_MODE_SUBMIT)
+       . '<TABLE WIDTH="100%" CELLPADDING=2 CELLSPACING=0 BORDER=0>' . "\n";
 
     /* Output the option groups for this page. */
     print_option_groups($optpage_data['options']);
@@ -436,7 +436,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
             echo         "<TD VALIGN=top BGCOLOR=\"$color[4]\" WIDTH=\"50%\">&nbsp;</TD>";
         }
 
-        echo          '</TR>' .
+        echo          '</TR>' . "\n" .
                       '<TR>' .
                          "<TD VALIGN=top BGCOLOR=\"$color[0]\" WIDTH=\"50%\">" .
                             $leftopt['desc'] .
@@ -450,7 +450,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
             echo         "<TD VALIGN=top BGCOLOR=\"$color[4]\" WIDTH=\"50%\">&nbsp;</TD>";
         }
         
-        echo          '</TR>' .
+        echo          '</TR>' . "\n" .
                    '</TABLE>' .
                 '</TD></TR>' .
              "</TABLE>\n";

diff --git a/src/options_highlight.php b/src/options_highlight.php
index e50a54fedc00bf6d5ebeb2a79669cadc7d5255f8..55ab27cc6b684e3da296d9c776216b908bd9889f 100644 (file)
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -20,7 +20,7 @@ require_once('../functions/plugin.php');
 function oh_opt( $val, $sel, $tit ) {
     echo "<option value=\"$val\"";
     if ( $sel )
-        echo 'selected';
+        echo ' selected';
     echo  ">$tit</option>\n";
 }
 
@@ -68,7 +68,7 @@ if (count($message_highlight_list) >= 1) {
     echo '<table border="0" cellpadding="3" cellspacing="0" align="center" width="80%">'."\n";
     for ($i=0; $i < count($message_highlight_list); $i++) {
         echo '<tr bgcolor="' . $message_highlight_list[$i]['color'] . '">'.
-                "<td width=20% bgcolor=\"$color[4]\" nobr>".
+                "<td width=\"20%\" bgcolor=\"$color[4]\" nobr>".
                 "<small>[<a href=\"options_highlight.php?action=edit&theid=$i\">".
             _("Edit") .
             '</a>]&nbsp;[<a href="options_highlight.php?action=delete&theid='.
@@ -254,7 +254,7 @@ if ($action == 'edit' || $action == 'add') {
     echo '<input type="hidden" value="'.$theid.'" name="theid">' . "\n";
     echo '<table width="80%" align="center" cellpadding="3" cellspacing="0" border="0">' . "\n";
     echo "   <tr bgcolor=\"$color[0]\">\n";
-    echo "      <td align=\"right\" nobr><b>\n";
+    echo "      <td align=\"right\" nowrap><b>\n";
     echo _("Identifying name") . ":";
     echo '      </b></td>' . "\n";
     echo '      <td>' . "\n";
@@ -295,7 +295,7 @@ if ($action == 'edit' || $action == 'add') {
     echo "   </tr>\n";
 
     # Show grid of color choices
-    echo "<tr bgcolor=$color[0]><td colspan='2'>\n";
+    echo "<tr bgcolor=\"$color[0]\"><td colspan='2'>\n";
     echo "<table border=0 cellpadding=\"2\" align=\"center\" cellspacing=\"1\">\n";
     $current_color = $message_highlight_list[$theid]['color'];
     for($x = 0; $x < 5; $x++) {
@@ -303,14 +303,14 @@ if ($action == 'edit' || $action == 'add') {
         for($y = 0; $y < 19; $y++) {
         $gridindex = "$y,$x";
         $gridcolor = $new_color_list[$gridindex];
-        $selected = ($gridcolor == $current_color)?'SELECTED':'' ;
-        echo "<td bgcolor=#$gridcolor><input type='radio' name=color_type value='#$gridcolor' $selected>\n";
+        $selected = ($gridcolor == $current_color)?'CHECKED':'' ;
+        echo "<td bgcolor=\"#$gridcolor\"><input type='radio' name=color_type value='#$gridcolor' $selected>\n";
         echo "</td>\n";
         }
         echo "</tr>\n";
     }
     echo "</table>\n";
-    echo "</tr></td>\n";
+    echo "</td></tr>\n";
 
     echo '   <tr><td><small><small>&nbsp;</small></small></td></tr>' . "\n";
     echo "   <tr bgcolor=\"$color[0]\">\n";

diff --git a/src/options_identities.php b/src/options_identities.php
index aff95a75c31fe7aa32ff05548d3cae94ca663fc9..80913f45553fb9eb70006be33ca2d1fa243088e0 100644 (file)
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -52,7 +52,7 @@ require_once('../functions/display_messages.php');
 
 ?>
 <br>
-<table width=95% align=center border=0 cellpadding=2 cellspacing=0>
+<table width="95%" align=center border=0 cellpadding=2 cellspacing=0>
 <tr><td bgcolor="<?php echo $color[0] ?>" align="center">
 
       <b><?php echo _("Options") . ' - ' . _("Advanced Identities"); ?></b>
@@ -64,7 +64,7 @@ require_once('../functions/display_messages.php');
 
 <?PHP do_hook('options_identities_top'); ?>
 
-<table width=80% cellpadding=2 cellspacing=0 border=0>
+<table width="80%" cellpadding=2 cellspacing=0 border=0>
   <tr bgcolor="<?PHP echo $color[9] ?>">
     <th colspan=2 align=center><?PHP echo _("Default Identity") ?></th>
   </tr>

diff --git a/src/options_order.php b/src/options_order.php
index 0681adab44d3f2f6502db8ead2366287fdbee0b8..f0de44f78ab77f44987f674bcc7cedcfddf4fbd3 100644 (file)
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -42,15 +42,13 @@ require_once('../functions/plugin.php');
    displayPageHeader($color, 'None');
 ?>
    <br>
-<table width=95% align=center border=0 cellpadding=2 cellspacing=0>
+<table width="95%" align=center border=0 cellpadding=2 cellspacing=0>
 <tr><td align="center" bgcolor="<?php echo $color[0] ?>">
 
       <b><?php echo _("Options") . " - " . _("Index Order"); ?></b>
 
     <table width="100%" border="0" cellpadding="1" cellspacing="1">
     <tr><td bgcolor="<?php echo $color[4] ?>" align="center"><br>
-
-      <table width=100% cellpadding=2 cellspacing=0 border=0>
 <?php
 
    $available[1] = _("Checkbox");
@@ -149,9 +147,6 @@ require_once('../functions/plugin.php');
    echo '<p><a href="../src/options.php">' . _("Return to options page") . '</a></p><br>';
 
 ?>
-   </td></tr>
-   </table>
-
     </td></tr>
     </table>
 

diff --git a/src/read_body.php b/src/read_body.php
index 9e315719889f1ddc2725b42a73595b8f638a7f70..dd69e6e2d3922fe729db8d97197d5fa13c75333a 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -176,7 +176,7 @@ require_once('../functions/url_parser.php');
             echo "<a href=\"read_body.php?mailbox=".urlencode($mailbox)."&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more\">";
         }
         echo ''._("View message") . "</a></b></center></td></tr></table>\n" .
-             "<table width=99% cellpadding=2 cellspacing=0 border=0 align=center>\n" .
+             "<table width=\"99%\" cellpadding=2 cellspacing=0 border=0 align=center>\n" .
              '<tr><td>';
 
         $cnum = 0;
@@ -519,7 +519,7 @@ require_once('../functions/url_parser.php');
          "         </TD><TD BGCOLOR=\"$color[0]\" WIDTH=\"80%\" VALIGN=\"top\">\n" .
          "            <B>$subject</B>&nbsp;\n" .
          "         </TD>\n" .
-         '         <TD ROWSPAN="4" width=10% BGCOLOR="'.$color[0].'" ALIGN=right VALIGN=top NOWRAP><small>' . "\n";
+         '         <TD ROWSPAN="4" width="10%" BGCOLOR="'.$color[0].'" ALIGN=right VALIGN=top NOWRAP><small>' . "\n";
 
     /* From a search... */
     if ($where && $what) {
@@ -622,7 +622,7 @@ require_once('../functions/url_parser.php');
          '   </TD></TR>' .
          '</TABLE>';
     flush();        
-    echo "<TABLE CELLSPACING=0 WIDTH=97% BORDER=0 ALIGN=CENTER CELLPADDING=0>\n" .
+    echo "<TABLE CELLSPACING=0 WIDTH=\"97%\" BORDER=0 ALIGN=CENTER CELLPADDING=0>\n" .
          "   <TR><TD BGCOLOR=\"$color[4]\" WIDTH=\"100%\">\n" .
          '<BR>';
 

diff --git a/src/right_main.php b/src/right_main.php
index f29392cad42b53c6f7b7dc6daad082a1d19a9802..6e4dbd92224c51344fd99a544764ea0f69e2493e 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -77,9 +77,9 @@ if ($just_logged_in == true) {
     $just_logged_in = false;
 
     if (strlen(trim($motd)) > 0) {
-        echo "<br><table align=center width=70% cellpadding=0 cellspacing=3 border=0 bgcolor=\"$color[9]\">" .
+        echo "<br><table align=center width=\"70%\" cellpadding=0 cellspacing=3 border=0 bgcolor=\"$color[9]\">" .
          '<tr><td>' .
-             "<table width=100% cellpadding=5 cellspacing=1 border=0 bgcolor=\"$color[4]\">" .
+             "<table width=\"100%\" cellpadding=5 cellspacing=1 border=0 bgcolor=\"$color[4]\">" .
              "<tr><td align=center>$motd";
         do_hook('motd');
         echo '</td></tr>' .
@@ -138,6 +138,6 @@ if ($use_mailbox_cache && session_is_registered('msgs')) {
 do_hook('right_main_bottom');
 sqimap_logout ($imapConnection);
 
-echo '</FONT></BODY></HTML>';
+echo '</BODY></HTML>';
 
 ?>

diff --git a/src/search.php b/src/search.php
index 0dd0a49f23f3d78ef7fb9944d44666d15e09ceff..8081f0c2178372c076d7923eee42bfdd3d3828da 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -17,7 +17,7 @@ require_once('../functions/array.php');
 function s_opt( $val, $sel, $tit ) {
     echo "            <option value=\"$val\"";
     if ( $sel ) {
-        echo 'selected';
+        echo ' selected';
     }
     echo  ">$tit</option>\n";
 }
@@ -27,7 +27,7 @@ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0
 
 do_hook('search_before_form');
 echo "<br>\n".
-    "      <table width=95% align=center cellpadding=2 cellspacing=0 border=0>\n".
+    "      <table width=\"95%\" align=center cellpadding=2 cellspacing=0 border=0>\n".
     "      <tr><td bgcolor=\"$color[0]\">\n".
     "          <center><b>"._("Search")."</b></center>\n".
     "      </td></tr>\n".

diff --git a/src/signout.php b/src/signout.php
index 73d5da3b97cd54e87e4ef49e6338c6e6ebf6f287..42dfed57dc322a81d1302867cefe2e5840fd9b84 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -78,12 +78,12 @@ ALINK="<?php echo $color[7] ?>">
 <BR><BR>
 <TABLE BGCOLOR="FFFFFF" BORDER="0" COLS="1" WIDTH="50%" CELLSPACING="0" 
 CELLPADDING="2" ALIGN="CENTER">
-  <TR BGCOLOR="<?php echo $color[0] ?>" WIDTH=100%>
+  <TR BGCOLOR="<?php echo $color[0] ?>" WIDTH="100%">
     <TD ALIGN="CENTER">
       <B><?php echo _("Sign Out") ?></B>
     </TD>
   </TR>
-  <TR BGCOLOR="<?php echo $color[4] ?>" WIDTH=100%>
+  <TR BGCOLOR="<?php echo $color[4] ?>" WIDTH="100%">
     <TD ALIGN="CENTER">
       <?php do_hook('logout_above_text'); ?>
       <?php echo _("You have been successfully signed out.") ?><BR>
@@ -92,7 +92,7 @@ CELLPADDING="2" ALIGN="CENTER">
       </A><BR><BR>
     </TD>
   </TR>
-  <TR BGCOLOR="<?php echo $color[0] ?>" WIDTH=100%>
+  <TR BGCOLOR="<?php echo $color[0] ?>" WIDTH="100%">
     <TD ALIGN="CENTER">
       <BR>
     </TD>