From: jervfors <jervfors@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 15 Aug 2004 01:02:58 +0000 (+0000)
Subject: XHTML fixes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6fd953618853477f6ffe569ce3c9733ca9f9c2d0;p=squirrelmail.git

XHTML fixes


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

diff --git a/doc/plugin.txt b/doc/plugin.txt
index 938edb21..e2aca7b9 100644
--- a/doc/plugin.txt
+++ b/doc/plugin.txt
@@ -858,7 +858,7 @@ name):
       should always set "optpage" as a POST or GET variable with a string that
       uniquely identifies your plugin:
 
-         <input type="hidden" name="optpage" value="plugin_demo">
+         <input type="hidden" name="optpage" value="plugin_demo" />
 
       Now in your demo_save_options_do() function, do something like this:
 
@@ -981,7 +981,7 @@ files.
 
       So, even in the HTML segments of your plugin files, you need to do this:
 
-         <input type="submit" value="<?php echo _("Submit") ?>">
+         <input type="submit" value="<?php echo _("Submit"); ?>" />
 
       You can put any text you want inside of the quotes (you MUST use double
       quotes!), including HTML tags, etc.  What you should think carefully 
diff --git a/functions/addressbook.php b/functions/addressbook.php
index ab6b187b..18cf590c 100644
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -118,7 +118,7 @@ function addressbook_init($showerr = true, $onlylocal = false) {
                 $r = $abook->add_backend('ldap_server', $param);
                 if (!$r && $showerr) {
                     printf( '&nbsp;' . _("Error initializing LDAP server %s:") .
-                            "<BR>\n", $param['host']);
+                            "<br />\n", $param['host']);
                     echo '&nbsp;' . $abook->error;
                     exit;
                 }
@@ -251,7 +251,7 @@ class AddressBook {
                 if (is_array($res)) {
                     $ret = array_merge($ret, $res);
                 } else {
-                    $this->error .= "<br>\n" . $backend->error;
+                    $this->error .= "<br />\n" . $backend->error;
                     $failed++;
                 }
             }
@@ -267,7 +267,7 @@ class AddressBook {
 
             $ret = $this->backends[$bnum]->search($expression);
             if (!is_array($ret)) {
-                $this->error .= "<br>\n" . $this->backends[$bnum]->error;
+                $this->error .= "<br />\n" . $this->backends[$bnum]->error;
                 $ret = FALSE;
             }
         }
diff --git a/functions/file_prefs.php b/functions/file_prefs.php
index a6cfc6d8..c19420a4 100644
--- a/functions/file_prefs.php
+++ b/functions/file_prefs.php
@@ -198,9 +198,9 @@ function checkForPrefs($data_dir, $username, $filename = '') {
         /* Otherwise, report an error. */
         $errTitle = sprintf( _("Error opening %s"), $default_pref );
         if (!is_readable($default_pref)) {
-            $errString = $errTitle . "<br>\n" .
-                         _("Default preference file not found or not readable!") . "<br>\n" .
-                         _("Please contact your system administrator and report this error.") . "<br>\n";
+            $errString = $errTitle . "<br />\n" .
+                         _("Default preference file not found or not readable!") . "<br />\n" .
+                         _("Please contact your system administrator and report this error.") . "<br />\n";
             logout_error( $errString, $errTitle );
             exit;
         } else if (!@copy($default_pref, $filename)) {
@@ -209,10 +209,10 @@ function checkForPrefs($data_dir, $username, $filename = '') {
                 $user_data = posix_getpwuid(posix_getuid());
                 $uid = $user_data['name'];
             }
-            $errString = $errTitle . '<br>' .
-                       _("Could not create initial preference file!") . "<br>\n" .
+            $errString = $errTitle . '<br />' .
+                       _("Could not create initial preference file!") . "<br />\n" .
                        sprintf( _("%s should be writable by user %s"), $data_dir, $uid ) .
-                       "<br>\n" . _("Please contact your system administrator and report this error.") . "<br>\n";
+                       "<br />\n" . _("Please contact your system administrator and report this error.") . "<br />\n";
             logout_error( $errString, $errTitle );
             exit;
         }
@@ -270,3 +270,4 @@ function getSig($data_dir, $username, $number) {
 }
 
 // vim: et ts=4
+?>
\ No newline at end of file
diff --git a/functions/imap_asearch.php b/functions/imap_asearch.php
index 49c270f2..98f2407b 100644
--- a/functions/imap_asearch.php
+++ b/functions/imap_asearch.php
@@ -125,16 +125,16 @@ function sqimap_asearch_error_box($response, $query, $message, $link = '')
     else {	//Straight copy of 1.5 imap_general.php:sqimap_error_box(). Can be removed at a later time
         global $color;
     require_once(SM_PATH . 'functions/display_messages.php');
-    $string = "<font color=$color[2]><b>\n" . $title . "</b><br>\n";
+    $string = "<font color=\"$color[2]\"><b>\n" . $title . "</b><br />\n";
     if ($query != '')
-        $string .= _("Query:") . ' ' . htmlspecialchars($query) . '<br>';
+        $string .= _("Query:") . ' ' . htmlspecialchars($query) . '<br />';
     if ($message_title != '')
         $string .= $message_title;
     if ($message != '')
         $string .= htmlspecialchars($message);
     if ($link != '')
         $string .= $link;
-    $string .= "</font><br>\n";
+    $string .= "</font><br />\n";
     error_box($string,$color);
     }
 }
@@ -524,4 +524,4 @@ function sqimap_asearch($imapConnection, &$mailbox_array, &$biop_array, &$unop_a
     return ($mbox_search);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/functions/imap_general.php b/functions/imap_general.php
index a82b35bd..81673749 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -53,7 +53,7 @@ function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$respon
         global $squirrelmail_language, $color;
         set_up_language($squirrelmail_language);
         require_once(SM_PATH . 'functions/display_messages.php');
-        $string = "<b><font color=$color[2]>\n" .
+        $string = "<b><font color=\"$color[2]\">\n" .
                 _("ERROR : No available imapstream.") .
                 "</b></font>\n";
         error_box($string,$color);
@@ -90,7 +90,7 @@ function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response,
         global $squirrelmail_language, $color;
         set_up_language($squirrelmail_language);
         require_once(SM_PATH . 'functions/display_messages.php');
-        $string = "<b><font color=$color[2]>\n" .
+        $string = "<b><font color=\"$color[2]\">\n" .
                 _("ERROR : No available imapstream.") .
                 "</b></font>\n";
         error_box($string,$color);
@@ -258,16 +258,16 @@ function sqimap_read_data_list($imap_stream, $tag, $handle_errors,
     global $color, $squirrelmail_language;
     set_up_language($squirrelmail_language);
     require_once(SM_PATH . 'functions/display_messages.php');
-    $string = "<b><font color=$color[2]>\n" .
+    $string = "<b><font color=\"$color[2]\">\n" .
         _("ERROR : Bad function call.") .
-        "</b><br>\n" .
+        "</b><br />\n" .
         _("Reason:") . ' '.
-          'There is a plugin installed which make use of the  <br>' .
-          'SquirrelMail internal function sqimap_read_data_list.<br>'.
-          'Please adapt the installed plugin and let it use<br>'.
-          'sqimap_run_command or sqimap_run_command_list instead<br><br>'.
-          'The following query was issued:<br>'.
-           htmlspecialchars($query) . '<br>' . "</font><br>\n";
+          'There is a plugin installed which make use of the  <br />' .
+          'SquirrelMail internal function sqimap_read_data_list.<br />'.
+          'Please adapt the installed plugin and let it use<br />'.
+          'sqimap_run_command or sqimap_run_command_list instead<br /><br />'.
+          'The following query was issued:<br />'.
+           htmlspecialchars($query) . '<br />' . "</font><br />\n";
     error_box($string,$color);
     echo '</body></html>';
     exit;
@@ -288,17 +288,17 @@ function sqimap_error_box($title, $query = '', $message_title = '', $message = '
 
     set_up_language($squirrelmail_language);
     require_once(SM_PATH . 'functions/display_messages.php');
-    $string = "<font color=$color[2]><b>\n" . $title . "</b><br>\n";
+    $string = "<font color=\"$color[2]\"><b>\n" . $title . "</b><br />\n";
     $cmd = explode(' ',$query);
     $cmd= strtolower($cmd[0]);
 
     if ($query != '' &&  $cmd != 'login')
-        $string .= _("Query:") . ' ' . htmlspecialchars($query) . '<br>';
+        $string .= _("Query:") . ' ' . htmlspecialchars($query) . '<br />';
     if ($message_title != '')
         $string .= $message_title;
     if ($message != '')
         $string .= htmlspecialchars($message);
-    $string .= "</font><br>\n";
+    $string .= "</font><br />\n";
     if ($link != '')
         $string .= $link;
     error_box($string,$color);
@@ -556,9 +556,9 @@ function sqimap_create_stream($server,$port,$tls=false) {
             $server = 'tls://' . $server;
         } else {
             require_once(SM_PATH . 'functions/display_messages.php');
-            $string = "Unable to connect to IMAP server!<br>TLS is enabled, but this " .
+            $string = "Unable to connect to IMAP server!<br />TLS is enabled, but this " .
               "version of PHP does not support TLS sockets, or is missing the openssl " .
-              "extension.<br><br>Please contact your system administrator.";
+              "extension.<br /><br />Please contact your system administrator.";
             logout_error($string,$color);
         }
     }
@@ -570,8 +570,8 @@ function sqimap_create_stream($server,$port,$tls=false) {
         set_up_language($squirrelmail_language, true);
         require_once(SM_PATH . 'functions/display_messages.php');
         $string = sprintf (_("Error connecting to IMAP server: %s.") .
-           "<br>\r\n", $server) .
-           "$error_number : $error_string<br>\r\n";
+           "<br />\r\n", $server) .
+           "$error_number : $error_string<br />\r\n";
         logout_error($string,$color);
         exit;
     }
@@ -694,14 +694,14 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $
                 set_up_language($squirrelmail_language, true);
                 require_once(SM_PATH . 'functions/display_messages.php');
                 if ($response == 'BAD') {
-                    $string = sprintf (_("Bad request: %s")."<br>\r\n", $message);
+                    $string = sprintf (_("Bad request: %s")."<br />\r\n", $message);
                 } else {
-                    $string = sprintf (_("Unknown error: %s") . "<br>\n", $message);
+                    $string = sprintf (_("Unknown error: %s") . "<br />\n", $message);
                 }
                 if (isset($read) && is_array($read)) {
-                    $string .= '<br>' . _("Read data:") . "<br>\n";
+                    $string .= '<br />' . _("Read data:") . "<br />\n";
                     foreach ($read as $line) {
-                        $string .= htmlspecialchars($line) . "<br>\n";
+                        $string .= htmlspecialchars($line) . "<br />\n";
                     }
                 }
                 error_box($string,$color);
@@ -945,24 +945,24 @@ function sqimap_append_done ($imap_stream, $folder='') {
         require_once(SM_PATH . 'functions/display_messages.php');
         $reason = $regs[3];
         if ($regs[2] == 'NO') {
-           $string = "<b><font color=$color[2]>\n" .
+           $string = "<b><font color=\"$color[2]\">\n" .
                   _("ERROR : Could not append message to") ." $folder." .
-                  "</b><br>\n" .
+                  "</b><br />\n" .
                   _("Server responded: ") .
-                  $reason . "<br>\n";
+                  $reason . "<br />\n";
            if (preg_match("/(.*)(quota)(.*)$/i", $reason, $regs)) {
               $string .= _("Solution: ") .
             _("Remove unneccessary messages from your folder and start with your Trash folder.")
-              ."<br>\n";
+              ."<br />\n";
            }
            $string .= "</font>\n";
            error_box($string,$color);
         } else {
-           $string = "<b><font color=$color[2]>\n" .
+           $string = "<b><font color=\"$color[2]\">\n" .
                   _("ERROR : Bad or malformed request.") .
-                  "</b><br>\n" .
+                  "</b><br />\n" .
                   _("Server responded: ") .
-                  $tmp . "</font><br>\n";
+                  $tmp . "</font><br />\n";
            error_box($string,$color);
            exit;
         }
@@ -988,4 +988,4 @@ function map_yp_alias($username) {
    return chop(substr($yp, strlen($username)+1));
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 2bcb1478..e7b456e2 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -484,7 +484,7 @@ function sqimap_mailbox_parse ($line, $line_lsub) {
 /**
  * Returns list of options (to be echoed into select statement
  * based on available mailboxes and separators
- * Caller should surround options with <SELECT..> </SELECT> and
+ * Caller should surround options with <select ...> </select> and
  * any formatting.
  *   $imap_stream - $imapConnection to query for mailboxes
  *   $show_selected - array containing list of mailboxes to pre-select (0 if none)
diff --git a/functions/options.php b/functions/options.php
index 5ae717a0..dd64ca8e 100644
--- a/functions/options.php
+++ b/functions/options.php
@@ -521,9 +521,9 @@ function print_option_groups($option_groups) {
 
 function OptionSubmit( $name ) {
         echo html_tag( 'tr',
-                   html_tag( 'td', '<input type="submit" value="' . _("Submit") . '" name="' . $name . '">&nbsp;&nbsp;&nbsp;&nbsp;', 'right', '', 'colspan="2"' )
+                   html_tag( 'td', '<input type="submit" value="' . _("Submit") . '" name="' . $name . '" />&nbsp;&nbsp;&nbsp;&nbsp;', 'right', '', 'colspan="2"' )
                 ) . "\n";
 }
 
 // vim: et ts=4
-?>
+?>
\ No newline at end of file
diff --git a/functions/prefs.php b/functions/prefs.php
index ed4c8de0..79416cba 100644
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -115,9 +115,9 @@ function getHashedDir($username, $dir, $hash_dirs = '') {
         $real_hash_dir .= '/' . $hash_dirs[$h];
         if (!@is_dir($real_hash_dir)) {
             if (!@mkdir($real_hash_dir, 0770)) {
-                echo sprintf(_("Error creating directory %s."), $real_hash_dir) . '<br>' .
-                     _("Could not create hashed directory structure!") . "<br>\n" .
-                     _("Please contact your system administrator and report this error.") . "<br>\n";
+                echo sprintf(_("Error creating directory %s."), $real_hash_dir) . '<br />' .
+                     _("Could not create hashed directory structure!") . "<br />\n" .
+                     _("Please contact your system administrator and report this error.") . "<br />\n";
                 exit;
             }
         }
diff --git a/functions/tree.php b/functions/tree.php
index 5e5c8703..e4f39977 100644
--- a/functions/tree.php
+++ b/functions/tree.php
@@ -175,9 +175,9 @@ function simpleWalkTreePre($index, $tree) {
         for ($j = 0; $j < count($tree[$index]['subNodes']); $j++) {
             simpleWalkTreePre($tree[$index]['subNodes'][$j], $tree);
         }
-        echo $tree[$index]['value'] . '<br>';
+        echo $tree[$index]['value'] . '<br />';
     } else {
-        echo $tree[$index]['value'] . '<br>';
+        echo $tree[$index]['value'] . '<br />';
     }
 }
 ?>
\ No newline at end of file
diff --git a/help/en_US/FAQ.hlp b/help/en_US/FAQ.hlp
index 1415974c..47cc2db2 100644
--- a/help/en_US/FAQ.hlp
+++ b/help/en_US/FAQ.hlp
@@ -16,7 +16,7 @@
       <p>
       Yes.  The address book search will display all matches for the 
       search criteria entered in the search box.  If 10 names are displayed 
-      any combination may be selected for either the <B>To:</B> or <B>CC:</B> 
+      any combination may be selected for either the <b>To:</b> or <b>CC:</b> 
       fields.  All selected addresses will be inserted into the proper 
       field when the Use Address button is pressed.
       </p>
@@ -99,7 +99,7 @@
    <description>
       <p>
       SquirrelMail uses the IMAP protocol, info on it can be found 
-      <A HREF="http://imap.org"/>here</A>.  The program also uses 
+      <a href="http://imap.org"/>here</a>.  The program also uses 
       its own IMAP functions, not those built in to PHP4.  This won't 
       matter to anybody except those responsible for installing it, 
       but trust us when we say they appreciate it.
diff --git a/help/en_US/addresses.hlp b/help/en_US/addresses.hlp
index d128ed27..99d10cf5 100644
--- a/help/en_US/addresses.hlp
+++ b/help/en_US/addresses.hlp
@@ -107,7 +107,7 @@
       stored and made available.  If configured to use the universities 
       LDAP server, SquirrelMail would then be able to list all campus email 
       address (along with the other address book fields if available).  
-      SquirrelMail's LDAP use is truly powerful in that it <I>combines</I> 
+      SquirrelMail's LDAP use is truly powerful in that it <i>combines</i> 
       your local address book and the LDAP address server information to 
       present all of the information as if it was a single address book.
       </p><p>
diff --git a/help/en_US/basic.hlp b/help/en_US/basic.hlp
index 0d852bd4..ba44e6cb 100644
--- a/help/en_US/basic.hlp
+++ b/help/en_US/basic.hlp
@@ -8,11 +8,11 @@
    </summary>
    <description>
       <p>
-      So what exactly is <A HREF="http://www.squirrelmail.org/index.php3?from=1">SquirrelMail</A>?
-      It's a web interface to email that's written in <A HREF="http://www.php.net">PHP4</A>.
+      So what exactly is <a href="http://www.squirrelmail.org/index.php3?from=1">SquirrelMail</a>?
+      It's a web interface to email that's written in <a href="http://www.php.net">PHP4</a>.
       It was designed to allow email access through your server from 
       anywhere in the world via the Web.  More information about exactly 
-      how it does this and the IMAP protocol can be found <A HREF="http://imap.org">here</A>.
+      how it does this and the IMAP protocol can be found <a href="http://imap.org">here</a>.
       </p>
    </description>
 </chapter>   
diff --git a/help/en_US/compose.hlp b/help/en_US/compose.hlp
index 385866e6..d11f63bd 100644
--- a/help/en_US/compose.hlp
+++ b/help/en_US/compose.hlp
@@ -21,7 +21,7 @@
       From
    </title>
    <description>
-      <p>The <B>From:</B> field will only be displayed if you have enabled multiple
+      <p>The <b>From:</b> field will only be displayed if you have enabled multiple
       identities (through the Options, Personal Preferences menu). If you've done
       so you can choose which identity you want to use, i.e. which name and
       email address appear as the From-line of your message.
@@ -35,7 +35,7 @@
    </title>
    <description>
       <p>
-      Next is the <B>To:</B> field.  In this field you should 
+      Next is the <b>To:</b> field.  In this field you should 
       enter the email address of the person or persons you are sending a 
       message to.  You may enter as many addresses as you like, separating 
       them with a comma.  One may also press the "Addresses" button to fill 
@@ -52,14 +52,14 @@
    </title>
    <description>
       <p>
-      Next is the <B>CC:</B> field.  CC is an abbreviation for <B>C</B>arbon 
-      <B>C</B>opy.  If you wish to send someone else a copy of the message 
+      Next is the <b>CC:</b> field.  CC is an abbreviation for <b>C</b>arbon 
+      <b>C</b>opy.  If you wish to send someone else a copy of the message 
       here is where you would do that.  Think of this in the same way a memo 
-      is laid out.  You can have as many people as you like in the <B>To:</B>, 
-      <B>CC:</B>, and <B>BCC:</B> fields.  Only the people to whom the message 
-      has direct impact would be in the <B>To:</B> field while recipients to 
-      whom this is possibly only informative would be in the <B>CC:</B> and 
-      <B>BCC:</B> fields.
+      is laid out.  You can have as many people as you like in the <b>To:</b>, 
+      <b>CC:</b>, and <b>BCC:</b> fields.  Only the people to whom the message 
+      has direct impact would be in the <b>To:</b> field while recipients to 
+      whom this is possibly only informative would be in the <b>CC:</b> and 
+      <b>BCC:</b> fields.
       </p>
    </description>
 </section>
@@ -70,9 +70,9 @@
    </title>
    <description>
       <p>
-      BCC is an abbreviation for <B>B</B>lind <B>C</B>arbon <B>C</B>opy.
-      Use this to send someone a copy of the email <I>without</I> the 
-      recipients in the <B>To:</B> or <B>CC:</B> fields knowing about it.
+      BCC is an abbreviation for <b>B</b>lind <b>C</b>arbon <b>C</b>opy.
+      Use this to send someone a copy of the email <i>without</i> the 
+      recipients in the <b>To:</b> or <b>CC:</b> fields knowing about it.
       </p>
    </description>
 </section>
@@ -157,7 +157,7 @@
       <p>
       Located at the bottom of the Compose page, this feature allows you to 
       include a file with your email.  The file must be located on your 
-      <I>local</I> machine or network to be attached.  A browse button is 
+      <i>local</i> machine or network to be attached.  A browse button is 
       present so you may search through your directory structure and click 
       on the file to include.  Alternatively you may type directly into the 
       attach field if you know the full path and exact file name.  Simply 
diff --git a/help/en_US/folders.hlp b/help/en_US/folders.hlp
index 6f0c8678..0201c30e 100644
--- a/help/en_US/folders.hlp
+++ b/help/en_US/folders.hlp
@@ -27,7 +27,7 @@
       </p><p>
       The first folder listed contains received mail.  To the 
       right of the first folder is a number in parentheses
-      "( )" reflecting the count of <I>unread</I> emails.
+      "( )" reflecting the count of <i>unread</i> emails.
       This number is likely to vary from the total number 
       of emails displayed in the right frame.  Under the main 
       folder are likely to be other folders or subfolders.
@@ -44,7 +44,7 @@
    <description>
       <p>
       You may delete any folder displayed in the drop down list box to 
-      the left of the Delete button.  Notice that this list may <B>not</B> 
+      the left of the Delete button.  Notice that this list may <b>not</b> 
       include all the folders displayed.  The special folders such as 
       your sent or your trash folder cannot be deleted, and of course,
       you cannot delete INBOX.
@@ -82,7 +82,7 @@
    <description>
       <p>
       You may rename any folder displayed in the drop down list box to the 
-      left of the Rename button.  Notice that this list may <B>not</B> 
+      left of the Rename button.  Notice that this list may <b>not</b> 
       include all the folders displayed in the left frame.  For obvious
       reasons, you cannot rename the sent, trash, or INBOX folders.
       </p>
@@ -94,12 +94,12 @@
       Unsubscribe and Subscribe
    </title>
    <description>
-      Definitions:<br>
+      Definitions:<br />
       <i>Subscribe</i>: To register a folder with the mail server, allowing 
-                        you to view it in the folder listings.<br>
+                        you to view it in the folder listings.<br />
       <i>Unsubscribe</i>: The opposite of subscribing.  This unregisters a
-                        folder with the mail server.<br>
-      <br><p>
+                        folder with the mail server.<br />
+      <br /><p>
       You may choose as many folders as you wish from either the subscribe
       or the unsubscribe box, then click the button under the box to make
       the action take effect.  You will notice that the folders move to the
diff --git a/help/en_US/main_folder.hlp b/help/en_US/main_folder.hlp
index 8dc5655a..14d9536e 100644
--- a/help/en_US/main_folder.hlp
+++ b/help/en_US/main_folder.hlp
@@ -19,7 +19,7 @@
       menu choice is a line which informs you which mails you are viewing 
       numerically and how many total you have.
       </p><p>
-      For example: Viewing messages <B>20</B> to <B>30</B> (45 total).
+      For example: Viewing messages <b>20</b> to <b>30</b> (45 total).
       </p><p>
       Notice that the total message count might be different from the unread 
       mail count which is to the right of the main mail folder.
@@ -43,12 +43,12 @@
 	  message, and if you see the "!", then the message was marked as urgent!  
       </p><p>
       What remains is the actual message table.  You will notice that unread 
-      messages are <B>bold</B> while viewed messages are in normal text.
+      messages are <b>bold</b> while viewed messages are in normal text.
       Four fields form this table.  On the far left is a select box.  When 
       selected, the message on the same line is subject to the actions previously 
       discussed (moving, marking (un)read and deletion).
       The Toggle All link at the top of the list allows you to check all
-      select boxes at once.<BR>
+      select boxes at once.<br />
       Under the From header is listed whom 
       the message is from.  Surprising, we know. But hey, you don't have to read 
       this.  The date is listed next, and finally the subject.
diff --git a/help/en_US/options.hlp b/help/en_US/options.hlp
index 6374bcfd..f655b05e 100644
--- a/help/en_US/options.hlp
+++ b/help/en_US/options.hlp
@@ -23,58 +23,58 @@
       Personal Information
    </title>
    <description>
-      <b>Full Name</b><br>
+      <b>Full Name</b><br />
       You should put your entire name here.  For example, "John Doe".  This is what is
       shown to people that you send the message to.  They will see that it is from
       "John Doe".  If you don't fill this in, they will see it is from your email address,
       "jdoe@mydomain.org".
-      <br><br>
+      <br /><br />
       
-      <b>E-Mail Address</b><br>
+      <b>E-Mail Address</b><br />
       <i>Optional</i> - If your email address is different than what is automatically
       assigned, you can change it here.
-      <br><br>
+      <br /><br />
       
-      <b>Reply To</b><br>
+      <b>Reply To</b><br />
       <i>Optional</i> - This is the email address that people will reply to when they
       reply to your message.  If this is different than the email address you are sending
       from, you can enter it here.  This is useful if you want people to reply to your
       Yahoo account rather than your office address.
-      <br><br>
+      <br /><br />
       
-      <b>Multiple Identities</b><BR>
+      <b>Multiple Identities</b><br />
       Click this link to edit multiple identities. This is useful if you want to
       choose between different From-lines for different messages (for example
       containing your work or your home emailaddress. On the page that appears,
       you can add as many identities as you like. You will be offered a choice
-      of these when composing a message.<br><br>
+      of these when composing a message.<br /><br />
       
-      <b>Reply Citation</b><BR>
+      <b>Reply Citation</b><br />
       If you press Reply on a message, you will be presented with the Compose
       form with the original message quoted. Before this quoted message, a text
-      like <TT>John Doe wrote:</TT> might be prepended (if the message you're replying
+      like <tt>John Doe wrote:</tt> might be prepended (if the message you're replying
       to originated from John Doe). This is called the citation line. Here you
-      can choose how this line looks.<BR>
-      <UL>
-      <LI><B>No Citation</B><br>
-      Prepends no citation line whatsoever.<br><br>
-      <LI><B>Author Said</B><br>
-      This produces the line: <TT>John Doe Said:</TT> where John Doe will be replaced
-      by whoever the message you're replying to was from.<br><br>
-      <LI><B>Quote Who XML</B><br>
-      This produces the line: <TT>&lt;quote who="John Doe"&gt;</TT>.<br><br>
-      <LI><B>User-Defined</B><br>
+      can choose how this line looks.<br />
+      <ul>
+      <li><b>No Citation</b><br />
+      Prepends no citation line whatsoever.<br /><br />
+      <li><b>Author Said</b><br />
+      This produces the line: <tt>John Doe Said:</tt> where John Doe will be replaced
+      by whoever the message you're replying to was from.<br /><br />
+      <li><b>Quote Who XML</b><br />
+      This produces the line: <tt>&lt;quote who="John Doe"&gt;</tt>.<br /><br />
+      <li><b>User-Defined</b><br />
       Enables you to define your own citation line. In the two text boxes below, you
       can type in the citation start and end. Between these the author name will be
       inserted.
-      </UL><br><br>
+      </ul><br /><br />
       
-      <b>Signature</b><br>
+      <b>Signature</b><br />
       <i>Optional</i> - Signatures are attached at the bottom of all messages you send 
       out.  If you want a signature, you must make sure that the checkbox beside
       "use a signature" is checked, and then fill in what you want your signature to be
       in the box below it.
-      <br><br>
+      <br /><br />
    </description>
 </section>
 
@@ -83,24 +83,24 @@
       Display Preferences
    </title>
    <description>
-      <b>Theme</b><br>
+      <b>Theme</b><br />
       SquirrelMail offers different color themes for your viewing pleasure.  You can
       choose between the many listed there if you so desire.
-      <br><br>
+      <br /><br />
 
-      <b>Custom Stylesheet</b><br>
+      <b>Custom Stylesheet</b><br />
       Changing a theme only changes the colors, a stylesheet may change more, for
       example the font size used by SquirrelMail.
-      <br><br>
+      <br /><br />
 
-      <b>Language</b><br>
+      <b>Language</b><br />
       If English isn't your native tongue, you can easily change the language that
       most things display in.  If your desired language is in the list, you can choose
       it and all future SquirrelMail related messages will be in that language.  Note
       that this doesn't translate incoming email messages or folder names.
-      <br><br>
+      <br /><br />
 
-      <b>Use Javascript</b><br>
+      <b>Use Javascript</b><br />
       One of our main goals in creating SquirrelMail was to have no Javascript in
       any of our pages.  However, some of our developers made a very good address
       book searching utility that uses Javascript. Some other Javascript functions
@@ -108,73 +108,73 @@
       give you the option of using 
       pure HTML or allow Javascript aswell.  If
       you don't know what this means, you are safest to choose Autodetect.
-      <br><br>
+      <br /><br />
       
-      <b>Number of Messages to Index</b><br>
+      <b>Number of Messages to Index</b><br />
       This is the number of messages to show at a time in a folder.  If there are
       more than this number in the folder, you will see a "Previous" and "Next" link
       above and below the listing which will take you to the previous or next
       messages.
-      <br><br>
+      <br /><br />
       
-      <b>Enable Page Selector</b><br>
+      <b>Enable Page Selector</b><br />
       Setting this to Yes shows page numbers above and below the message list to
-      quickly jump to a specific page of messages. The number <B>Maximum pages to show</B>
+      quickly jump to a specific page of messages. The number <b>Maximum pages to show</b>
       can limit how many page numbers will be displayed above and below the
-      message list.<br><br>
+      message list.<br /><br />
       
-      <b>Wrap incoming text at</b><br>
+      <b>Wrap incoming text at</b><br />
       How many characters should we allow before wrapping the text.  This prevents
       messages from scrolling way off the screen.  86 is usually a safe thing to
       put in here, but you are free to change it to whatever you desire.
-      <br><br>
+      <br /><br />
       
-      <b>Size of editor window</b><br>
+      <b>Size of editor window</b><br />
       How wide do you want your "Compose" box to be?  This is the number of characters
       per line that you will be able to type before wrapping in the Compose section.
-      <br><br>
+      <br /><br />
       
-      <b>Location of Buttons when Composing</b><br>
-      Where are the buttons Addresses, Save Draft and Send located?<br><br>
+      <b>Location of Buttons when Composing</b><br />
+      Where are the buttons Addresses, Save Draft and Send located?<br /><br />
       
-      <b>Addressbook Display Format</B><br>
+      <b>Addressbook Display Format</b><br />
       Choose how you want the addressbook to be displayed. If you want maximum
       compatibility with all browsers, use HTML. Select Javascript if you
       know your browser supports it, it will display a nicer addressbook.
-      <br><br>
+      <br /><br />
       
-      <b>Show HTML Version by Default</b><br>
+      <b>Show HTML Version by Default</b><br />
       If a message you receive is in both text and HTML format, you can choose
       if you want to see the HTML version (Yes) or the text version (No) by
-      default.<br><br>
+      default.<br /><br />
       
-      <b>Include Me in CC when I Reply All</b><br>
+      <b>Include Me in CC when I Reply All</b><br />
       Reply All sends your reply to all recepients of the original message,
       including yourself. To leave your own email address out, set this to No.
-      <br><br>
+      <br /><br />
       
-      <b>Enable Mailer Display</b><BR>
+      <b>Enable Mailer Display</b><br />
       When viewing a message, this displays which email program the sender used.
-      <br><br>
+      <br /><br />
       
-      <b>Display Attached Images with Message</b><br>
+      <b>Display Attached Images with Message</b><br />
       If someone sends you a message with one or more images attached and you've
       set this to Yes, the images will be displayed right away when you view
       the message.
-      <br><br>
+      <br /><br />
       
-      <b>Enable Subtle Printer Friendly Link</b><br>
+      <b>Enable Subtle Printer Friendly Link</b><br />
       This determines the way the Printable Version-link will be displayed.
-      <br><br>
+      <br /><br />
       
-      <b>Enable Printer Friendly Clean Display</b><br>
+      <b>Enable Printer Friendly Clean Display</b><br />
       This will clean out the message so the print looks nicer.
-      <br><br>
+      <br /><br />
       
-      <b>Other Options</b><br>
+      <b>Other Options</b><br />
       Depending on the configuration of your SquirrelMail installation, some more
       options might be displayed here. They hopefully should be self-explanatory.
-      <br><br>
+      <br /><br />
       
    </description>
 </section>
@@ -188,30 +188,30 @@
       it is very hard to distinguish which messages came from where while reading
       through the list of messages.  With Message Highlighting, you can have the
       background color of all messages from one mailing list different than the
-      color of another list.<br><br>
+      color of another list.<br /><br />
 
       Just click on [New] to create a new one, or [Edit] to edit an existing one
-      and the options will appear below.<br><br>
+      and the options will appear below.<br /><br />
       
-      <b>Identifying Name</b><br>
+      <b>Identifying Name</b><br />
       This is simply the name that you see which describes what it is.  For
       example, if you are highlighting messages from your mother, you might
       set this to "From Mom".
-      <br><br>
+      <br /><br />
       
-      <b>Color</b><br>
+      <b>Color</b><br />
       This is the actual color that the background will be.  You can choose between
       a number of pre-defined colors that we have selected for you, or you can enter
       the HEX code for the color that you desire (i.e.  a6b492).  If you choose to
       enter your own color, you must also select the radio button in front so that it is
       checked.
-      <br><br>
+      <br /><br />
       
-      <b>Match</b><br>
+      <b>Match</b><br />
       Here you can choose the matching phrase.  From the drop-down box, you can 
       choose which header field to match against (to, from, subject...) and in the
       text box, you can enter the phrase to match (mom@yahoo.com). 
-      <br><br>
+      <br /><br />
    </description>
 </section>
 
@@ -220,48 +220,48 @@
       Folder Preferences
    </title>
    <description>
-      <b>Folder Path</b><br>
+      <b>Folder Path</b><br />
       On some systems this will not be displayed.  If you don't see this option, just
       ignore this.  On other systems, this is quite a necessary feature.  Usually the
       option that is in there is what should be there.  This is the folder in your
       home directory that holds all your email folders.  If you don't understand this,
       just leave it what it is.
-      <br><br>
+      <br /><br />
 
-      <b>Trash Folder</b><br>
+      <b>Trash Folder</b><br />
       You can choose which folder messages will be sent to when you delete them. If
       you don't want deleted messages to go to the trash, set this to "Don't use Trash".
-      <br><br>
+      <br /><br />
       
-      <b>Sent Folder</b><br>
+      <b>Sent Folder</b><br />
       You can choose which folder your sent messages will go to.  If you don't want
       these, just set it to "Don't use Sent".
-      <br><br>
+      <br /><br />
 
-      <b>Draft Folder</b><br>
+      <b>Draft Folder</b><br />
       You can choose which folder the messages you save as draft will go to.
       If you don't want to use this, just set it to "Don't use Drafts".
-      <br><br>
+      <br /><br />
       
-      <b>Location of folder list</b><br>
+      <b>Location of folder list</b><br />
       Determines wether you want the list of folders on the left or right of your
       window.
-      <br><br>
+      <br /><br />
       
-      <b>Width of folder list</b><br>
+      <b>Width of folder list</b><br />
       With this option, you can select how wide the list of folders will be.
       If you have very long folder names or large fonts, it is good to set this
       pretty high.  Otherwise, you should set it low so you don't waste screen space.
-      <br><br>
+      <br /><br />
       
-      <b>Auto refresh folder list</b><br>
+      <b>Auto refresh folder list</b><br />
       SquirrelMail has the functionality to automatically refresh the folder listing
       on the left side of your browser window.  This will also update the number of
       unseen messages that are in each folder.  This is a good way to check for unseen
       messages in the INBOX without having to click on it every time.
-      <br><br>
+      <br /><br />
 
-      <b>Enable Unread Message Notification</b><br>
+      <b>Enable Unread Message Notification</b><br />
       This option specifies how to display unseen messages in the folder listing on the
       right side of your browser window.  If you set this to No Notification, you will
       not be notified of unseen messages.  If you set it to INBOX, when you have new
@@ -269,31 +269,31 @@
       to say how many new messages are in it.  If you set it to All Folders, this 
       behavior will happen on all folders.  If you notice that loading the folder list
       is really slow, you can set this to INBOX or None and that should speed it up.
-      <br><br>
+      <br /><br />
       
-      <b>Unseen message notification type</b><br>
+      <b>Unseen message notification type</b><br />
       When new messages are in a folder, this option tells
       either to only display the number of new messages or also display the
       total number of messages in that folder.
-      <br><br>
+      <br /><br />
       
-      <b>Enable Collapsable Folders</b><br>
+      <b>Enable Collapsable Folders</b><br />
       Collapsable Folders allow you to 'fold' or collapse a folder which contains
       subfolders so the subfolders will not be displayed. You can collapse a
       folder by clicking the "-" next to it and expand it again with the "+" sign.
       Setting this to No disables collapsing.
-      <br><br>
+      <br /><br />
       
-      <b>Show Clock on Folders Panel</b><br>
+      <b>Show Clock on Folders Panel</b><br />
       Choose if you want a clock to be displayed above the folder list and how
       it should look (Y=year, D=day, H=hour, M=minute, S=second). The option
-      <B>Hour Format</B> below gives you the choice of a 12- or 24-hour clock.
-      <br><br>
+      <b>Hour Format</b> below gives you the choice of a 12- or 24-hour clock.
+      <br /><br />
       
-      <b>Memory Search</b><br>
+      <b>Memory Search</b><br />
       If you search a mailbox, the search will be saved for quick access later.
       This defines how many mailbox searches will be saved.
-      <br><br>
+      <br /><br />
       
    </description>
 </section>
@@ -306,7 +306,7 @@
       This section gives you control over the message list. You can choose how
       much information you want in the message list and in what order it should
       be displayed.
-      <br><br>
+      <br /><br />
       Use the Up and Down links to move columns around, Del to remove a column
       from the display and Add to add one.
    </description>
diff --git a/help/en_US/read_mail.hlp b/help/en_US/read_mail.hlp
index d4b2ec3d..866bdc4b 100644
--- a/help/en_US/read_mail.hlp
+++ b/help/en_US/read_mail.hlp
@@ -45,7 +45,7 @@
       Click this link to delete the message being currently viewed.
       All attachments of deleted mail are deleted as well.  You can prevent the 
       loss of attachments by Downloading them first (explained further in
-      this chapter).<BR>
+      this chapter).<br />
       In this context, deleting means that the message will be moved to
       the folder called Trash. If you wish to keep the message afterall, view
       the Trash folder and move the message out.
@@ -171,7 +171,7 @@
       on the file name will either display the attachment or present a 
       download dialog depending on the file type.  If you wish to download
       the file (rather than possibly viewing it), click on the "download" 
-      link on the right side.<BR>
+      link on the right side.<br />
       If your webbrowser supports viewing the attachment file type, another
       link, "view" will be displayed which displays the file in your browser.
       </p>
diff --git a/include/options/personal.php b/include/options/personal.php
index 07b16a3a..952269ae 100644
--- a/include/options/personal.php
+++ b/include/options/personal.php
@@ -118,9 +118,9 @@ function load_optpage_data_personal() {
     );
 
     if ($edit_identity) {
-        $identities_link_value = '<A HREF="options_identities.php">'
+        $identities_link_value = '<a href="options_identities.php">'
                                . _("Edit Advanced Identities")
-                               . '</A> '
+                               . '</a> '
                                . _("(discards changes made on this form so far)");
         $optvals[SMOPT_GRP_CONTACT][] = array(
             'name'    => 'identities_link',
@@ -232,4 +232,4 @@ function save_option_signature($option) {
     setSig($data_dir, $username, 'g', $option->new_value);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index edfacbef..098ef000 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -109,7 +109,7 @@ function drawmonthview() {
             if ( $aday <= $days_in_month && $aday > 0){
                 echo html_tag( 'td', '', 'left', $color[4], 'height="50" valign="top"' ) ."\n".
                      html_tag( 'div', '', 'right' );
-                echo(($cdate==$todayis) ? "<font size=-1 color=$color[1]>[ " . _("TODAY") . " ] " : "<font size=-1>");
+                echo(($cdate==$todayis) ? '<font size="-1" color="'.$color[1].'">[ ' . _("TODAY") . " ] " : '<font size="-1">');
                 echo "<a href=day.php?year=$year&amp;month=$month&amp;day=";
                 echo(($aday<10) ? "0" : "");
                 echo "$aday>$aday</a></font></div>";
@@ -122,7 +122,7 @@ function drawmonthview() {
                 while ($calfoo = each($calendardata[$cdate])) {
                     $calbar = $calendardata[$cdate][$calfoo['key']];
                     $title = '['. $calfoo['key']. '] ' .$calbar['message'];
-                    echo ($calbar['priority']==1) ? "<a href=\"#\" style=\"text-decoration:none; color: $color[1]\" title=\"$title\">$calbar[title]</a><br>\n" : "<a href=\"#\" style=\"text-decoration:none; color: $color[6]\" title=\"$title\">$calbar[title]</a><br>\n";
+                    echo ($calbar['priority']==1) ? "<a href=\"#\" style=\"text-decoration:none; color: $color[1]\" title=\"$title\">$calbar[title]</a><br />\n" : "<a href=\"#\" style=\"text-decoration:none; color: $color[6]\" title=\"$title\">$calbar[title]</a><br />\n";
                     $i=$i+1;
                     if($i==2){
                         break;
@@ -142,17 +142,17 @@ function endcalendar() {
 
     echo html_tag( 'tr' ) ."\n" .
            html_tag( 'td', '', 'left', '', 'colspan="7"' ) ."\n" .
-         "          <FORM NAME=caljump ACTION=\"calendar.php\" METHOD=POST>\n".
-         "          <SELECT NAME=\"year\">\n";
+         "          <form name=\"caljump\" action=\"calendar.php\" method=\"post\">\n".
+         "          <select name=\"year\">\n";
     select_option_year($year);
-    echo "          </SELECT>\n".
-         "          <SELECT NAME=\"month\">\n";
+    echo "          </select>\n".
+         "          <select name=\"month\">\n";
     select_option_month($month);
-    echo "          </SELECT>\n".
-         '         <INPUT TYPE=SUBMIT VALUE="' . _("Go") . "\">\n".
-         "          </FORM>\n".
-         "          </TD></TR>\n".
-         "</TABLE></TD></TR></TABLE>\n";
+    echo "          </select>\n".
+         '          <input type="submit" value="' . _("Go") . "\" />\n".
+         "          </form>\n".
+         "          </td></tr>\n".
+         "</table></td></tr></table>\n";
 }
 
 
diff --git a/plugins/calendar/event_create.php b/plugins/calendar/event_create.php
index e09a63a6..da1e49e9 100644
--- a/plugins/calendar/event_create.php
+++ b/plugins/calendar/event_create.php
@@ -86,52 +86,52 @@ if (isset($_POST['send'])) {
 function show_event_form() {
     global $color, $editor_size, $year, $day, $month, $hour;
 
-    echo "\n<FORM name=eventscreate action=\"event_create.php\" METHOD=POST >\n".
-         "      <INPUT TYPE=hidden NAME=\"year\" VALUE=\"$year\">\n".
-         "      <INPUT TYPE=hidden NAME=\"month\" VALUE=\"$month\">\n".
-         "      <INPUT TYPE=hidden NAME=\"day\" VALUE=\"$day\">\n".
+    echo "\n<form name=\"eventscreate\" action=\"event_create.php\" method=\"post\">\n".
+         "      <input type=\"hidden\" name=\"year\" value=\"$year\" />\n".
+         "      <input type=\"hidden\" name=\"month\" value=\"$month\" />\n".
+         "      <input type=\"hidden\" name=\"day\" value=\"$day\" />\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Start time:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) . "\n" .
-         "      <SELECT NAME=\"event_hour\">\n";
+         "      <select name=\"event_hour\">\n";
     select_option_hour($hour);
-    echo "      </SELECT>\n" .
+    echo "      </select>\n" .
          "      &nbsp;:&nbsp;\n" .
-         "      <SELECT NAME=\"event_minute\">\n";
+         "      <select name=\"event_minute\">\n";
     select_option_minute("00");
-    echo "      </SELECT>\n".
+    echo "      </select>\n".
          "      </td></tr>\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Length:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) . "\n" .
-         "      <SELECT NAME=\"event_length\">\n";
+         "      <select name=\"event_length\">\n";
     select_option_length("0");
-    echo "      </SELECT>\n".
+    echo "      </select>\n".
          "      </td></tr>\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Priority:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) . "\n" .
-         "      <SELECT NAME=\"event_priority\">\n";
+         "      <select name=\"event_priority\">\n";
     select_option_priority("0");
-    echo "      </SELECT>\n".
+    echo "      </select>\n".
          "      </td></tr>\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Title:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) . "\n" .
-         "      <INPUT TYPE=text NAME=\"event_title\" VALUE=\"\" SIZE=30 MAXLENGTH=50><BR>\n".
+         "      <input type=\"text\" name=\"event_title\" value=\"\" size=\"30\" maxlength=\"50\" /><br />\n".
          "      </td></tr>\n".
          html_tag( 'tr',
              html_tag( 'td',
-                 "<TEXTAREA NAME=\"event_text\" ROWS=5 COLS=\"$editor_size\" WRAP=HARD></TEXTAREA>" ,
+                 "<textarea name=\"event_text\" rows=\"5\" cols=\"$editor_size\" wrap=\"hard\"></textarea>" ,
              'left', $color[4], 'colspan="2"' )
          ) ."\n" .
          html_tag( 'tr',
              html_tag( 'td',
-                 "<INPUT TYPE=SUBMIT NAME=send VALUE=\"" .
-                 _("Set Event") . "\">" ,
+                 '<input type="submit" name="send" value="' .
+                 _("Set Event") . '" />' ,
              'left', $color[4], 'colspan="2"' )
          ) ."\n";
-    echo "</FORM>\n";
+    echo "</form>\n";
 }
 
 
@@ -180,7 +180,7 @@ if(!isset($event_text)){
     writecalendardata();
     echo html_tag( 'table',
                 html_tag( 'tr',
-                    html_tag( 'th', _("Event Has been added!") . "<br>\n", '', $color[4], 'colspan="2"' )
+                    html_tag( 'th', _("Event Has been added!") . "<br />\n", '', $color[4], 'colspan="2"' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td', _("Date:"), 'right', $color[4] ) . "\n" .
diff --git a/plugins/calendar/event_delete.php b/plugins/calendar/event_delete.php
index 09bf4214..fa94d380 100644
--- a/plugins/calendar/event_delete.php
+++ b/plugins/calendar/event_delete.php
@@ -94,7 +94,7 @@ function confirm_deletion()
 
     echo html_tag( 'table',
                html_tag( 'tr',
-                   html_tag( 'th', _("Do you really want to delete this event?") . '<br>', '', $color[4], 'colspan="2"' )
+                   html_tag( 'th', _("Do you really want to delete this event?") . '<br />', '', $color[4], 'colspan="2"' )
                ) .
                html_tag( 'tr',
                    html_tag( 'td', _("Date:"), 'right', $color[4] ) .
@@ -114,26 +114,26 @@ function confirm_deletion()
                ) .
                html_tag( 'tr',
                    html_tag( 'td',
-                       "    <FORM NAME=\"delevent\" METHOD=POST ACTION=\"$calself\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"dyear\" VALUE=\"$dyear\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"dmonth\" VALUE=\"$dmonth\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"dday\" VALUE=\"$dday\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"year\" VALUE=\"$year\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"month\" VALUE=\"$month\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"day\" VALUE=\"$day\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"dhour\" VALUE=\"$dhour\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"dminute\" VALUE=\"$dminute\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"confirmed\" VALUE=\"yes\">\n".
-                       '       <INPUT TYPE=SUBMIT VALUE="' . _("Yes") . "\">\n".
-                       "    </FORM>\n" ,
+                       "    <form name=\"delevent\" method=\"post\" action=\"$calself\">\n".
+                       "       <input type=\"hidden\" name=\"dyear\" value=\"$dyear\" />\n".
+                       "       <input type=\"hidden\" name=\"dmonth\" value=\"$dmonth\" />\n".
+                       "       <input type=\"hidden\" name=\"dday\" value=\"$dday\" />\n".
+                       "       <input type=\"hidden\" name=\"year\" value=\"$year\" />\n".
+                       "       <input type=\"hidden\" name=\"month\" value=\"$month\" />\n".
+                       "       <input type=\"hidden\" name=\"day\" value=\"$day\" />\n".
+                       "       <input type=\"hidden\" name=\"dhour\" value=\"$dhour\" />\n".
+                       "       <input type=\"hidden\" name=\"dminute\" value=\"$dminute\" />\n".
+                       "       <input type=\"hidden\" name=\"confirmed\" value=\"yes\" />\n".
+                       '       <input type="submit" value="' . _("Yes") . "\" />\n".
+                       "    </form>\n" ,
                    'right', $color[4] ) .
                    html_tag( 'td',
-                       "    <FORM NAME=\"nodelevent\" METHOD=POST ACTION=\"day.php\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"year\" VALUE=\"$year\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"month\" VALUE=\"$month\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"day\" VALUE=\"$day\">\n".
-                       '       <INPUT TYPE=SUBMIT VALUE="' . _("No") . "\">\n".
-                       "    </FORM>\n" ,
+                       "    <form name=\"nodelevent\" method=\"post\" action=\"day.php\">\n".
+                       "       <input type=\"hidden\" name=\"year\" value=\"$year\" />\n".
+                       "       <input type=\"hidden\" name=\"month\" value=\"$month\" />\n".
+                       "       <input type=\"hidden\" name=\"day\" value=\"$day\" />\n".
+                       '       <input type="submit" value="' . _("No") . "\" />\n".
+                       "    </form>\n" ,
                    'left', $color[4] )
                ) ,
            '', $color[0], 'border="0" cellpadding="2" cellspacing="1"' );
@@ -164,7 +164,7 @@ echo html_tag( 'tr', '', '', $color[0] ) .
 if (isset($dyear) && isset($dmonth) && isset($dday) && isset($dhour) && isset($dminute)){
     if (isset($confirmed)){
         delete_event("$dmonth$dday$dyear", "$dhour$dminute");
-        echo '<br><br>' . _("Event deleted!") . "<br>\n";
+        echo '<br /><br />' . _("Event deleted!") . "<br />\n";
         echo "<a href=\"day.php?year=$year&amp;month=$month&amp;day=$day\">" .
           _("Day View") . "</a>\n";
     } else {
@@ -172,7 +172,7 @@ if (isset($dyear) && isset($dmonth) && isset($dday) && isset($dhour) && isset($d
         confirm_deletion();
     }
 } else {
-    echo '<br>' . _("Nothing to delete!");
+    echo '<br />' . _("Nothing to delete!");
 }
 
 ?>
diff --git a/plugins/calendar/event_edit.php b/plugins/calendar/event_edit.php
index bcf71381..28e3e0a9 100644
--- a/plugins/calendar/event_edit.php
+++ b/plugins/calendar/event_edit.php
@@ -107,67 +107,67 @@ function update_event_form() {
     global $color, $editor_size, $year, $day, $month, $hour, $minute, $calendardata;
 
     $tmparray = $calendardata["$month$day$year"]["$hour$minute"];
-    echo "\n<FORM name=eventupdate action=\"event_edit.php\" METHOD=POST >\n".
-         "      <INPUT TYPE=hidden NAME=\"year\" VALUE=\"$year\">\n".
-         "      <INPUT TYPE=hidden NAME=\"month\" VALUE=\"$month\">\n".
-         "      <INPUT TYPE=hidden NAME=\"day\" VALUE=\"$day\">\n".
-         "      <INPUT TYPE=hidden NAME=\"hour\" VALUE=\"$hour\">\n".
-         "      <INPUT TYPE=hidden NAME=\"minute\" VALUE=\"$minute\">\n".
-         "      <INPUT TYPE=hidden NAME=\"updated\" VALUE=\"yes\">\n".
+    echo "\n<form name=\"eventupdate\" action=\"event_edit.php\" method=\"post\">\n".
+         "      <input type=\"hidden\" name=\"year\" value=\"$year\" />\n".
+         "      <input type=\"hidden\" name=\"month\" value=\"$month\" />\n".
+         "      <input type=\"hidden\" name=\"day\" value=\"$day\" />\n".
+         "      <input type=\"hidden\" name=\"hour\" value=\"$hour\" />\n".
+         "      <input type=\"hidden\" name=\"minute\" value=\"$minute\" />\n".
+         "      <input type=\"hidden\" name=\"updated\" value=\"yes\" />\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Date:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) .
-         "      <SELECT NAME=\"event_year\">\n";
+         "      <select name=\"event_year\">\n";
     select_option_year($year);
-    echo "      </SELECT>\n" .
+    echo "      </select>\n" .
          "      &nbsp;&nbsp;\n" .
-         "      <SELECT NAME=\"event_month\">\n";
+         "      <select name=\"event_month\">\n";
     select_option_month($month);
-    echo "      </SELECT>\n".
+    echo "      </select>\n".
          "      &nbsp;&nbsp;\n".
-         "      <SELECT NAME=\"event_day\">\n";
+         "      <select name=\"event_day\">\n";
     select_option_day($day);
-    echo "      </SELECT>\n".
+    echo "      </select>\n".
          "      </td></tr>\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Time:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) .
-         "      <SELECT NAME=\"event_hour\">\n";
+         "      <select name=\"event_hour\">\n";
     select_option_hour($hour);
-    echo "      </SELECT>\n".
+    echo "      </select>\n".
          "      &nbsp;:&nbsp;\n".
-         "      <SELECT NAME=\"event_minute\">\n";
+         "      <select name=\"event_minute\">\n";
     select_option_minute($minute);
-    echo "      </SELECT>\n".
+    echo "      </select>\n".
          "      </td></tr>\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Length:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) .
-         "      <SELECT NAME=\"event_length\">\n";
+         "      <select name=\"event_length\">\n";
     select_option_length($tmparray['length']);
-    echo "      </SELECT>\n".
+    echo "      </select>\n".
          "      </td></tr>\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Priority:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) .
-         "      <SELECT NAME=\"event_priority\">\n";
+         "      <select name=\"event_priority\">\n";
     select_option_priority($tmparray['priority']);
-    echo "      </SELECT>\n".
+    echo "      </select>\n".
          "      </td></tr>\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Title:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) .
-         "      <INPUT TYPE=text NAME=\"event_title\" VALUE=\"$tmparray[title]\" SIZE=30 MAXLENGTH=50><BR>\n".
+         "      <input type=\"text\" name=\"event_title\" value=\"$tmparray[title]\" size=\"30\" maxlenght=\"50\" /><br />\n".
          "      </td></tr>\n".
          html_tag( 'td',
-             "      <TEXTAREA NAME=\"event_text\" ROWS=5 COLS=\"$editor_size\" WRAP=HARD>$tmparray[message]</TEXTAREA>\n" ,
+             "      <textarea name=\"event_text\" rows=\"5\" cols=\"$editor_size\" wrap=\"hard\">$tmparray[message]</textarea>\n" ,
          'left', $color[4], 'colspan="2"' ) .
          '</tr>' . html_tag( 'tr' ) .
          html_tag( 'td',
-             "<INPUT TYPE=SUBMIT NAME=send VALUE=\"" .
-             _("Update Event") . "\">\n" ,
+             '<input type="submit" name="send" value="' .
+             _("Update Event") . "\" />\n" ,
          'left', $color[4], 'colspan="2"' ) .
-         "</tr></FORM>\n";
+         "</tr></form>\n";
 }
 
 // self explenatory
@@ -178,7 +178,7 @@ function confirm_update() {
 
     echo html_tag( 'table',
                 html_tag( 'tr',
-                    html_tag( 'th', _("Do you really want to change this event from:") . "<br>\n", '', $color[4], 'colspan="2"' ) ."\n"
+                    html_tag( 'th', _("Do you really want to change this event from:") . "<br />\n", '', $color[4], 'colspan="2"' ) ."\n"
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td', _("Date:") , 'right', $color[4] ) ."\n" .
@@ -201,7 +201,7 @@ function confirm_update() {
                     html_tag( 'td', $tmparray['message'] , 'left', $color[4] ) ."\n"
                 ) .
                 html_tag( 'tr',
-                    html_tag( 'th', _("to:") . "<br>\n", '', $color[4], 'colspan="2"' ) ."\n"
+                    html_tag( 'th', _("to:") . "<br />\n", '', $color[4], 'colspan="2"' ) ."\n"
                 ) .
 
                 html_tag( 'tr',
@@ -226,33 +226,33 @@ function confirm_update() {
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td',
-                        "    <FORM NAME=\"updateevent\" METHOD=POST ACTION=\"$calself\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"year\" VALUE=\"$year\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"month\" VALUE=\"$month\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"day\" VALUE=\"$day\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"hour\" VALUE=\"$hour\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"minute\" VALUE=\"$minute\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_year\" VALUE=\"$event_year\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_month\" VALUE=\"$event_month\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_day\" VALUE=\"$event_day\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_hour\" VALUE=\"$event_hour\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_minute\" VALUE=\"$event_minute\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_priority\" VALUE=\"$event_priority\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_length\" VALUE=\"$event_length\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_title\" VALUE=\"$event_title\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_text\" VALUE=\"$event_text\">\n".
-                        "       <INPUT TYPE=hidden NAME=\"updated\" VALUE=\"yes\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"confirmed\" VALUE=\"yes\">\n".
-                        '       <INPUT TYPE=SUBMIT VALUE="' . _("Yes") . "\">\n".
-                        "    </FORM>\n" ,
+                        "    <form name=\"updateevent\" method=\"post\" action=\"$calself\">\n".
+                        "       <input type=\"hidden\" name=\"year\" value=\"$year\" />\n".
+                        "       <input type=\"hidden\" name=\"month\" value=\"$month\" />\n".
+                        "       <input type=\"hidden\" name=\"day\" value=\"$day\" />\n".
+                        "       <input type=\"hidden\" name=\"hour\" value=\"$hour\" />\n".
+                        "       <input type=\"hidden\" name=\"minute\" value=\"$minute\" />\n".
+                        "       <input type=\"hidden\" name=\"event_year\" value=\"$event_year\" />\n".
+                        "       <input type=\"hidden\" name=\"event_month\" value=\"$event_month\" />\n".
+                        "       <input type=\"hidden\" name=\"event_day\" value=\"$event_day\" />\n".
+                        "       <input type=\"hidden\" name=\"event_hour\" value=\"$event_hour\" />\n".
+                        "       <input type=\"hidden\" name=\"event_minute\" value=\"$event_minute\" />\n".
+                        "       <input type=\"hidden\" name=\"event_priority\" value=\"$event_priority\" />\n".
+                        "       <input type=\"hidden\" name=\"event_length\" value=\"$event_length\" />\n".
+                        "       <input type=\"hidden\" name=\"event_title\" value=\"$event_title\" />\n".
+                        "       <input type=\"hidden\" name=\"event_text\" value=\"$event_text\" />\n".
+                        "       <input type=\"hidden\" name=\"updated\" value=\"yes\" />\n".
+                        "       <input type=\"hidden\" name=\"confirmed\" value=\"yes\" />\n".
+                        '       <input type="submit" value="' . _("Yes") . "\" />\n".
+                        "    </form>\n" ,
                     'right', $color[4] ) ."\n" .
                     html_tag( 'td',
-                        "    <FORM NAME=\"nodelevent\" METHOD=POST ACTION=\"day.php\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"year\" VALUE=\"$year\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"month\" VALUE=\"$month\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"day\" VALUE=\"$day\">\n".
-                        '       <INPUT TYPE=SUBMIT VALUE="' . _("No") . "\">\n".
-                        "    </FORM>\n" ,
+                        "    <form name=\"nodelevent\" method=\"post\" action=\"day.php\">\n".
+                        "       <input type=\"hidden\" name=\"year\" value=\"$year\" />\n".
+                        "       <input type=\"hidden\" name=\"month\" value=\"$month\" />\n".
+                        "       <input type=\"hidden\" name=\"day\" value=\"$day\" />\n".
+                        '       <input type="submit" value="' . _("No") . "\" />\n".
+                        "    </form>\n" ,
                     'left', $color[4] ) ."\n"
                 ) ,
             '', $color[0], 'border="0" cellpadding="2" cellspacing="1"' );
diff --git a/plugins/calendar/functions.php b/plugins/calendar/functions.php
index 6dba751f..d7cbb6b9 100644
--- a/plugins/calendar/functions.php
+++ b/plugins/calendar/functions.php
@@ -56,9 +56,9 @@ function select_option_length($selected) {
 
     while( $bar = each($eventlength)) {
         if($selected==$bar['key']){
-                echo "        <OPTION VALUE=\"".$bar['key']."\" SELECTED>".$bar['value']."</OPTION>\n";
+                echo '        <option value="'.$bar['key'].'" selected="selected">'.$bar['value']."</option>\n";
         } else {
-                echo "        <OPTION VALUE=\"".$bar['key']."\">".$bar['value']."</OPTION>\n";
+                echo '        <option value="'.$bar['key'].'">'.$bar['value']."</option>\n";
         }
     }
 }
@@ -81,9 +81,9 @@ function select_option_minute($selected) {
 
     while ( $bar = each($eventminute)) {
         if ($selected==$bar['key']){
-                echo "        <OPTION VALUE=\"".$bar['key']."\" SELECTED>".$bar['value']."</OPTION>\n";
+                echo '        <option value="'.$bar['key'].'" selected="selected">'.$bar['value']."</option>\n";
         } else {
-                echo "        <OPTION VALUE=\"".$bar['key']."\">".$bar['value']."</OPTION>\n";
+                echo '        <option value="'.$bar['key'].'">'.$bar['value']."</option>\n";
         }
     }
 }
@@ -93,9 +93,9 @@ function select_option_hour($selected) {
     for ($i=0;$i<24;$i++){
         ($i<10)? $ih = "0" . $i : $ih = $i;
         if ($ih==$selected){
-            echo "            <OPTION VALUE=\"$ih\" SELECTED>$i</OPTION>\n";
+            echo '            <option value="'.$ih.'" selected="selected">'.$i."</option>\n";
         } else {
-            echo "            <OPTION VALUE=\"$ih\">$i</OPTION>\n";
+            echo '            <option value="'.$ih.'">'.$i."</option>\n";
         }
     }
 }
@@ -108,9 +108,9 @@ function select_option_priority($selected) {
 
     while( $bar = each($eventpriority)) {
         if($selected==$bar['key']){
-                echo "        <OPTION VALUE=\"".$bar['key']."\" SELECTED>".$bar['value']."</OPTION>\n";
+                echo '        <option value="'.$bar['key'].'" selected="selected">'.$bar['value']."</option>\n";
         } else {
-                echo "        <OPTION VALUE=\"".$bar['key']."\">".$bar['value']."</OPTION>\n";
+                echo '        <option value="'.$bar['key'].'">'.$bar['value']."</option>\n";
         }
     }
 }
@@ -119,9 +119,9 @@ function select_option_year($selected) {
 
     for ($i=1902;$i<2038;$i++){
         if ($i==$selected){
-            echo "            <OPTION VALUE=\"$i\" SELECTED>$i</OPTION>\n";
+            echo '            <option value="'.$i.'" selected="selected">'.$i."</option>\n";
         } else {
-            echo "            <OPTION VALUE=\"$i\">$i</OPTION>\n";
+            echo '            <option value="'.$i.'">'.$i."</option>\n";
         }
     }
 }
@@ -132,9 +132,9 @@ function select_option_month($selected) {
         $im=date('m',mktime(0,0,0,$i,1,1));
         $is = getMonthAbrv( date('m',mktime(0,0,0,$i,1,1)) );
         if ($im==$selected){
-            echo "            <OPTION VALUE=\"$im\" SELECTED>$is</OPTION>\n";
+            echo '            <option value="'.$im.'" selected="selected">'.$is."</option>\n";
         } else {
-            echo "            <OPTION VALUE=\"$im\">$is</OPTION>\n";
+            echo '            <option value="'.$im.'">'.$is."</option>\n";
         }
     }
 }
@@ -144,11 +144,11 @@ function select_option_day($selected) {
     for ($i=1;$i<32;$i++){
         ($i<10)? $ih="0".$i : $ih=$i;
         if ($i==$selected){
-            echo "            <OPTION VALUE=\"$ih\" SELECTED>$i</OPTION>\n";
+            echo '            <option value="'.$ih.'" selected="selected">'.$i."</option>\n";
         } else {
-            echo "            <OPTION VALUE=\"$ih\">$i</OPTION>\n";
+            echo '            <option value="'.$ih.'">'.$i."</option>\n";
         }
     }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/plugins/fortune/setup.php b/plugins/fortune/setup.php
index dbdc7b10..9cecbf44 100644
--- a/plugins/fortune/setup.php
+++ b/plugins/fortune/setup.php
@@ -48,7 +48,7 @@ function fortune() {
     if (!$exist) {
         echo "$fortune_location" . _(" not found.");
     } else {
-        echo "<center><em>" . _("Today's Fortune") . "</em><br></font></center><pre>";
+        echo "<center><em>" . _("Today's Fortune") . "</em><br /></font></center><pre>";
         htmlspecialchars(system($fortune_location));
     } 
   
@@ -93,4 +93,4 @@ function fortune_save() {
     }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/plugins/info/options.php b/plugins/info/options.php
index 3295c1c7..fa4e8e03 100644
--- a/plugins/info/options.php
+++ b/plugins/info/options.php
@@ -148,12 +148,12 @@ foreach($type as $index=>$value) {
          addInput($index, $value, 60);
 }
 
-echo "</td></tr></table></center><br>\n".
+echo "</td></tr></table></center><br />\n".
      '<center>'.
      addSubmit('submit','submit').
      addSubmit('clear','submit').
      addSubmit('default','submit').
-     "</center><br></form>\n";
+     "</center><br /></form>\n";
 
 $tests = array();
 
diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index de9e1f7a..6025c414 100644
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -74,14 +74,14 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
     function Mail_Fetch_Select_Server($mailfetch) {
         global $PHP_SELF;
 
-        echo '<font size=-5><br></font>' .
-             "<form action=\"$PHP_SELF\" method=\"post\" target=\"_self\">" .
+        echo '<font size="-5"><br /></font>' .
+             '<form action="'.$PHP_SELF.'" method="post" target="_self">' .
              html_tag( 'table', '', 'center', '', 'width="70%" cols="2"' ) .
                  html_tag( 'tr' ) .
                      html_tag( 'td', _("Select Server:") . ' &nbsp; &nbsp;', 'right' ) .
                      html_tag( 'td', '', 'left' ) .
                          '<select name="server_to_fetch" size="1">' .
-                         '<option value="all" selected>..' . _("All") . "...\n";
+                         '<option value="all" selected="selected">..' . _("All") . "...\n";
         for ($i = 0;$i < $mailfetch['server_number'];$i++) {
              echo "<option value=\"$i\">" .
                  htmlspecialchars($mailfetch[$i]['alias']) .
@@ -99,13 +99,13 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
                                   htmlspecialchars($mailfetch[$i]['alias']) .
                                   '</b>: &nbsp; &nbsp; ',
                               'right' ) .
-                              html_tag( 'td', '<input type="password" name="pass_' . $i . '">', 'left' )
+                              html_tag( 'td', '<input type="password" name="pass_' . $i . '" />', 'left' )
                           );
              }
         }
         echo html_tag( 'tr',
                    html_tag( 'td', '&nbsp;' ) .
-                   html_tag( 'td', '<input type=submit name=submit_mailfetch value="' . _("Fetch Mail"). '">', 'left' )
+                   html_tag( 'td', '<input type="submit" name="submit_mailfetch" value="' . _("Fetch Mail"). '" />', 'left' )
                ) .
              '</table></form>';
     }
@@ -113,7 +113,7 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
     $mailfetch = Mail_Fetch_Servers();
     displayPageHeader($color, 'None');
 
-    echo '<br><center>';
+    echo '<br /><center>';
 
     echo html_tag( 'table',
                html_tag( 'tr',
@@ -160,7 +160,7 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
 
         $pop3 = new POP3($mailfetch_server, 60);
 
-        echo '<br>' .
+        echo '<br />' .
         html_tag( 'table',
             html_tag( 'tr',
                 html_tag( 'td', '<b>' . _("Fetching from ") . 
diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index 5a37918e..82835ac1 100644
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -151,7 +151,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
     }
 
 
-    echo '<br><form method="post" action="'.$PHP_SELF.'">' .
+    echo '<br /><form method="post" action="'.$PHP_SELF.'">' .
             html_tag( 'table',
                 html_tag( 'tr',
                     html_tag( 'td',
@@ -162,7 +162,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
             html_tag( 'table',
                 html_tag( 'tr',
                     html_tag( 'td',
-                        _("You should be aware that the encryption used to store your password is not perfectly secure. However, if you are using pop, there is inherently no encryption anyway. Additionally, the encryption that we do to save it on the server can be undone by a hacker reading the source to this file." ) ,
+                        _("You should be aware that the encryption used to store your password is not perfectly secure. However, if you are using pop, there is inherently no encryption anyway. Additionally, the encryption that we do to save it on the server can be undone by a hacker reading the source to this file.") ,
                     'left' )
                 ) .
                 html_tag( 'tr',
@@ -172,8 +172,8 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td',
-                        '<input type=checkbox name=mf_cypher ' .
-                        (($mailfetch_cypher=='on')?'checked>':'>') .
+                        '<input type="checkbox" name="mf_cypher" ' .
+                        (($mailfetch_cypher=='on')?'checked="checked" />':' />') .
                         _("Encrypt passwords (informative only)") ,
                     'right' )
                 ) ,
@@ -188,28 +188,28 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                     html_tag( 'tr' ) .
                         html_tag( 'td', '', 'center', $color[0] ) .
 
-            "<INPUT TYPE=\"hidden\" NAME=\"mf_sn\" VALUE=\"$mailfetch_server_number\">" .
-            '<INPUT TYPE="hidden" NAME="mf_action" VALUE="add">' .
+            "<input type=\"hidden\" name=\"mf_sn\" value=\"$mailfetch_server_number\" />" .
+            '<input type="hidden" name="mf_action" value="add" />' .
             html_tag( 'table' ) .
                 html_tag( 'tr',
                     html_tag( 'th', _("Server:"), 'right' ) .
-                    html_tag( 'td', '<input type=text name=mf_server value="" size=40>', 'left' )
+                    html_tag( 'td', '<input type="text" name="mf_server" value="" size="40" />', 'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', _("Port:"), 'right') .
-                    html_tag( 'td', '<input type=text name=mf_port value="110" size=20>', 'left')
+                    html_tag( 'td', '<input type="text" name="mf_port" value="110" size="20" />', 'left')
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', _("Alias:"), 'right' ) .
-                    html_tag( 'td', '<input type=text name=mf_alias value="" size=20>', 'left' )
+                    html_tag( 'td', '<input type="text" name="mf_alias" value="" size="20" />', 'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', _("Username:"), 'right' ) .
-                    html_tag( 'td', '<input type=text name=mf_user value="" size=20>', 'left' )
+                    html_tag( 'td', '<input type="text" name="mf_user" value="" size="20" />', 'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', _("Password:"), 'right' ) .
-                    html_tag( 'td', '<input type=password name=mf_pass value="" size=20>', 'left' )
+                    html_tag( 'td', '<input type="password" name="mf_pass" value="" size="20" />', 'left' )
                 ) .
                 html_tag( 'tr' ) .
                     html_tag( 'th', _("Store in Folder:"), 'right' ) .
@@ -225,25 +225,25 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
         echo '</select></td></tr>' .
                 html_tag( 'tr',
                     html_tag( 'th', '&nbsp;', 'right' ) .
-                    html_tag( 'td', '<input type="checkbox" name="mf_lmos" checked>' . _("Leave Mail on Server"), 'left' )
+                    html_tag( 'td', '<input type="checkbox" name="mf_lmos" checked="checked" />' . _("Leave Mail on Server"), 'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', '&nbsp;', 'right' ) .
-                    html_tag( 'td', '<input type="checkbox" name="mf_login">' . _("Check mail during login"), 'left' )
+                    html_tag( 'td', '<input type="checkbox" name="mf_login" />' . _("Check mail during login"), 'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', '&nbsp;', 'right' ) .
-                    html_tag( 'td', '<input type="checkbox" name="mf_fref">' . _("Check mail during folder refresh"), 'left' )
+                    html_tag( 'td', '<input type="checkbox" name="mf_fref" />' . _("Check mail during folder refresh"), 'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td',
-                        '<input type=submit name="submit_mailfetch" value="' . _("Add Server") . '">',
+                        '<input type="submit" name="submit_mailfetch" value="' . _("Add Server") . '" />',
                     'center', '', 'colspan="2"' )
                 ) .
             '</table></td></tr></table></form>';
 
         // Modify Server
-        echo '<font size=-5><BR></font>' .
+        echo '<font size="-5"><br /></font>' .
             html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) .
                 html_tag( 'tr',
                     html_tag( 'td', '<b>' . _("Modify Server") . '</b>', 'center', $color[9] )
@@ -258,8 +258,8 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                     htmlspecialchars( (($mailfetch_alias_[$i]=='')?$mailfetch_server_[$i]:$mailfetch_alias_[$i])) . "</option>";
             }
             echo '</select>'.
-                 '&nbsp;&nbsp;<INPUT TYPE=submit name=mf_action_mod value="' . _("Modify") . '">'.
-                 '&nbsp;&nbsp;<INPUT TYPE=submit name=mf_action_del value="' . _("Delete") . '">'.
+                 '&nbsp;&nbsp;<input type="submit" name="mf_action_mod" value="' . _("Modify") . '" />'.
+                 '&nbsp;&nbsp;<input type="submit" name="mf_action_del" value="' . _("Delete") . '" />'.
                  '</form>';
         } else {
             echo _("No-one server in use. Try to add.");
@@ -272,19 +272,19 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                         html_tag( 'td', '<b>' . _("Fetching Servers") . '</b>', 'center', $color[0] )
                     ) ,
                 'center', '', 'width="95%" cellpadding="5" cellspacing="1"' ) .
-            '<br>' .
+            '<br />' .
             html_tag( 'table',
                 html_tag( 'tr',
                     html_tag( 'td', '<b>' . _("Confirm Deletion of a Server") . '</b>', 'center', $color[9] )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td',
-                        "<INPUT TYPE=\"hidden\" NAME=\"mf_sn\" VALUE=\"$mf_sn\">" .
-                        '<INPUT TYPE="hidden" NAME="mf_action" VALUE="confirm_delete">' .
-                        '<br>' . _("Selected Server:") . " <b>" . htmlspecialchars($mailfetch_server_[$mf_sn]) . "</b><br>" .
-                        _("Confirm delete of selected server?") . '<br><br>' .
-                        '<input type=submit name=submit_mailfetch value="' . _("Confirm Delete") . '">' .
-                        '<br></form>' ,
+                        "<input type=\"hidden\" name=\"mf_sn\" value=\"$mf_sn\" />" .
+                        '<input type="hidden" name="mf_action" value="confirm_delete" />' .
+                        '<br />' . _("Selected Server:") . " <b>" . htmlspecialchars($mailfetch_server_[$mf_sn]) . "</b><br />" .
+                        _("Confirm delete of selected server?") . '<br /><br />' .
+                        '<input type="submit" name="submit_mailfetch" value="' . _("Confirm Delete") . '" />' .
+                        '<br /></form>' ,
                     'center', $color[9] )
                 ) ,
             'center', '', 'width="70%" cellpadding="5" cellspacing="1"' );
@@ -295,7 +295,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                         html_tag( 'td', '<b>' . _("Fetching Servers") . '</b>', 'center', $color[0] )
                     ) ,
                 'center', '', 'width="95%" cellpadding="5" cellspacing="1"' ) .
-            '<br>' .
+            '<br />' .
             html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) .
                 html_tag( 'tr',
                     html_tag( 'td', '<b>' . _("Modify Server") . '</b>', 'center', $color[9] )
@@ -303,33 +303,33 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                 html_tag( 'tr' ) .
                     html_tag( 'td', '', 'center', $color[0] ) .
 
-            "<INPUT TYPE=\"hidden\" NAME=\"mf_sn\" VALUE=\"$mf_sn\">" .
-            '<INPUT TYPE="hidden" NAME="mf_action" VALUE="confirm_modify">' .
+            "<input type=\"hidden\" name=\"mf_sn\" value=\"$mf_sn\" />" .
+            '<input type="hidden" name="mf_action" value="confirm_modify" />' .
             html_tag( 'table' ) .
                 html_tag( 'tr',
                     html_tag( 'th', _("Server:"), 'right' ) .
                     html_tag( 'td', '<input type="text" name="mf_server" value="' .
-                        htmlspecialchars($mailfetch_server_[$mf_sn]) . '" size="40">', 'left' )
+                        htmlspecialchars($mailfetch_server_[$mf_sn]) . '" size="40" />', 'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', _("Port:"), 'right' ) .
                     html_tag( 'td', '<input type="text" name="mf_port" value="' .
-                        htmlspecialchars($mailfetch_port_[$mf_sn]) . '" size="40">', 'left' )
+                        htmlspecialchars($mailfetch_port_[$mf_sn]) . '" size="40" />', 'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', _("Alias:"), 'right' ) .
                     html_tag( 'td', '<input type="text" name="mf_alias" value="' .
-                        htmlspecialchars($mailfetch_alias_[$mf_sn]) . '" size="40">', 'left' )
+                        htmlspecialchars($mailfetch_alias_[$mf_sn]) . '" size="40" />', 'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', _("Username:"), 'right' ) .
                     html_tag( 'td', '<input type="text" name="mf_user" value="' . 
-                        htmlspecialchars($mailfetch_user_[$mf_sn]) . '" size="20">', 'left' )
+                        htmlspecialchars($mailfetch_user_[$mf_sn]) . '" size="20" />', 'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', _("Password:"), 'right' ) .
                     html_tag( 'td', '<input type="password" name="mf_pass" value="' .
-                        htmlspecialchars($mailfetch_pass_[$mf_sn]) . '" size="20">', 'left' )
+                        htmlspecialchars($mailfetch_pass_[$mf_sn]) . '" size="20" />', 'left' )
                 ) .
                 html_tag( 'tr' ) .
                     html_tag( 'th', _("Store in Folder:"), 'right' ) .
@@ -348,27 +348,27 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                 html_tag( 'tr',
                     html_tag( 'th', '&nbsp;', 'right' ) .
                     html_tag( 'td',
-                        '<input type=checkbox name=mf_lmos ' . (($mailfetch_lmos_[$mf_sn] == 'on')?'checked':'') .
-                        '>' . _("Leave Mail on Server") ,
+                        '<input type="checkbox" name="mf_lmos" ' . (($mailfetch_lmos_[$mf_sn] == 'on')?'checked="checked"':'') .
+                        ' />' . _("Leave Mail on Server") ,
                     'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', '&nbsp;', 'right' ) .
                     html_tag( 'td',
-                        '<input type=checkbox name=mf_login ' . ( ($mailfetch_login_[$mf_sn] == 'on')?'checked':'') .
-                        '>' . _("Check mail during login"),
+                        '<input type="checkbox" name="mf_login" ' . ( ($mailfetch_login_[$mf_sn] == 'on')?'checked="checked"':'') .
+                        ' />' . _("Check mail during login"),
                     'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'th', '&nbsp;', 'right' ) .
                     html_tag( 'td',
-                        '<input type=checkbox name=mf_fref ' . ( ($mailfetch_fref_[$mf_sn] == 'on')?'checked':'') .
-                        '>' . _("Check mail during folder refresh") ,
+                        '<input type="checkbox" name="mf_fref" ' . ( ($mailfetch_fref_[$mf_sn] == 'on')?'checked="checked"':'') .
+                        ' />' . _("Check mail during folder refresh") ,
                     'left' )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td',
-                        '<input type=submit name="submit_mailfetch" value="' . _("Modify Server") . '">',
+                        '<input type="submit" name="submit_mailfetch" value="' . _("Modify Server") . '" />',
                     'center', '', 'colspan="2"' )
                 ) .
 
@@ -381,7 +381,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                 html_tag( 'td', '<b>' . _("Fetching Servers") . '</b>', 'center', $color[0] )
             ) ,
         'center', '', 'width="95%"' ) .
-        '<br>' .
+        '<br />' .
         html_tag( 'table',
             html_tag( 'tr',
                 html_tag( 'td', '<b>' . _("Undefined Function") . '</b>', 'center', $color[9] ) .
diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index 584e75b0..e099ce1a 100644
--- a/plugins/mail_fetch/setup.php
+++ b/plugins/mail_fetch/setup.php
@@ -117,9 +117,9 @@
                 $mailfetch_uidl=$mailfetch_uidl_[$i_loop];
                 $mailfetch_subfolder=$mailfetch_subfolder_[$i_loop];
 
-                // $outMsg .= "$mailfetch_alias checked<br>";
+                // $outMsg .= "$mailfetch_alias checked<br />";
 
-                // $outMsg .= "$mailfetch_alias_[$i_loop]<br>";
+                // $outMsg .= "$mailfetch_alias_[$i_loop]<br />";
 
                 $pop3 = new POP3($mailfetch_server, 60);
 
@@ -208,7 +208,7 @@
         }
 
         if( trim( $outMsg ) <> '' ) {
-            echo '<br><font size="1">' . _("Mail Fetch Result:") . "<br>$outMsg</font>";
+            echo '<br /><font size="1">' . _("Mail Fetch Result:") . "<br />$outMsg</font>";
         }
         if( $mailfetch_newlog == 'on' ) {
             setPref($data_dir, $username, 'mailfetch_newlog', 'off');
@@ -236,4 +236,4 @@
       );
    }
 
-?>
+?>
\ No newline at end of file
diff --git a/plugins/message_details/setup.php b/plugins/message_details/setup.php
index 4f68e9bd..71b0ba29 100644
--- a/plugins/message_details/setup.php
+++ b/plugins/message_details/setup.php
@@ -46,9 +46,9 @@ function show_message_details() {
                 "  }\n" .
                 "// -->\n" .
                 "</script>\n" .
-                "&nbsp;|&nbsp;<A HREF=\"javascript:MessageSource();\">$print_text</A>\n";
+                "&nbsp;|&nbsp;<a href=\"javascript:MessageSource();\">$print_text</a>\n";
     } 
     echo $result;
 }
  
-?>
+?>
\ No newline at end of file
diff --git a/plugins/newmail/newmail.php b/plugins/newmail/newmail.php
index 3d343525..50122518 100644
--- a/plugins/newmail/newmail.php
+++ b/plugins/newmail/newmail.php
@@ -25,7 +25,7 @@ sqGetGlobalVar('numnew', $numnew, SQ_GET);
 
    displayHtmlHeader( _("New Mail"), '', FALSE );
 
-   echo "<body bgcolor=\"$color[4]\" topmargin=0 leftmargin=0 rightmargin=0 marginwidth=0 marginheight=0>\n".
+   echo '<body bgcolor="'.$color[4].'" topmargin="0" leftmargin="0" rightmargin="0" marginwidth="0" marginheight="0">'."\n".
         '<center>'. "\n" .
         html_tag( 'table', "\n" .
             html_tag( 'tr', "\n" .
@@ -33,14 +33,14 @@ sqGetGlobalVar('numnew', $numnew, SQ_GET);
             ) .
             html_tag( 'tr', "\n" .
                 html_tag( 'td',
-                    '<br><big><font color="' . $color[2] . '">' . _("You have").' '.
+                    '<br /><big><font color="' . $color[2] . '">' . _("You have").' '.
 		    sprintf( ( $numnew == 1 ?
 		        _("%s new message") :
 			_("%s new messages") ), $numnew ) .
-                    '</font><br></big><br>' . "\n" .
+                    '</font><br /></big><br />' . "\n" .
                     '<form name="nm">' . "\n".
-                    '<input type=button name=bt value="' . _("Close Window") .
-                    '" onClick="javascript:window.close();">'."\n".
+                    '<input type="button" name="bt" value="' . _("Close Window") .
+                    '" onClick="javascript:window.close();" />'."\n".
                     '</form>',
                 'center' )
             ) ,
@@ -53,4 +53,4 @@ sqGetGlobalVar('numnew', $numnew, SQ_GET);
         "</script>\n".
         "</body></html>\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/plugins/newmail/setup.php b/plugins/newmail/setup.php
index 12bd65f7..c0c05c73 100644
--- a/plugins/newmail/setup.php
+++ b/plugins/newmail/setup.php
@@ -215,11 +215,11 @@
             }
 
             if ($totalNew > 0 && $newmail_enable == 'on' && $newmail_media != '' ) {
-                echo '<EMBED SRC="'.htmlspecialchars($newmail_media) .
-                    "\" HIDDEN=\"TRUE\" AUTOSTART=\"TRUE\">\n";
+                echo '<embed src="'.htmlspecialchars($newmail_media) .
+                    "\" hidden=\"true\" autostart=\"true\">\n";
             }
             if ($totalNew > 0 && $newmail_popup == 'on') {
-                echo "<SCRIPT LANGUAGE=\"JavaScript\">\n".
+                echo "<script language=\"JavaScript\">\n".
                     "<!--\n".
                     "function PopupScriptLoad() {\n".
                         'window.open("'.sqm_baseuri().'plugins/newmail/newmail.php?numnew='.$totalNew.
@@ -238,4 +238,4 @@
             }
         }
     }
-?>
+?>
\ No newline at end of file
diff --git a/plugins/newmail/testsound.php b/plugins/newmail/testsound.php
index 16d53892..711036da 100644
--- a/plugins/newmail/testsound.php
+++ b/plugins/newmail/testsound.php
@@ -21,14 +21,14 @@ require_once(SM_PATH . 'functions/html.php');
 
 displayHtmlHeader( _("Test Sound"), '', FALSE );
 
-echo '<body bgcolor="'.$color[4].'" topmargin=0 leftmargin=0 rightmargin=0 marginwidth=0 marginheight=0>'."\n";
+echo '<body bgcolor="'.$color[4].'" topmargin="0" leftmargin="0" rightmargin="0" marginwidth="0" marginheight="0">'."\n";
 
 if ( ! sqgetGlobalVar('sound', $sound, SQ_GET) ) {
     $sound = 'Click.wav';
 } 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;
@@ -37,13 +37,13 @@ if ( ! sqgetGlobalVar('sound', $sound, SQ_GET) ) {
 echo html_tag( 'table',
          html_tag( 'tr',
              html_tag( 'td',
-                    '<embed src="'.htmlspecialchars($sound)."\" hidden=\"true\" autostart=\"true\">\n".
-                    '<br>'.
-                    '<b>' . _("Loading the sound...") . '</b><br>'.
+                    '<embed src="'.htmlspecialchars($sound).'" hidden="true" autostart="true">'."\n".
+                    '<br />'.
+                    '<b>' . _("Loading the sound...") . '</b><br />'.
                     '<form>'.
                     '<input type="button" name="close" value="  ' .
                     _("Close") .
-                    '  " onClick="window.close()">'.
+                    '  " onClick="window.close()" />'.
                     '</form>' ,
                 'center' )
             ) ,
diff --git a/plugins/spamcop/setup.php b/plugins/spamcop/setup.php
index 5f54c46c..89a57d9d 100755
--- a/plugins/spamcop/setup.php
+++ b/plugins/spamcop/setup.php
@@ -92,7 +92,7 @@ function spamcop_show_link() {
     $passed_ent_id = 0;
    }
 
-   echo "<br>\n";
+   echo "<br />\n";
 
     /* 
        Catch situation when user use quick_email and does not update 
@@ -107,14 +107,14 @@ function spamcop_show_link() {
     // don't insert javascript if javascript is disabled
    if ($spamcop_method == 'web_form' && $javascript_on) {
 ?><script language="javascript" type="text/javascript">
-document.write('<a href="../plugins/spamcop/spamcop.php?passed_id=<?PHP echo urlencode($passed_id); ?>&amp;js_web=1&amp;mailbox=<?PHP echo urlencode($mailbox); ?>&amp;passed_ent_id=<?PHP echo urlencode($passed_ent_id); ?>" target="_blank">');
-document.write("<?PHP echo _("Report as Spam"); ?>");
+document.write('<a href="../plugins/spamcop/spamcop.php?passed_id=<?php echo urlencode($passed_id); ?>&amp;js_web=1&amp;mailbox=<?php echo urlencode($mailbox); ?>&amp;passed_ent_id=<?php echo urlencode($passed_ent_id); ?>" target="_blank">');
+document.write("<?php echo _("Report as Spam"); ?>");
 document.write("</a>");
-</script><?PHP
+</script><?php
    } else {
-?><a href="../plugins/spamcop/spamcop.php?passed_id=<?PHP echo urlencode($passed_id); ?>&amp;mailbox=<?PHP echo urlencode($mailbox); ?>&amp;startMessage=<?PHP echo urlencode($startMessage); ?>&amp;passed_ent_id=<?PHP echo urlencode($passed_ent_id); ?>">
-<?PHP echo _("Report as Spam"); ?></a>
-<?PHP
+?><a href="../plugins/spamcop/spamcop.php?passed_id=<?php echo urlencode($passed_id); ?>&amp;mailbox=<?php echo urlencode($mailbox); ?>&amp;startMessage=<?php echo urlencode($startMessage); ?>&amp;passed_ent_id=<?php echo urlencode($passed_ent_id); ?>">
+<?php echo _("Report as Spam"); ?></a>
+<?php
    }
 }
 
diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index da15b9af..1485be76 100644
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -148,33 +148,33 @@ echo "</p>";
 <table align="center" width="75%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <td align="left" valign="top">
-<?PHP if (isset($js_web) && $js_web) {
+<?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";
 } else {
    ?><form method="post" action="../../src/right_main.php">
-  <input type="hidden" name="mailbox" value="<?PHP echo htmlspecialchars($mailbox) ?>" />
-  <input type="hidden" name="startMessage" value="<?PHP echo htmlspecialchars($startMessage) ?>" />
-<?PHP
+  <input type="hidden" name="mailbox" value="<?php echo htmlspecialchars($mailbox) ?>" />
+  <input type="hidden" name="startMessage" value="<?php echo htmlspecialchars($startMessage) ?>" />
+<?php
   echo '<input type="submit" value="' . _("Cancel / Done") . "\" />";
 }
   ?></form>
 </td>
 <td align="right" valign="top">
-<?PHP if ($spamcop_method == 'thorough_email' ||
+<?php if ($spamcop_method == 'thorough_email' ||
           $spamcop_method == 'quick_email') {
    if ($spamcop_method == 'thorough_email')
       $report_email = 'submit.' . $spamcop_id . '@spam.spamcop.net';
    else
       $report_email = 'quick.' . $spamcop_id . '@spam.spamcop.net';
    $form_action = SM_PATH . 'src/compose.php';
-?>  <form method="post" action="<?PHP echo $form_action?>">
-  <input type="hidden" name="mailbox" value="<?PHP echo htmlspecialchars($mailbox) ?>" />
-  <input type="hidden" name="spamcop_is_composing" value="<?PHP echo htmlspecialchars($passed_id) ?>" />
-  <input type="hidden" name="send_to" value="<?PHP echo htmlspecialchars($report_email)?>" />
+?>  <form method="post" action="<?php echo $form_action?>">
+  <input type="hidden" name="mailbox" value="<?php echo htmlspecialchars($mailbox) ?>" />
+  <input type="hidden" name="spamcop_is_composing" value="<?php echo htmlspecialchars($passed_id) ?>" />
+  <input type="hidden" name="send_to" value="<?php echo htmlspecialchars($report_email)?>" />
   <input type="hidden" name="subject" value="reply anyway" />
   <input type="hidden" name="identity" value="0" />
-  <input type="hidden" name="session" value="<?PHP echo $session?>" />
+  <input type="hidden" name="session" value="<?php echo $session?>" />
 <?php
   echo '<input type="submit" name="send" value="' . _("Send Spam Report") . "\" />\n";
 } else {
@@ -198,8 +198,8 @@ echo "</p>";
    } ?>
   <input type="hidden" name="action" value="submit" />
   <input type="hidden" name="oldverbose" value="1" />
-  <input type="hidden" name="code" value="<?PHP echo htmlspecialchars($spamcop_id) ?>" />
-  <input type="hidden" name="spam" value="<?PHP echo htmlspecialchars($spam_message); ?>" />
+  <input type="hidden" name="code" value="<?php echo htmlspecialchars($spamcop_id) ?>" />
+  <input type="hidden" name="spam" value="<?php echo htmlspecialchars($spam_message); ?>" />
     <?php
 	echo '<input type="submit" name="x1" value="' . _("Send Spam Report") . "\" />\n";
     }
diff --git a/plugins/translate/options.php b/plugins/translate/options.php
index 68e25a78..f8e2c534 100644
--- a/plugins/translate/options.php
+++ b/plugins/translate/options.php
@@ -84,7 +84,7 @@ function ShowOption($Var, $value, $Desc) {
 
    echo '<option value="' . $value . '"';
    if ($$Var == $value) {
-       echo ' selected';
+       echo ' selected="selected"';
    }
    echo '>' . $Desc . "</option>\n";
 }
@@ -102,7 +102,7 @@ function ShowTrad( $tit, $com, $url ) {
 }
 
 ?>
-   <table width="95%" align="center" border=0 cellpadding=1 cellspacing=0><tr><td bgcolor="<?php echo $color[0] ?>">
+   <table width="95%" align="center" border="0" cellpadding="1" cellspacing="0"><tr><td bgcolor="<?php echo $color[0]; ?>">
       <center><b><?php echo _("Options") . ' - '. _("Translator"); ?></b></center>
    </td></tr></table>
 
@@ -150,8 +150,8 @@ function ShowTrad( $tit, $com, $url ) {
    <p>
 <?php
    echo _("You also decide if you want the translation box displayed, and where it will be located.") .
-        "<form action=\"$PHP_SELF\" method=post>".
-        '<table border=0 cellpadding=0 cellspacing=2>'.
+        '<form action="'.$PHP_SELF.'" method="post">'.
+        '<table border="0" cellpadding="0" cellspacing="2">'.
             '<tr><td align="right" nowrap>' .
              _("Select your translator:") .
              '</td>'.
@@ -170,7 +170,7 @@ function ShowTrad( $tit, $com, $url ) {
          '<tr>'.html_tag('td',_("When reading:"),'right','','nowrap').
          '<td><input type="checkbox" name="translate_translate_show_read"';
     if ($translate_show_read)
-        echo " checked";
+        echo ' checked="checked"';
     echo ' /> - ' . _("Show translation box") .
          ' <select name="translate_translate_location">';
     ShowOption('location', 'left', _("to the left"));
@@ -179,24 +179,23 @@ function ShowTrad( $tit, $com, $url ) {
     echo '</select><br />'.
          '<input type="checkbox" name="translate_translate_same_window"';
     if ($translate_same_window)
-        echo " checked";
+        echo ' checked="checked"';
     echo ' /> - ' . _("Translate inside the SquirrelMail frames").
     "</td></tr>\n";
 
 $disable_compose_translate=true;
 if (!$disable_compose_translate) {
    echo '<tr>'.html_tag('td',_("When composing:"),'right','','nowrap').
-         '<td><input type=checkbox name="translate_translate_show_send"';
+         '<td><input type="checkbox" name="translate_translate_show_send"';
    if ($translate_show_send)
-      echo " checked";
+      echo ' checked="checked"';
    echo ' /> - ' . _("Not yet functional, currently does nothing") .
       "</td></tr>\n";
 }
-   echo '<tr><td></td><td>'.
-        '<input type="submit" value="' . _("Submit") . '" name="submit_translate">'.
-        '</td></tr>'.
-   '</table>'.
-   '</form>'.
-"</body></html>\n";
-
-?>
\ No newline at end of file
+?>
+<tr><td></td><td>
+<input type="submit" value="<?php echo _("Submit"); ?>" name="submit_translate" />
+</td></tr>
+</table>
+</form>
+</body></html>
diff --git a/plugins/translate/setup.php b/plugins/translate/setup.php
index c59b1c80..7ba5dd8d 100644
--- a/plugins/translate/setup.php
+++ b/plugins/translate/setup.php
@@ -63,7 +63,7 @@ if ($trans_ar[0] != '') {
 
     $new_body = $body;
     $pos = strpos($new_body,
-            '">'. _("Download this as a file") . '</A></CENTER><BR></SMALL>');
+            '">'. _("Download this as a file") . '</a></center><br /></small>');
     if (is_int($pos)) {
         $new_body = substr($new_body, 0, $pos);
     }
@@ -208,11 +208,11 @@ function translate_lang_opt($from, $to, $value, $text) {
     $ret = '  <option value="' . $value . '"';
 
     if (translate_does_it_match_language($to) && ($translate_dir == 'to')) {
-        $ret .= ' SELECTED';
+        $ret .= ' selected="selected"';
     }
 
     if (translate_does_it_match_language($from) && ($translate_dir == 'from')) {
-        $ret .= ' SELECTED';
+        $ret .= ' selected="selected"';
     }
 
     $ret .= '>' . $text . "</option>\n";
@@ -263,10 +263,10 @@ function translate_new_form($action) {
 function translate_form_babelfish($message) {
     translate_new_form('http://babelfish.altavista.com/babelfish/tr');
 ?>
-    <input type="hidden" name="doit" value="done">
-    <input type="hidden" name="intl" value="1">
-    <input type="hidden" name="tt" value="urltext">
-    <input type="hidden" name="urltext" value="<?php echo $message; ?>">
+    <input type="hidden" name="doit" value="done" />
+    <input type="hidden" name="intl" value="1" />
+    <input type="hidden" name="tt" value="urltext" />
+    <input type="hidden" name="urltext" value="<?php echo $message; ?>" />
     <select name="lp"><?php
         echo translate_lang_opt('en_US', 'zh_CN', 'en_zh',
                                 sprintf( _("%s to %s"),_("English"),_("Chinese"))) .
@@ -307,7 +307,7 @@ function translate_form_babelfish($message) {
              translate_lang_opt('ru_RU',  '',    'ru_en',
                                 sprintf( _("%s to %s"),_("Russian"),_("English")));
     echo '</select>'.
-         'Babelfish: <input type="Submit" value="' . _("Translate") . '">';
+         'Babelfish: <input type="submit" value="' . _("Translate") . '" />';
 
     translate_table_end();
 }
@@ -321,8 +321,8 @@ function translate_form_babelfish($message) {
 function translate_form_go($message) {
     translate_new_form('http://translator.go.com/cb/trans_entry');
 ?>
-    <input type=hidden name=input_type value=text>
-    <select name=lp><?php
+    <input type="hidden" name="input_type" value="text" />
+    <select name="lp"><?php
         echo translate_lang_opt('en_US', 'es_ES', 'en_sp',
                                 sprintf( _("%s to %s"),_("English"),_("Spanish"))) .
              translate_lang_opt('en_US', 'fr_FR', 'en_fr',
@@ -344,8 +344,8 @@ function translate_form_go($message) {
              translate_lang_opt('pt*',   '',      'pt_en',
                                 sprintf( _("%s to %s"),_("Portuguese"),_("English")));
     echo '</select>'.
-         "<input type=\"hidden\" name=\"text\" value=\"$message\">".
-         'Go.com: <input type="Submit" value="' . _("Translate") . '">';
+         '<input type="hidden" name="text" value="'.$message.'" />'.
+         'Go.com: <input type="submit" value="' . _("Translate") . '" />';
 
     translate_table_end();
 }
@@ -358,11 +358,11 @@ function translate_form_go($message) {
  */
 function translate_form_intertran($message) {
     translate_new_form('http://www.tranexp.com:2000/InterTran');
-    echo '<INPUT TYPE="hidden" NAME="topframe" VALUE="yes">'.
-         '<INPUT TYPE="hidden" NAME="type" VALUE="text">'.
-         "<input type=\"hidden\" name=\"text\" value=\"$message\">";
+    echo '<input type="hidden" name="topframe" value="yes" />'.
+         '<input type="hidden" name="type" value="text" />'.
+         '<input type="hidden" name="text" value="'.$message.'" />';
 
-    $left = '<SELECT name="from">' .
+    $left = '<select name="from">' .
         translate_lang_opt('pt_BR', '',    'pob', _("Brazilian Portuguese")).
         translate_lang_opt('bg_BG', '',    'bul', _("Bulgarian") . ' (CP 1251)').
         translate_lang_opt('hr_HR', '',    'cro', _("Croatian") . ' (CP 1250)').
@@ -392,9 +392,9 @@ function translate_form_intertran($message) {
         translate_lang_opt('sv_SE', '',    'swe', _("Swedish")).
         translate_lang_opt('tr_TR', '',    'tur', _("Turkish") . ' (CP 1254)').
         translate_lang_opt('cy_GB', '',    'wel', _("Welsh")).
-        '</SELECT>';
+        '</select>';
 
-    $right = '<SELECT name="to">'.
+    $right = '<select name="to">'.
         translate_lang_opt('',    'pt_BR', 'pob', _("Brazilian Portuguese")).
         translate_lang_opt('',    'bg_BG', 'bul', _("Bulgarian") . ' (CP 1251)').
         translate_lang_opt('',    'hr_HR', 'cro', _("Croatian") . ' (CP 1250)').
@@ -424,9 +424,9 @@ function translate_form_intertran($message) {
         translate_lang_opt('',    'sv_SE', 'swe', _("Swedish")).
         translate_lang_opt('',    'tr_TR', 'tur', _("Turkish") . ' (CP 1254)').
         translate_lang_opt('',    'cy_GB', 'wel', _("Welsh")).
-        '</SELECT>';
+        '</select>';
     printf( _("%s to %s"), $left, $right );
-    echo 'InterTran: <input type=submit value="' . _("Translate") . '">';
+    echo 'InterTran: <input type="submit" value="' . _("Translate") . '" />';
 
     translate_table_end();
 }
@@ -450,10 +450,10 @@ function translate_form_gpltrans($message) {
         translate_lang_opt('', 'es_ES', 'spanish_dict',    _("Spanish")).
         '</select>';
     echo '<select name="toenglish">';
-    echo '<option value="yes" >'. _("to English") . '</option>';
-    echo '<option value="no" selected>' . _("from English") . '</option></select>';
-    echo "<input type=hidden name=text value=\"$message\">".
-        'GPLTrans: <input type="submit" value="' . _("Translate") . '">';
+    echo '<option value="yes">'. _("to English") . '</option>';
+    echo '<option value="no" selected="selected">' . _("from English") . '</option></select>';
+    echo '<input type="hidden" name="text" value="'.$message.'" />'.
+        'GPLTrans: <input type="submit" value="' . _("Translate") . '" />';
 
     translate_table_end();
 }
@@ -468,9 +468,9 @@ function translate_form_dictionary($message) {
     translate_new_form('http://dictionary.reference.com/translate/text.html');
     list($usec, $sec) = explode(" ",microtime());
     $time = $sec . (float)$usec*100000000;
-    echo "<input type=hidden name=text value=\"$message\" />".
-         "<input type=hidden name=r value=\"$time\" />".
-         '<SELECT NAME="lp">'.
+    echo '<input type="hidden" name="text" value="'.$message.'" />'.
+         '<input type="hidden" name="r" value="'.$time.'" />'.
+         '<select name="lp">'.
          translate_lang_opt('en_US', 'zh_CN', 'en_zh',
                             sprintf( _("%s to %s"),_("English"),_("Simplified Chinese"))) .
          translate_lang_opt('en_US', 'zh_TW', 'en_zt',
@@ -519,8 +519,8 @@ function translate_form_dictionary($message) {
                             sprintf( _("%s to %s"),_("Russian"),_("English"))) .
          translate_lang_opt('es_ES',  '',     'es_en',
                             sprintf( _("%s to %s"),_("Spanish"),_("English"))) .
-         '</SELECT>'.
-         'Dictionary.com: <INPUT TYPE="submit" VALUE="'._("Translate").'">';
+         '</select>'.
+         'Dictionary.com: <input type="submit" value="'._("Translate").'" />';
 
   translate_table_end();
 }
@@ -534,9 +534,9 @@ function translate_form_dictionary($message) {
 function translate_form_otenet($message) {
     translate_new_form('http://systran.otenet.gr/cgi-bin/systran.cgi');
 ?>
-    <input type="hidden" name="doit" value="done">
-    <INPUT NAME="partner" VALUE="OTEnet-en" type="hidden">
-    <input type="hidden" name="urltext" value="<?php echo $message; ?>">
+    <input type="hidden" name="doit" value="done" />
+    <input type="hidden" name="partner" value="OTEnet-en" />
+    <input type="hidden" name="urltext" value="<?php echo $message; ?>" />
     <select name="lp" size="1"><?php
         echo translate_lang_opt('en_US', 'el_GR', 'en_el',
                                 sprintf( _("%s to %s"),_("English"),_("Greek"))) .
@@ -546,7 +546,7 @@ function translate_form_otenet($message) {
                                 sprintf( _("%s to %s"),_("French"),_("Greek"))) .
 	     translate_lang_opt('el_GR', 'fr_FR', 'el_fr',
                                 sprintf( _("%s to %s"),_("Greek"),_("French"))) .
-	     translate_lang_opt('#',  '',  '', "----------------") .
+	     translate_lang_opt('#',  '',  '', '----------------') .
 	     translate_lang_opt('en_US', '',      'en_fr',
                                 sprintf( _("%s to %s"),_("English"),_("French"))) .
 	     translate_lang_opt('fr_FR', '',      'fr_en',
@@ -580,7 +580,7 @@ function translate_form_otenet($message) {
 	     translate_lang_opt('nl_NL', '',      'nl_fr',
                                 sprintf( _("%s to %s"),_("Dutch"),_("French"))) ;
     echo '</select>'.
-         'OTEnet: <input type="Submit" value="' . _("Translate") . '">';
+         'OTEnet: <input type="submit" value="' . _("Translate") . '" />';
     translate_table_end();
 
 }
@@ -593,16 +593,16 @@ function translate_form_otenet($message) {
  */
 function translate_form_promt($message) {
     translate_new_form('http://www.online-translator.com/text.asp#tr_form');
-    echo '<input type="hidden" name="status" value="translate">';
-    echo "<input type=\"hidden\" name=\"source\" value=\"$message\">";
+    echo '<input type="hidden" name="status" value="translate" />';
+    echo '<input type="hidden" name="source" value="'.$message.'" />';
     echo _("Interface language")." : ";
     echo "<select size=\"1\" name=\"lang\">\n";
-    echo "<option value=\"en\">" . _("English") . "</option>\n";
-    echo "<option value=\"ru\">" . _("Russian") . "</option>\n";
-    echo "<option value=\"de\">" . _("German") . "</option>\n";
-    echo "<option value=\"fr\">" . _("French") . "</option>\n";
-    echo "<option value=\"es\">" . _("Spanish") . "</option>\n";
-    echo "</select><br>\n";
+    echo '<option value="en">' . _("English") . "</option>\n";
+    echo '<option value="ru">' . _("Russian") . "</option>\n";
+    echo '<option value="de">' . _("German") . "</option>\n";
+    echo '<option value="fr">' . _("French") . "</option>\n";
+    echo '<option value="es">' . _("Spanish") . "</option>\n";
+    echo "</select><br />\n";
     echo _("Translation direction")." : ";
     echo '<select size="1" id="direction" name="direction">';
         echo translate_lang_opt('en_US', 'ru_RU', 'er',
@@ -631,9 +631,9 @@ function translate_form_promt($message) {
                                 sprintf( _("%s to %s"),_("English"),_("Spanish"))) .
 	     translate_lang_opt('es_ES', '',  'se',
                                 sprintf( _("%s to %s"),_("Spanish"),_("English"))) ;
-    echo "</select><br>\n";
-    echo "<input type=\"hidden\" name=\"template\" value=\"General\">\n";
-    echo 'PROMT: <input type="submit" value="' . _("Translate") . '">';
+    echo "</select><br />\n";
+    echo "<input type=\"hidden\" name=\"template\" value=\"General\" />\n";
+    echo 'PROMT: <input type="submit" value="' . _("Translate") . '" />';
 
     translate_table_end();
 }
@@ -647,10 +647,10 @@ function translate_form_promt($message) {
 function translate_form_google($message) {
     translate_new_form('http://www.google.com/translate_t');
 ?>
-    <input type="hidden" name="ie" value="Unknown">
-    <input type="hidden" name="oe" value="ASCII">
-    <input type="hidden" name="hl" value="en">
-    <input type="hidden" name="text" value="<?php echo $message; ?>">
+    <input type="hidden" name="ie" value="Unknown" />
+    <input type="hidden" name="oe" value="ASCII" />
+    <input type="hidden" name="hl" value="en" />
+    <input type="hidden" name="text" value="<?php echo $message; ?>" />
     <select name="langpair"><?php
         echo translate_lang_opt('en_US', 'de_DE', 'en|de',
 				sprintf( _("%s to %s"),_("English"),_("German"))) .
@@ -677,7 +677,7 @@ function translate_form_google($message) {
              translate_lang_opt('pt*',   '', 'pt|en',
                                 sprintf( _("%s to %s"),_("Portuguese"),_("English")));
     echo '</select>'.
-         'Google: <input type="Submit" value="' . _("Translate") . '">';
+         'Google: <input type="submit" value="' . _("Translate") . '" />';
 
     translate_table_end();
 }
diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 028c04fe..ded84c02 100644
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -46,7 +46,7 @@ sqgetGlobalVar('backend', $backend, SQ_POST);
  */
 function insert_javascript() {
     ?>
-    <SCRIPT LANGUAGE="Javascript"><!--
+    <script language="Javascript"><!--
 
     function to_and_close($addr) {
         to_address($addr);
@@ -104,7 +104,7 @@ function insert_javascript() {
         }
     }
 
-// --></SCRIPT>
+// --></script>
 <?php
 } /* End of included JavaScript */
 
@@ -302,4 +302,4 @@ if ($show == 'form' && empty($listall)) {
    
 }
 ?>
-</BODY></HTML>
+</body></html>
diff --git a/src/left_main.php b/src/left_main.php
index 694ed67b..7d8ecffd 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -64,7 +64,7 @@ function formatMailboxName($imapConnection, $box_array) {
     $line = '';
 
     /* If there are unseen message, bold the line. */
-    if ($unseen > 0) { $line .= '<B>'; }
+    if ($unseen > 0) { $line .= '<b>'; }
 
     /* Create the link for this folder. */
     if ($status !== false) {
@@ -86,7 +86,7 @@ function formatMailboxName($imapConnection, $box_array) {
     }
 
     /* If there are unseen message, close bolding. */
-    if ($unseen > 0) { $line .= "</B>"; }
+    if ($unseen > 0) { $line .= "</b>"; }
 
     /* Print unseen information. */
     if ($unseen_string != '') {
diff --git a/src/options_identities.php b/src/options_identities.php
index 42519058..12cf4de7 100644
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -301,7 +301,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', '<input size="50" type="text" value="' . htmlspecialchars($data) . '" name="' . $hd . $post . '">' , 'left' ) ,
+                           html_tag( 'td', '<input size="50" type="text" value="' . htmlspecialchars($data) . '" name="' . $hd . $post . '" />' , 'left' ) ,
                        '', $bg );
      return ($return_val);
 }
@@ -336,19 +336,19 @@ function ShowTableInfo($full_name, $email_address, $reply_to, $signature, $post)
     $return_val .= html_tag( 'tr', '', '', $OtherBG);
     $return_val .= html_tag( 'td', '&nbsp;', 'left' );
     $return_val .= html_tag( 'td', '', 'left' );
-    $return_val .= '<input type="hidden" name="form_for_'. $post .'" value="1">';
-    $return_val .= '<input type="submit" name="update" value="' . _("Save / Update") . '">';
+    $return_val .= '<input type="hidden" name="form_for_'. $post .'" value="1" />';
+    $return_val .= '<input type="submit" name="update" value="' . _("Save / Update") . '" />';
 
 
     if (! $isEmptySection && $post != '') {
         $return_val .= '<input type="submit" name="make_default_' . $post . '" value="'.
-             _("Make Default") . '">'.
+             _("Make Default") . '" />'.
              '<input type="submit" name="delete_' . $post . '" value="'.
-             _("Delete") . '">';
+             _("Delete") . '" />';
     }
     if (! $isEmptySection && $post != '' && $post > 1) {
-        $return_val .= '<input type=submit name="promote_' . $post . '" value="'.
-             _("Move Up") . '">';
+        $return_val .= '<input type="submit" name="promote_' . $post . '" value="'.
+             _("Move Up") . '" />';
     }
     $return_val .= concat_hook_function('options_identities_buttons', array($isEmptySection, $post));
     $return_val .=  '</td></tr>'.
diff --git a/themes/darkness.php b/themes/darkness.php
index c8c8d202..f338774d 100755
--- a/themes/darkness.php
+++ b/themes/darkness.php
@@ -63,7 +63,7 @@ function DarknessTremble() {
 }
 setTimeout('DarknessTremble()', 10000);
 </script>
-<?PHP
+<?php
 }
 
 global $squirrelmail_plugin_hooks;
@@ -157,4 +157,4 @@ f 14: Color for text with more than one quote (default: #FF0000)
 
 **/
 
-?>
+?>
\ No newline at end of file