From ac50138c1be7836d931e8c45a959f815a500203f Mon Sep 17 00:00:00 2001
From: kink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 8 Sep 2002 15:04:47 +0000
Subject: [PATCH] Fix HTML-compliance here and there.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3618 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/mailbox_display.php |  6 ------
 include/options/display.php   |  2 +-
 src/addressbook.php           | 16 ++++++++--------
 src/folders.php               |  2 +-
 src/webmail.php               |  3 ++-
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index b33fd32d..e91a1c7e 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -762,12 +762,6 @@ function mail_message_listing_beginning ($imapConnection,
     echo '</td></tr>'
     .  html_tag( 'tr' )
     . html_tag( 'td' ,'' , '', $color[0], '' );
-    if ($GLOBALS['alt_index_colors']){
-        $cellspacing =  '0';
-    } else {
-        $cellspacing = '1';
-    }
-    echo html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="2"  cellspacing="'. $cellspacing .'"' );
 
     /* if using server sort we highjack the
     * the $sort var and use $server_sort_order
diff --git a/include/options/display.php b/include/options/display.php
index 069e53c5..7ccb6110 100644
--- a/include/options/display.php
+++ b/include/options/display.php
@@ -100,7 +100,7 @@ function load_optpage_data_display() {
     );
 
     $js_autodetect_script =
-        "<SCRIPT LANGUAGE=\"JavaScript\"><!--\n".
+        "<SCRIPT LANGUAGE=\"JavaScript\" TYPE=\"text/javascript\"><!--\n".
            "document.forms[0].new_js_autodetect_results.value = '" . SMPREF_JS_ON . "';\n".
         "// --></SCRIPT>\n";
     $js_autodetect_results = SMPREF_JS_OFF;
diff --git a/src/addressbook.php b/src/addressbook.php
index ab148752..20082452 100644
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -53,7 +53,7 @@ function address_form($name, $submittext, $values = array()) {
                                        $submittext . '">',
                                    'center', $color[4], 'colspan="2"')
                        )
-    , 'center', '', 'border="0" cellpadding="1" cols="2" width="90%"') ."\n";
+    , 'center', '', 'border="0" cellpadding="1" width="90%"') ."\n";
 }
 
 
@@ -175,7 +175,7 @@ if($REQUEST_METHOD == 'POST') {
                                       "\n". '<strong>' . _("Update address") . '</strong>' ."\n",
                                       'center', $color[0] )
                                    ),
-                             'center', '', 'width="100%" cols="1"' ) .
+                             'center', '', 'width="100%" ' ) .
                         address_form("editaddr", _("Update address"), $olddata);
                         echo '<INPUT TYPE=hidden NAME=oldnick VALUE="' . 
                              htmlspecialchars($olddata["nickname"]) . "\">\n" .
@@ -201,7 +201,7 @@ if($REQUEST_METHOD == 'POST') {
                                       '">' . _("ERROR") . ': ' . $abook->error . '</font></strong>' ."\n",
                                       'center' )
                                    ),
-                             'center', '', 'width="100%" cols="1"' );
+                             'center', '', 'width="100%"' );
 
                             /* Display the "new address" form again */
                             echo '<FORM ACTION="' . $PHP_SELF .
@@ -212,7 +212,7 @@ if($REQUEST_METHOD == 'POST') {
                                                     "\n". '<br><strong>' . _("Update address") . '</strong>' ."\n",
                                          'center', $color[0] )
                                      ),
-                                 'center', '', 'width="100%" cols="1"' ) .
+                                 'center', '', 'width="100%"' ) .
                             address_form("editaddr", _("Update address"), $newdata);
                             echo '<INPUT TYPE=hidden NAME=oldnick VALUE="' .
                                  htmlspecialchars($oldnick) . "\">\n" .
@@ -255,7 +255,7 @@ if (!empty($formerror)) {
                    '">' . _("ERROR") . ': ' . $formerror . '</font></strong>' ."\n",
             'center' )
         ),
-    'center', '', 'width="100%" cols="1"' );
+    'center', '', 'width="100%"' );
 }
 
 
@@ -301,8 +301,8 @@ if ($showaddrlist) {
                                 html_tag( 'tr',
                                     html_tag( 'td', "\n" . '<strong>' . $row['source'] . '</strong>' . "\n", 'center', $color[0] )
                                 ) ,
-                        'center', '', 'width="95%" cols="1"' ) ."\n"
-                . html_tag( 'table', '', 'center', '', 'cols="5" border="0" cellpadding="1" cellspacing="0" width="90%"' ) .
+                        'center', '', 'width="95%"' ) ."\n"
+                . html_tag( 'table', '', 'center', '', 'border="0" cellpadding="1" cellspacing="0" width="90%"' ) .
                       html_tag( 'tr', "\n" .
                           html_tag( 'th', '&nbsp;', 'left', '', 'width="1%"' ) .
                           html_tag( 'th', _("Nickname"), 'left', '', 'width="1%"' ) .
@@ -374,7 +374,7 @@ echo '<a name="AddAddress"></a>' . "\n" .
                 'center', $color[0]
             )
         )
-    , 'center', '', 'width="100%" cols="1"' ) ."\n";
+    , 'center', '', 'width="100%"' ) ."\n";
 address_form('addaddr', _("Add address"), $defdata);
 echo '</FORM>';
 
diff --git a/src/folders.php b/src/folders.php
index efc3bae7..5137cd8f 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -67,7 +67,7 @@ $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort,
 $boxes = sqimap_mailbox_list($imapConnection);
 
 /** CREATING FOLDERS **/
-echo html_tag( 'table', '', 'center', '', 'width="70%" cols="1" cellpadding="4" cellspacing="0" border="0"' ) .
+echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspacing="0" border="0"' ) .
             html_tag( 'tr',
                 html_tag( 'td', '<b>' . _("Create Folder") . '</b>', 'center', $color[9] )
             ) .
diff --git a/src/webmail.php b/src/webmail.php
index 6498291f..dda16fca 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -49,7 +49,8 @@ if ($my_language != $squirrelmail_language) {
 
 set_up_language(getPref($data_dir, $username, 'language'));
 
-echo "<html><head>\n" .
+echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN">'.
+     "<html><head>\n" .
      "<title>$org_title</title>";
 
 $left_size = getPref($data_dir, $username, 'left_size');
-- 
2.25.1