From c435f076fe6b5b58e09ae19a8e216f37b069d802 Mon Sep 17 00:00:00 2001
From: jervfors <jervfors@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 12 Nov 2004 14:21:31 +0000
Subject: [PATCH] XHTML fixes

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8365 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/mailbox_display.php                 | 60 ++++++++-----------
 functions/options.php                         |  2 +-
 functions/strings.php                         |  2 +-
 plugins/abook_take/functions.php              |  2 +-
 plugins/bug_report/setup.php                  |  2 +-
 plugins/calendar/functions.php                |  6 +-
 plugins/change_password/options.php           |  2 +-
 plugins/filters/options.php                   |  2 +-
 plugins/filters/spamoptions.php               |  6 +-
 plugins/listcommands/mailout.php              |  2 +-
 .../message_details/message_details_top.php   |  4 +-
 plugins/newmail/newmail.php                   |  2 +-
 plugins/newmail/newmail_opt.php               | 16 ++---
 plugins/newmail/testsound.php                 |  4 +-
 plugins/spamcop/spamcop.php                   |  2 +-
 plugins/translate/options.php                 |  6 +-
 src/addrbook_search.php                       | 12 ++--
 src/addrbook_search_html.php                  | 34 +++++------
 src/addressbook.php                           | 12 ++--
 src/folders.php                               |  2 +-
 src/left_main.php                             |  8 +--
 src/options.php                               |  8 +--
 src/options_highlight.php                     |  6 +-
 src/options_identities.php                    |  4 +-
 src/right_main.php                            |  4 +-
 25 files changed, 98 insertions(+), 112 deletions(-)

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index eef07eff..1f062aa9 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -316,7 +316,7 @@ function printMessageInfo($aMsg) {
             case 2: /* from */
                 if ($senderAddress != $senderName) {
                     $senderAddress = strtr($senderAddress, array_flip(get_html_translation_table(HTML_SPECIALCHARS)));
-                    $title = ' title="' . str_replace('"', "''", $senderAddress) . '"';
+                    $title = ' title="' . str_replace(array('"', '<', '>'), array("''", '&lt;', '&gt;'), $senderAddress) . '"';
                 } else {
                     $title = '';
                 }
@@ -335,7 +335,7 @@ function printMessageInfo($aMsg) {
                             $fontstr_end . $flag_end . $bold_end,
                             'center',
                             $hlt_color,
-                            'nowrap' );
+                            'style="white-space: nowrap;"' );
                 break;
             case 4: /* subject */
                 $td_str = $bold;
@@ -350,7 +350,7 @@ function printMessageInfo($aMsg) {
                     $title = get_html_translation_table(HTML_SPECIALCHARS);
                     $title = array_flip($title);
                     $title = strtr($sSubject, $title);
-                    $title = str_replace('"', "''", $title);
+                    $title = str_replace(array('"', '<', '>'), array("''", '&lt;', '&gt;'), $title);
                     $td_str .= " title=\"$title\"";
                 }
                 $td_str .= ">$flag$subject$flag_end</a>$bold_end";
@@ -406,7 +406,7 @@ function printMessageInfo($aMsg) {
                                 $td_str,
                                 'right',
                                 $hlt_color,
-                                'nowrap' );
+                                'style="white-space: nowrap;"' );
                 }
 
                 // plain text message markers
@@ -444,7 +444,7 @@ function printMessageInfo($aMsg) {
                                 $td_str,
                                 'center',
                                 $hlt_color,
-                                'nowrap' );
+                                'style="white-space: nowrap;"' );
                 }
                 break;
             case 6: /* size */
@@ -1040,14 +1040,9 @@ function showMessagesForMailbox($imapConnection, &$aMailbox) {
             . "}\n"
             . "</script>\n"
             . "<!-- end of compact paginator javascript -->\n";
-    } ?>
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-<tr>
-    <td>
-    <?php mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $paginator_str); ?>
-    </td>
-</tr>
+    }
+    mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $paginator_str);
+?>
 <tr><td height="5" bgcolor="<?php echo $color[4]; ?>"></td></tr>
 <tr>
     <td>
@@ -1055,28 +1050,20 @@ function showMessagesForMailbox($imapConnection, &$aMailbox) {
         <tr>
         <td>
             <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="<?php echo $color[5]; ?>">
-            <tr>
-                <td>
                 <?php
                     printHeader($aMailbox);
                     displayMessageArray($imapConnection, $aMailbox);
                 ?>
-                </td>
-            </tr>
             </table>
         </td>
         </tr>
     </table>
     </td>
 </tr>
-<tr>
-    <td>
 <?php
     mail_message_listing_end($aMailbox, $paginator_str, $msg_cnt_str);
 ?>
-    </td>
-</tr>
-</table>
+</table></form>
 <?php
 
 }
@@ -1166,6 +1153,7 @@ function mail_message_listing_beginning ($imapConnection,
     } else {
         $source_url = $php_self;
     }
+    $php_self = str_replace('&', '&amp;', $php_self);
 
     if (!isset($msg)) {
         $msg = '';
@@ -1186,8 +1174,8 @@ function mail_message_listing_beginning ($imapConnection,
             $sort = $aMailbox['SORT'] + SQSORT_THREAD;
         }
         $thread_link_str = '<small>[<a href="' . $source_url . '?srt='
-            . $sort . '&start_messages=1'
-            . '&mailbox=' . urlencode($aMailbox['NAME']) . '">' . $thread_name
+            . $sort . '&amp;start_messages=1'
+            . '&amp;mailbox=' . urlencode($aMailbox['NAME']) . '">' . $thread_name
             . '</a>]</small>';
     } else {
         $thread_link_str ='';
@@ -1201,6 +1189,7 @@ function mail_message_listing_beginning ($imapConnection,
 
     echo '<form name="' . $form_name . '" method="post" action="'.$php_self.'">' ."\n"
         . $moveFields;
+    echo '<table border="0" width="100%" cellpadding="0" cellspacing="0"><tr><td>';
 
     $button_str = '';
     // display flag buttons only if supported
@@ -1233,13 +1222,13 @@ function mail_message_listing_beginning ($imapConnection,
             <table bgcolor="<?php echo $color[4]; ?>" border="0" width="100%" cellpadding="1"  cellspacing="0">
             <tr>
                 <?php echo html_tag('td', '<small>' . $paginator . $thread_link_str . '</small>', 'left') . "\n"; ?>
-                <?php echo html_tag('td', '', 'center') . "\n"; ?>
+                <?php echo html_tag('td', '&nbsp;', 'center') . "\n"; ?>
                 <?php echo html_tag('td', '<small>' . $msg_cnt_str . '</small>', 'right') . "\n"; ?>
             </tr>
             </table>
         </td>
         </tr>
-        <tr width="100%" cellpadding="1"  cellspacing="0" border="0" bgcolor="<?php echo $color[0]; ?>">
+        <tr bgcolor="<?php echo $color[0]; ?>">
         <td>
             <table border="0" width="100%" cellpadding="1"  cellspacing="0">
             <tr>
@@ -1295,8 +1284,8 @@ function mail_message_listing_end($aMailbox, $paginator_str, $msg_cnt_str) {
         <td>
             <table bgcolor="<?php echo $color[4]; ?>" border="0" width="100%" cellpadding="1"  cellspacing="0">
             <tr>
-                    <?php echo html_tag('td', '<small>' . $paginator_str . '</small>', 'left');  ?>
-                    <?php echo html_tag('td', '<small>' . $msg_cnt_str   . '</small>', 'right'); ?>
+                <?php echo html_tag('td', '<small>' . $paginator_str . '</small>', 'left');  ?>
+                <?php echo html_tag('td', '<small>' . $msg_cnt_str   . '</small>', 'right'); ?>
             </tr>
             </table>
         </td>
@@ -1309,7 +1298,6 @@ function mail_message_listing_end($aMailbox, $paginator_str, $msg_cnt_str) {
     /* End of message-list table */
 
     do_hook('mailbox_index_after');
-    echo "</form>\n";
 }
 
 /**
@@ -1342,7 +1330,7 @@ function printHeader($aMailbox) {
             echo html_tag( 'td',get_selectall_link($aMailbox) , '', '', 'width="1%"' );
             break;
         case 5: /* flags */
-            echo html_tag( 'td','' , '', '', 'width="1%"' );
+            echo html_tag( 'td','&nbsp;' , '', '', 'width="1%"' );
             break;
         case 2: /* from */
             if (handleAsSent($aMailbox['NAME'])) {
@@ -1361,7 +1349,7 @@ function printHeader($aMailbox) {
             echo "</td>\n";
             break;
         case 3: /* date */
-            echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' )
+            echo html_tag( 'td' ,'' , 'left', '', 'width="5%" style="white-space: nowrap;"' )
                 . '<b>' . _("Date") . '</b>';
             if ($showsort) {
                 if ($internal_date_sort) {
@@ -1381,7 +1369,7 @@ function printHeader($aMailbox) {
             echo "</td>\n";
             break;
         case 6: /* size */
-            echo html_tag( 'td', '', 'center','','width="5%" nowrap')
+            echo html_tag( 'td', '', 'center','','width="5%" style="white-space: nowrap;"')
                 . '<b>' . _("Size") . '</b>';
             if ($showsort) {
                 ShowSortButton($aMailbox, SQSORT_SIZE_ASC, SQSORT_SIZE_DEC);
@@ -1458,7 +1446,7 @@ function get_selectall_link($aMailbox) {
                 . "//-->\n"
                 . '</script>'
                 . '<input type="checkbox" name="toggleAll" title="'._("Toggle All").'" onclick="'.$func_name.'();" />';
-//                . <a href="javascript:void(0)" onClick="' . $func_name . '();">' . _("Toggle All")
+//                . <a href="javascript:void(0)" onclick="' . $func_name . '();">' . _("Toggle All")
 //                . "</a>\n";
     } else {
         $result .= "<a href=\"$PHP_SELF";
@@ -1768,7 +1756,7 @@ function get_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll) {
                 $result .= $spc . '<select name="startMessage"';
                 if ($javascript_on) {
                     $result .= ' onchange="JavaScript:SubmitOnSelect'
-                        . '(this, \'' . $pg_url . '&startMessage=\')"';
+                        . '(this, \'' . $pg_url . '&amp;startMessage=\')"';
                 }
                 $result .='>';
 
@@ -1852,7 +1840,7 @@ function truncateWithEntities($subject, $trim_at)
         return call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_strimwidth', $subject, $trim_val);
     }
 
-    return substr_replace($subject, '...', $trim_val);
+    return substr_replace($subject, '...', $trim_val + 1);
 }
 
 /**
@@ -1906,7 +1894,7 @@ function getSmallStringCell($string, $align) {
                     '<small>' . $string . ':&nbsp; </small>',
                     $align,
                     '',
-                    'nowrap' );
+                    'style="white-space: nowrap;"' );
 }
 
 /**
diff --git a/functions/options.php b/functions/options.php
index c6d305ec..c242aafb 100644
--- a/functions/options.php
+++ b/functions/options.php
@@ -669,7 +669,7 @@ function print_option_groups($option_groups) {
             echo html_tag( 'tr', "\n".
                         html_tag( 'td',
                             '<b>' . $next_optgrp['name'] . '</b>' ,
-                        'center' ,'', 'valign="middle" colspan="2" nowrap' )
+                        'center' ,'', 'valign="middle" colspan="2" style="white-space: nowrap;"' )
                     ) ."\n";
         }
 
diff --git a/functions/strings.php b/functions/strings.php
index 0997f6fd..6a62a5de 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -836,7 +836,7 @@ function makeComposeLink($url, $text = null, $target='')
     // build the compose in new window link...
 
 
-    // if javascript is on, use onClick event to handle it
+    // if javascript is on, use onclick event to handle it
     if($javascript_on) {
         sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
         return '<a href="javascript:void(0)" onclick="comp_in_new(\''.$base_uri.$url.'\')">'. $text.'</a>';
diff --git a/plugins/abook_take/functions.php b/plugins/abook_take/functions.php
index 536bf18d..7294190e 100644
--- a/plugins/abook_take/functions.php
+++ b/plugins/abook_take/functions.php
@@ -84,7 +84,7 @@ function abook_take_options()
 {
     global $abook_take_verify;
 
-    echo '<tr>' . html_tag('td',_("Address Book Take:"),'right','','nowrap') . "\n" .  '<td>' .
+    echo '<tr>' . html_tag('td',_("Address Book Take:"),'right','','style="white-space: nowrap;"') . "\n" .  '<td>' .
          addCheckbox('abook_take_abook_take_verify', $abook_take_verify) .
          _("Try to verify addresses") . "</td></tr>\n";
 }
diff --git a/plugins/bug_report/setup.php b/plugins/bug_report/setup.php
index 0c2bd4e1..c388c145 100644
--- a/plugins/bug_report/setup.php
+++ b/plugins/bug_report/setup.php
@@ -79,7 +79,7 @@ function bug_report_load() {
 function bug_report_options() {
     global $bug_report_visible;
 
-    echo '<tr>' . html_tag('td',_("Bug Reports:"),'right','','nowrap') . "\n" .
+    echo '<tr>' . html_tag('td',_("Bug Reports:"),'right','','style="white-space: nowrap;"') . "\n" .
          '<td><input name="bug_report_bug_report_visible" type="checkbox"';
     if ($bug_report_visible) {
         echo ' checked="checked"';
diff --git a/plugins/calendar/functions.php b/plugins/calendar/functions.php
index d7cbb6b9..ac96c988 100644
--- a/plugins/calendar/functions.php
+++ b/plugins/calendar/functions.php
@@ -26,11 +26,11 @@ function calendar_header() {
          html_tag( 'tr' ) .
          html_tag( 'td', '', 'left', '', 'width="100%"' );
 
-    displayInternalLink("plugins/calendar/calendar.php?year=$year&month=$month",_("Month View"),"right");
+    displayInternalLink("plugins/calendar/calendar.php?year=$year&amp;month=$month",_("Month View"),"right");
     echo "&nbsp;&nbsp;\n";
-    displayInternalLink("plugins/calendar/day.php?year=$year&month=$month&day=$day",_("Day View"),"right");
+    displayInternalLink("plugins/calendar/day.php?year=$year&amp;month=$month&amp;day=$day",_("Day View"),"right");
     echo "&nbsp;&nbsp;\n";
-    // displayInternalLink("plugins/calendar/event_create.php?year=$year&month=$month&day=$day",_("Add Event"),"right");
+    // displayInternalLink("plugins/calendar/event_create.php?year=$year&amp;month=$month&amp;day=$day",_("Add Event"),"right");
     // echo "&nbsp;&nbsp;\n";
     echo '</td></tr>';
 
diff --git a/plugins/change_password/options.php b/plugins/change_password/options.php
index 4f254b0e..2c26e45a 100644
--- a/plugins/change_password/options.php
+++ b/plugins/change_password/options.php
@@ -52,7 +52,7 @@ if (isset($Messages) && count($Messages) > 0) {
 }
 
 ?><tr><td>
-    <?php echo addForm($_SERVER['PHP_SELF'], 'POST'); ?>
+    <?php echo addForm($_SERVER['PHP_SELF'], 'post'); ?>
     <table>
       <tr>
         <th align="right"><?php echo _("Current Password:")?></th>
diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index 6a6b44b6..73b823ca 100644
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -121,7 +121,7 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) {
         '<center>'.
         html_tag( 'table', '', '', '', 'border="0" cellpadding="2" cellspacing="0"' ) .
             html_tag( 'tr' ) .
-                html_tag( 'th', _("What to Scan:"), 'right', '', 'nowrap' ) .
+                html_tag( 'th', _("What to Scan:"), 'right', '', 'style="white-space: nowrap;"' ) .
                 html_tag( 'td', '', 'left' ) .
             '<select name="filters_user_scan_set">'.
             '<option value=""';
diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index 583c7211..016c8dc5 100644
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -118,7 +118,7 @@ if (isset($action) && $action == 'spam') {
         '<center>'.
         html_tag( 'table', '', '', '', 'width="85%" border="0" cellpadding="2" cellspacing="0"' ) .
             html_tag( 'tr' ) .
-                html_tag( 'th', _("Move spam to:"), 'right', '', 'nowrap' ) .
+                html_tag( 'th', _("Move spam to:"), 'right', '', 'style="white-space: nowrap;"' ) .
                 html_tag( 'td', '', 'left' ) .
                     '<select name="filters_spam_folder_set">';
 
@@ -136,7 +136,7 @@ if (isset($action) && $action == 'spam') {
             'left' )
         ) .
         html_tag( 'tr' ) .
-            html_tag( 'th', _("What to Scan:"), 'right', '', 'nowrap' ) .
+            html_tag( 'th', _("What to Scan:"), 'right', '', 'style="white-space: nowrap;"' ) .
             html_tag( 'td' ) .
             '<select name="filters_spam_scan_set">'.
             '<option value=""';
@@ -163,7 +163,7 @@ if (isset($action) && $action == 'spam') {
 
     foreach ($spam_filters as $Key => $Value) {
         echo html_tag( 'tr' ) .
-                   html_tag( 'th', $Key, 'right', '', 'nowrap' ) ."\n" .
+                   html_tag( 'th', $Key, 'right', '', 'style="white-space: nowrap;"' ) ."\n" .
                    html_tag( 'td' ) .
             '<input type="checkbox" name="' .
             $spam_filters[$Key]['prefname'] .
diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php
index 99f402fa..5e619121 100644
--- a/plugins/listcommands/mailout.php
+++ b/plugins/listcommands/mailout.php
@@ -51,7 +51,7 @@ case 'unsubscribe':
 
 printf( $out_string, htmlspecialchars($send_to) );
 
-echo addForm('../../src/compose.php', 'POST');
+echo addForm('../../src/compose.php', 'post');
 
 
 $idents = get_identities();
diff --git a/plugins/message_details/message_details_top.php b/plugins/message_details/message_details_top.php
index 739a05c9..75b125ca 100644
--- a/plugins/message_details/message_details_top.php
+++ b/plugins/message_details/message_details_top.php
@@ -40,8 +40,8 @@ echo "<body text=\"$color[8]\" bgcolor=\"$color[3]\" link=\"$color[7]\" vlink=\"
      addHidden('passed_id', $passed_id).
      addHidden('ent_id', '0').
      addHidden('absolute_dl', 'true').
-     '<input type="button" value="' . _("Print") . '" onClick="printPopup()" />&nbsp;&nbsp;'.
-     '<input type="button" value="' . _("Close Window") . '" onClick="window.parent.close()" />&nbsp;&nbsp;'.
+     '<input type="button" value="' . _("Print") . '" onclick="printPopup()" />&nbsp;&nbsp;'.
+     '<input type="button" value="' . _("Close Window") . '" onclick="window.parent.close()" />&nbsp;&nbsp;'.
      addSubmit(_("Save Message")).
      '</form>'.
      '</b>'.
diff --git a/plugins/newmail/newmail.php b/plugins/newmail/newmail.php
index 3bc00904..ab4f1062 100644
--- a/plugins/newmail/newmail.php
+++ b/plugins/newmail/newmail.php
@@ -35,7 +35,7 @@ sqGetGlobalVar('numnew', $numnew, SQ_GET);
                           '</font><br /></big><br />' . "\n" .
                           '<form name="nm">' . "\n".
                           '<input type="button" name="bt" value="' . _("Close Window") .
-                          '" onClick="javascript:window.close();" />'."\n".
+                          '" onclick="javascript:window.close();" />'."\n".
                           '</form>',
                           'center' )
                       ) ,
diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php
index 26f2739c..289b85f7 100644
--- a/plugins/newmail/newmail_opt.php
+++ b/plugins/newmail/newmail_opt.php
@@ -70,7 +70,7 @@ echo '<form action="'.sqm_baseuri().'src/options.php" method="post">' . "\n" .
 
 // Option: media_allbox
 echo html_tag( 'tr' ) .
-        html_tag( 'td', _("Check all boxes, not just INBOX").':', 'right', '', 'nowrap' ) .
+        html_tag( 'td', _("Check all boxes, not just INBOX").':', 'right', '', 'style="white-space: nowrap;"' ) .
             html_tag( 'td', '', 'left' ) .
                 '<input type="checkbox" ';
 if ($media_allbox == 'on') {
@@ -80,7 +80,7 @@ echo 'name="media_allbox" /></td></tr>' . "\n";
 
 // Option: media_recent
 echo html_tag( 'tr' ) .
-        html_tag( 'td', _("Count only messages that are RECENT").':', 'right', '', 'nowrap' ) .
+        html_tag( 'td', _("Count only messages that are RECENT").':', 'right', '', 'style="white-space: nowrap;"' ) .
             html_tag( 'td', '', 'left' ) .
                 '<input type="checkbox" ';
 if ($media_recent == 'on') {
@@ -90,7 +90,7 @@ echo 'name="media_recent" /></td></tr>' . "\n";
 
 // Option: media_changetitle
 echo html_tag( 'tr' ) .
-        html_tag( 'td', _("Change title on supported browsers").':', 'right', '', 'nowrap' ) .
+        html_tag( 'td', _("Change title on supported browsers").':', 'right', '', 'style="white-space: nowrap;"' ) .
             html_tag( 'td', '', 'left' ) .
                 '<input type="checkbox" ';
 if ($media_changetitle == 'on') {
@@ -100,7 +100,7 @@ echo 'name="media_changetitle" />&nbsp;('._("requires JavaScript to work").')</t
 
 // Option: media_popup
 echo html_tag( 'tr' ) .
-        html_tag( 'td', _("Show popup window on new mail").':', 'right', '', 'nowrap' ) .
+        html_tag( 'td', _("Show popup window on new mail").':', 'right', '', 'style="white-space: nowrap;"' ) .
             html_tag( 'td', '', 'left' ) .
                 '<input type="checkbox" ';
 if($media_popup == 'on') {
@@ -111,7 +111,7 @@ echo 'name="media_popup" />&nbsp;('._("requires JavaScript to work").')</td></tr
 if ($allowsound == "true") {
 // Option: media_enable
     echo html_tag( 'tr' ) .
-            html_tag( 'td', _("Enable Media Playing").':', 'right', '', 'nowrap' ) .
+            html_tag( 'td', _("Enable Media Playing").':', 'right', '', 'style="white-space: nowrap;"' ) .
                 html_tag( 'td', '', 'left' ) .
                     '<input type="checkbox" ';
     if ($media_enable == 'on') {
@@ -121,7 +121,7 @@ if ($allowsound == "true") {
 
 // Option: media_sel
     echo html_tag( 'tr' ) .
-        html_tag( 'td', _("Select server file").':', 'right', '', 'nowrap' ) .
+        html_tag( 'td', _("Select server file").':', 'right', '', 'style="white-space: nowrap;"' ) .
             html_tag( 'td', '', 'left' ) .
                 '<select name="media_sel">' . "\n" .
                     '<option value="(none)"';
@@ -145,13 +145,13 @@ if ($allowsound == "true") {
     $d->close();
     $media_output = ($media == '(none)') ? _("(none)") : substr($media, strrpos($media, '/')+1);
     echo '</select>'.
-        '<input type="submit" value="' . _("Try") . '" name="test" onClick="' .
+        '<input type="submit" value="' . _("Try") . '" name="test" onclick="' .
             "window.open('testsound.php?sound='+media_sel.options[media_sel.selectedIndex].value, 'TestSound'," .
             "'width=150,height=30,scrollbars=no');" .
             'return false;' .
             '" /></td></tr>' .
             html_tag( 'tr', "\n" .
-                html_tag( 'td', _("Current File:"), 'right', '', 'nowrap' ) .
+                html_tag( 'td', _("Current File:"), 'right', '', 'style="white-space: nowrap;"' ) .
                     html_tag( 'td', '<input type="hidden" value="' .
                         htmlspecialchars($media) . '" name="media_default" />' .
                         htmlspecialchars($media_output) . '', 'left' )
diff --git a/plugins/newmail/testsound.php b/plugins/newmail/testsound.php
index 6e6ceb10..cba784dc 100644
--- a/plugins/newmail/testsound.php
+++ b/plugins/newmail/testsound.php
@@ -26,7 +26,7 @@ if ( ! sqgetGlobalVar('sound', $sound, SQ_GET) ) {
 } elseif ( $sound == '(none)' ) {
     echo '<center><form><br /><br />'.
          '<b>' . _("No sound specified") . '</b><br /><br />'.
-         '<input type="button" name="close" value="' . _("Close") . '" onClick="window.close()" />'.
+         '<input type="button" name="close" value="' . _("Close") . '" onclick="window.close()" />'.
          '</form></center>'.
          '</body></html>';
     return;
@@ -41,7 +41,7 @@ echo html_tag( 'table',
                     '<form>'.
                     '<input type="button" name="close" value="  ' .
                     _("Close") .
-                    '  " onClick="window.close()" />'.
+                    '  " onclick="window.close()" />'.
                     '</form>' ,
                 'center' )
             ) ,
diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index 27ac0806..1701fc26 100644
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -149,7 +149,7 @@ echo "</p>";
 <td align="left" valign="top">
 <?php if (isset($js_web) && $js_web) {
   echo '<form method="post" action="javascript:return false">';
-  echo '<input type="button" value="' . _("Close Window") . "\" onClick=\"window.close(); return true;\" />\n";
+  echo '<input type="button" value="' . _("Close Window") . "\" onclick=\"window.close(); return true;\" />\n";
 } else {
    ?><form method="post" action="../../src/right_main.php">
   <input type="hidden" name="mailbox" value="<?php echo htmlspecialchars($mailbox) ?>" />
diff --git a/plugins/translate/options.php b/plugins/translate/options.php
index 8bc0b6d4..ffda075a 100644
--- a/plugins/translate/options.php
+++ b/plugins/translate/options.php
@@ -44,14 +44,14 @@ displayPageHeader($color, 'None');
         '<input type="hidden" name="optmode" value="submit" />' .
         '<input type="hidden" name="optpage" value="translate" />' .
         '<table border="0" cellpadding="0" cellspacing="2">'.
-            '<tr><td align="right" nowrap="nowrap">' .
+            '<tr><td align="right" style="white-space: nowrap;">' .
              _("Select your translator:") .
              '</td>'.
             '<td><select name="translate_translate_server">';
    translate_showoption();
    echo '</select>' .
        '</td></tr>' .
-       '<tr>'.html_tag('td',_("When reading:"),'right','','nowrap="nowrap"').
+       '<tr>'.html_tag('td',_("When reading:"),'right','','style="white-space: nowrap;"').
        '<td><input type="checkbox" name="translate_translate_show_read"';
    if ($translate_show_read)
        echo ' checked="checked"';
@@ -68,7 +68,7 @@ displayPageHeader($color, 'None');
        "</td></tr>\n";
 
 if (!$disable_compose_translate) {
-   echo '<tr>'.html_tag('td',_("When composing:"),'right','','nowrap').
+   echo '<tr>'.html_tag('td',_("When composing:"),'right','','style="white-space: nowrap;"').
          '<td><input type="checkbox" name="translate_translate_show_send"';
    if ($translate_show_send)
       echo ' checked="checked"';
diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 262bc5e4..f913eca9 100644
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -143,7 +143,7 @@ function display_result($res, $includesource = true) {
         } else {
             $tr_bgcolor = $color[4];
         }
-        echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
+        echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) .
         html_tag( 'td',
              '<small><a href="javascript:to_address(' .
                                        "'" . $email . "');\">"._("To")."</a> | " .
@@ -151,15 +151,15 @@ function display_result($res, $includesource = true) {
                                        "'" . $email . "');\">"._("Cc")."</a> | " .
              '<a href="javascript:bcc_address(' .
                                  "'" . $email . "');\">"._("Bcc")."</a></small>",
-        'center', '', 'valign="top" width="5%" nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']), 'left', '', 'valign="top" nowrap' ) .
+        'center', '', 'valign="top" width="5%" style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']), 'left', '', 'valign="top" style="white-space: nowrap;"' ) .
         html_tag( 'td', '&nbsp;' .
              '<a href="javascript:to_and_close(' .
                  "'" . $email . "');\">" . htmlspecialchars($row['email']) . '</a>'
         , 'left', '', 'valign="top"' ) .
-        html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" nowrap' );
+        html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" style="white-space: nowrap;"' );
         if ($includesource) {
-            echo html_tag( 'td', '&nbsp;' . $row['source'], 'left', '', 'valign="top" nowrap' );
+            echo html_tag( 'td', '&nbsp;' . $row['source'], 'left', '', 'valign="top" style="white-space: nowrap;"' );
         }
 
         echo "</tr>\n";
@@ -210,7 +210,7 @@ if ($show == 'form' && empty($listall)) {
             '" method="post">' . "\n" .
          html_tag( 'table', '', '', '', 'border="0" width="100%" height="100%"' ) .
          html_tag( 'tr' ) .
-         html_tag( 'td', '  <strong>' . _("Search for") . "</strong>\n", 'left', '', 'nowrap valign="middle" width="10%"' ) .
+         html_tag( 'td', '  <strong>' . _("Search for") . "</strong>\n", 'left', '', 'style="white-space: nowrap;" valign="middle" width="10%"' ) .
          html_tag( 'td', '', 'left', '', '' ) .
          addInput('query', $query, 28);
 
diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 0bb8c875..d64e8b52 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -73,7 +73,7 @@ function addr_display_result($res, $includesource = true) {
 
     if (sizeof($res) <= 0) return;
 
-    echo addForm($PHP_SELF, 'POST', 'addrbook').
+    echo addForm($PHP_SELF, 'post', 'addrbook').
          addHidden('html_addr_search_done', 'true');
     addr_insert_hidden();
     $line = 0;
@@ -92,11 +92,11 @@ if ($javascript_on) {
         "}\n" .
         "//-->\n" .
         "</script>\n";
-    $chk_all = '<a href="#" onClick="CheckAll(\'T\');">' . _("All") . '</a>&nbsp;<font color="'.$color[9].'">'._("To").'</font>'.
+    $chk_all = '<a href="#" onclick="CheckAll(\'T\');">' . _("All") . '</a>&nbsp;<font color="'.$color[9].'">'._("To").'</font>'.
             '&nbsp;&nbsp;'.
-            '<a href="#" onClick="CheckAll(\'C\');">' . _("All") . '</a>&nbsp;<font color="'.$color[9].'">'._("Cc").'</font>'.
+            '<a href="#" onclick="CheckAll(\'C\');">' . _("All") . '</a>&nbsp;<font color="'.$color[9].'">'._("Cc").'</font>'.
             '&nbsp;&nbsp;'.
-            '<a href="#" onClick="CheckAll(\'B\');">' . _("All") . '</a>';
+            '<a href="#" onclick="CheckAll(\'B\');">' . _("All") . '</a>';
     }
     echo html_tag( 'table', '', 'center', '', 'border="0" width="98%"' ) .
     html_tag( 'tr', '', '', $color[9] ) .
@@ -120,7 +120,7 @@ if ($javascript_on) {
         }
         if ($squirrelmail_language == 'ja_JP')
             {
-        echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
+        echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) .
         html_tag( 'td',
              '<input type="checkbox" name="send_to_search[T' . $line . ']" value = "' .
              htmlspecialchars($email) . '" />&nbsp;' . _("To") . '&nbsp;' .
@@ -128,12 +128,12 @@ if ($javascript_on) {
              htmlspecialchars($email) . '" />&nbsp;' . _("Cc") . '&nbsp;' .
              '<input type="checkbox" name="send_to_search[B' . $line . ']" value = "' .
              htmlspecialchars($email) . '" />&nbsp;' . _("Bcc") . '&nbsp;' ,
-        'center', '', 'width="5%" nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['lastname']) . ' ' . htmlspecialchars($row['firstname']) . '&nbsp;', 'left', '', 'nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['label']) . '&nbsp;', 'left', '', 'nowrap' );
+        'center', '', 'width="5%" style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['lastname']) . ' ' . htmlspecialchars($row['firstname']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['label']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' );
             } else {
-        echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
+        echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) .
         html_tag( 'td',
             addCheckBox('send_to_search[T'.$line.']', FALSE, $email).
             '&nbsp;' . _("To") . '&nbsp;' .
@@ -141,14 +141,14 @@ if ($javascript_on) {
             '&nbsp;' . _("Cc") . '&nbsp;' .
             addCheckBox('send_to_search[B'.$line.']', FALSE, $email).
             '&nbsp;' . _("Bcc") . '&nbsp;' ,
-        'center', '', 'width="5%" nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']) . '&nbsp;', 'left', '', 'nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['label']) . '&nbsp;', 'left', '', 'nowrap' );
+        'center', '', 'width="5%" style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['label']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' );
             }
 
          if ($includesource) {
-             echo html_tag( 'td', '&nbsp;' . $row['source'] . '&nbsp;', 'left', '', 'nowrap' );
+             echo html_tag( 'td', '&nbsp;' . $row['source'] . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' );
          }
          echo "</tr>\n";
          $line ++;
@@ -189,7 +189,7 @@ html_tag( 'table',
 echo '<center>' .
     html_tag( 'table', '', 'center', '', 'border="0"' ) .
     html_tag( 'tr' ) .
-    html_tag( 'td', '', 'left', '', 'nowrap valign="middle"' ) . "\n" .
+    html_tag( 'td', '', 'left', '', 'style="white-space: nowrap;" valign="middle"' ) . "\n" .
     addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f').
     "\n<center>\n" .
     '  <nobr><strong>' . _("Search for") . "</strong>\n";
@@ -293,7 +293,7 @@ else {
 if ($addrquery == '' || sizeof($res) == 0) {
     /* printf('<center><form method="post" name="k" action="compose.php">'."\n", $PHP_SELF); */
     echo '<center>'.
-        addForm('compose.php','POST','k');
+        addForm('compose.php','post','k');
     addr_insert_hidden();
     echo '<input type="submit" value="' . _("Return") . '" name="return" />' . "\n" .
          '</form></center></nobr>';
diff --git a/src/addressbook.php b/src/addressbook.php
index 09a5a41b..853b01a7 100644
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -320,9 +320,9 @@ if ($showaddrlist) {
                             '&nbsp;' ,
                             'center', '', 'valign="top" width="1%"' );
                 }
-                echo html_tag( 'td', '&nbsp;' . $row['nickname'] . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap' ) .
-                    html_tag( 'td', '&nbsp;' . $row['lastname'] . ' ' . $row['firstname'] . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap' ) .
-                    html_tag( 'td', '', 'left', '', 'valign="top" width="1%" nowrap' ) . '&nbsp;';
+                echo html_tag( 'td', '&nbsp;' . $row['nickname'] . '&nbsp;', 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' ) .
+                    html_tag( 'td', '&nbsp;' . $row['lastname'] . ' ' . $row['firstname'] . '&nbsp;', 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' ) .
+                    html_tag( 'td', '', 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' ) . '&nbsp;';
             } else {
                 echo html_tag( 'tr', '', '', $tr_bgcolor);
                 if ($abook->backends[$row['backend']]->writeable) {
@@ -336,9 +336,9 @@ if ($showaddrlist) {
                             '&nbsp;' ,
                             'center', '', 'valign="top" width="1%"' );
                 }
-                echo html_tag( 'td', '&nbsp;' . $row['nickname'] . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap' ) .
-                    html_tag( 'td', '&nbsp;' . $row['name'] . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap' ) .
-                    html_tag( 'td', '', 'left', '', 'valign="top" width="1%" nowrap' ) . '&nbsp;';
+                echo html_tag( 'td', '&nbsp;' . $row['nickname'] . '&nbsp;', 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' ) .
+                    html_tag( 'td', '&nbsp;' . $row['name'] . '&nbsp;', 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' ) .
+                    html_tag( 'td', '', 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' ) . '&nbsp;';
             }
             $email = $abook->full_address($row);
             echo makeComposeLink('src/compose.php?send_to='.rawurlencode($email),
diff --git a/src/folders.php b/src/folders.php
index f64c5bbe..9ac8316e 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -99,7 +99,7 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspaci
             ) .
             html_tag( 'tr' ) .
                 html_tag( 'td', '', 'center', $color[0] ) .
-     addForm('folders_create.php', 'POST', 'cf').
+     addForm('folders_create.php', 'post', 'cf').
      addInput('folder_name', '', 25).
      "<br />\n". _("as a subfolder of"). '<br />'.
      "<tt><select name=\"subfolder\">\n";
diff --git a/src/left_main.php b/src/left_main.php
index 031cc486..a6a22990 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -378,10 +378,10 @@ function ListBoxes ($boxes, $j=0 ) {
             $pre .= '<b>';
         }
         $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
+        $end .= '</a>';
         if ($unseen > 0) {
             $end .= '</b>';
         }
-        $end .= '</a>';
         if ($boxes->total > 0) {
             if ($unseen > 0) {
                 $pre .= '<b>';
@@ -404,10 +404,10 @@ function ListBoxes ($boxes, $j=0 ) {
                 $pre .= '<b>';
             }
             $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
+            $end .= '</a>';
             if ($unseen > 0) {
                 $end .= '</b>';
             }
-            $end .= '</a>';
         }
         /* Print unseen information. */
         if ($unseen_found) {
@@ -1008,7 +1008,7 @@ if ($date_format != 6) {
 }
 
 /* Next, display the refresh button. */
-echo '<div style="white-space:nowrap"><small>[<a href="../src/left_main.php" target="left">'.
+echo '<div style="white-space: nowrap;"><small>[<a href="../src/left_main.php" target="left">'.
      _("Check mail") . '</a>]</small></div></td></tr></table><br />';
 
 /* Lastly, display the folder list. */
@@ -1121,4 +1121,4 @@ sqimap_logout($imapConnection);
 
 ?>
 </td></tr></table>
-</div></body></html>
\ No newline at end of file
+</body></html>
\ No newline at end of file
diff --git a/src/options.php b/src/options.php
index a25c7c98..68457c1a 100644
--- a/src/options.php
+++ b/src/options.php
@@ -407,12 +407,10 @@ if ($optpage == SMOPT_PAGE_MAIN) {
 /* If we are not looking at the main option page, display the page here. */
 /*************************************************************************/
 } else {
-    echo addForm('options.php', 'POST', 'f')
+    echo addForm('options.php', 'post', 'f')
        . create_optpage_element($optpage)
        . create_optmode_element(SMOPT_MODE_SUBMIT)
-       . html_tag( 'table', '', '', '', 'width="100%" cellpadding="2" cellspacing="0" border="0"' ) . "\n"
-       . html_tag( 'tr' ) . "\n"
-       . html_tag( 'td', '', 'left' ) . "\n";
+       . html_tag( 'table', '', '', '', 'width="100%" cellpadding="2" cellspacing="0" border="0"' ) . "\n";
 
     /* Output the option groups for this page. */
     print_option_groups($optpage_data['options']);
@@ -457,7 +455,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
 
     /* Spit out a submit button. */
     OptionSubmit($submit_name);
-    echo '</td></tr></table></form>';
+    echo '</table></form>';
 
     /* If it is not empty, trigger the bottom hook. */
     if ($bottom_hook_name != '') {
diff --git a/src/options_highlight.php b/src/options_highlight.php
index 5822f889..1cb1c7e1 100644
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -163,7 +163,7 @@ if ($mhl_count > 0) {
         echo html_tag( 'tr',
                     html_tag( 'td',
                         $links,
-                    'left', $color[4], 'width="20%" nowrap' ) .
+                    'left', $color[4], 'width="20%" style="white-space: nowrap;"' ) .
                     html_tag( 'td',
                         htmlspecialchars($message_highlight_list[$i]['name']) ,
                     'left' ) .
@@ -361,14 +361,14 @@ if ($action == 'edit' || $action == 'add') {
     else if ($selected_choose == '')
         $selected_input = TRUE;
 
-    echo addForm('options_highlight.php', 'POST', 'f').
+    echo addForm('options_highlight.php', 'post', 'f').
          addHidden('action', 'save');
     if($action == 'edit') {
         echo addHidden('theid', (isset($theid)?$theid:''));
     }
     echo html_tag( 'table', '', 'center', '', 'width="80%" cellpadding="3" cellspacing="0" border="0"' ) . "\n";
     echo html_tag( 'tr', '', '', $color[0] ) . "\n";
-    echo html_tag( 'td', '', 'right', '', 'nowrap' ) . "<b>\n";
+    echo html_tag( 'td', '', 'right', '', 'style="white-space: nowrap;"' ) . "<b>\n";
     echo _("Identifying name") . ":";
     echo '      </b></td>' . "\n";
     echo html_tag( 'td', '', 'left' ) . "\n";
diff --git a/src/options_identities.php b/src/options_identities.php
index a8cbbb67..83f6db57 100644
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -300,7 +300,7 @@ if (!empty($_POST)) {
 
 function sti_input( $title, $hd, $data, $post, $bg ) {
     $return_val = html_tag( 'tr',
-                           html_tag( 'td', $title . ':', 'right', '', 'nowrap' ) .
+                           html_tag( 'td', $title . ':', 'right', '', 'style="white-space: nowrap;"' ) .
                            html_tag( 'td', '<input size="50" type="text" value="' . htmlspecialchars($data) . '" name="' . $hd . $post . '" />' , 'left' ) ,
                        '', $bg );
      return ($return_val);
@@ -308,7 +308,7 @@ function sti_input( $title, $hd, $data, $post, $bg ) {
 
 function sti_textarea( $title, $hd, $data, $post, $bg ) {
     $return_val = html_tag( 'tr',
-                           html_tag( 'td', $title . ':', 'right', '', 'nowrap' ) .
+                           html_tag( 'td', $title . ':', 'right', '', 'style="white-space: nowrap;"' ) .
                            html_tag( 'td', '<textarea cols="50" rows="5" name="' . $hd . $post . '">' . htmlspecialchars($data) . '</textarea>' , 'left' ) ,
                        '', $bg );
      return ($return_val);
diff --git a/src/right_main.php b/src/right_main.php
index ea29fdac..9bfe326d 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -177,7 +177,7 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
         session_write_close();
         sqsession_is_active();
         $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
-                    '&session='.$aMailbox['FORWARD_SESSION'];
+                    '&amp;session='.$aMailbox['FORWARD_SESSION'];
         displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
     } else {
         // save mailboxstate
@@ -185,7 +185,7 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
         session_write_close();
         // we have to redirect to the compose page
         $location = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
-                    '&session='.$aMailbox['FORWARD_SESSION'];
+                    '&amp;session='.$aMailbox['FORWARD_SESSION'];
         header("Location: $location");
         exit;
     }
-- 
2.25.1