From 60af27037b0e17d766989d96ea51a5b8297e646a Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Mon, 8 Jan 2007 19:34:16 +0000
Subject: [PATCH] MDL-7861 xhtml transient fixes for not closed input fields -
 I hope all of them except imported libs are now fixed

---
 admin/auth.php                                |  6 +-
 admin/auth_config.php                         |  4 +-
 admin/enrol_config.php                        |  2 +-
 admin/mnet/access_control.php                 |  4 +-
 admin/register.php                            | 22 ++---
 blocks/search_forums/block_search_forums.php  |  2 +-
 blog/TODO.txt                                 |  2 +-
 course/search.php                             |  6 +-
 enrol/authorize/locallib.php                  | 24 ++---
 enrol/authorize/uploadcsv.php                 |  4 +-
 enrol/manual/enrol.html                       |  2 +-
 filter/algebra/algebradebug.php               | 14 +--
 filter/tex/texdebug.php                       | 10 +-
 filter/tex/texed.php                          |  4 +-
 iplookup/ipatlas/ip-atlas_prefs.php           | 10 +-
 iplookup/ipatlas/plot.php                     |  2 +-
 lang/en_utf8/help/quiz/calculated.html        |  6 +-
 lib/editor/htmlarea/coursefiles.php           |  2 +-
 lib/editor/htmlarea/popups/select_color.php   |  2 +-
 lib/rsslib.php                                |  2 +-
 lib/speller/controls.html                     | 12 +--
 lib/speller/spellchecker.html                 |  2 +-
 lib/speller/wordWindow.js                     |  2 +-
 login/mnet_email.php                          |  4 +-
 mod/data/edit.php                             | 10 +-
 mod/glossary/config.html                      | 98 +++++++++----------
 mod/hotpot/config.html                        |  4 +-
 mod/hotpot/hotpot-full.js                     | 28 +++---
 mod/hotpot/mod.html                           |  6 +-
 mod/hotpot/report.php                         |  2 +-
 mod/hotpot/report/overview/report.php         |  8 +-
 mod/hotpot/template/v6.php                    |  4 +-
 mod/hotpot/template/v6/hp6sendresults.js_     | 22 ++---
 mod/hotpot/template/v6/jcross6.js_            |  2 +-
 mod/hotpot/view.php                           |  4 +-
 mod/lams/mod.html                             |  2 +-
 mod/lesson/highscores.php                     |  2 +-
 mod/quiz/report/grading/report.php            |  8 +-
 mod/resource/type/file/localfile.php          |  2 +-
 mod/resource/type/file/localpath.php          |  4 +-
 .../type/repository/hive/openhive.php         | 28 +++---
 mod/wiki/ewiki/plugins/moodle/downloads.php   |  2 +-
 .../type/datasetdependent/datasetitems.php    |  2 +-
 user/messageselect.php                        |  6 +-
 44 files changed, 197 insertions(+), 197 deletions(-)

diff --git a/admin/auth.php b/admin/auth.php
index 221527c8e8..10035f82ef 100644
--- a/admin/auth.php
+++ b/admin/auth.php
@@ -173,14 +173,14 @@ foreach ($displayauths as $auth => $name) {
     if (in_array($auth, $authsenabled)) {
         $hideshow = "<a href=\"$url&amp;action=disable&amp;auth=$auth\">";
         $hideshow .= "<img src=\"{$CFG->pixpath}/i/hide.gif\" class=\"icon\" alt=\"disable\" /></a>";
-        // $hideshow = "<a href=\"$url&amp;action=disable&amp;auth=$auth\"><input type=\"checkbox\" checked></a>";
+        // $hideshow = "<a href=\"$url&amp;action=disable&amp;auth=$auth\"><input type=\"checkbox\" checked /></a>";
         $enabled = true;
         $displayname = "<span>$name</span>";
     }
     else {
         $hideshow = "<a href=\"$url&amp;action=enable&amp;auth=$auth\">";
         $hideshow .= "<img src=\"{$CFG->pixpath}/i/show.gif\" class=\"icon\" alt=\"enable\" /></a>";
-        // $hideshow = "<a href=\"$url&amp;action=enable&amp;auth=$auth\"><input type=\"checkbox\"></a>";
+        // $hideshow = "<a href=\"$url&amp;action=enable&amp;auth=$auth\"><input type=\"checkbox\" /></a>";
         $enabled = false;
         $displayname = "<span class=\"dimmed_text\">$name</span>";
     }
@@ -272,7 +272,7 @@ echo "</table>\n";
 ////////////////////////////////////////////////////////////////////////////////
 
 
-echo '<center><input type="submit" value="'.get_string('savechanges').'"></center>';
+echo '<center><input type="submit" value="'.get_string('savechanges').'" /></center>';
 echo '</form>';
 admin_externalpage_print_footer($adminroot);
 
diff --git a/admin/auth_config.php b/admin/auth_config.php
index 2c8ec9c81c..f19c532c59 100644
--- a/admin/auth_config.php
+++ b/admin/auth_config.php
@@ -64,7 +64,7 @@ admin_externalpage_print_header($adminroot);
 // choose an authentication method
 echo "<form $CFG->frametarget id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
 echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">\n";
-echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\">\n";
+echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";
 
 // auth plugin description
 print_simple_box_start('center', '80%');
@@ -75,7 +75,7 @@ print_simple_box_end();
 echo "<hr />\n";
 $authplugin->config_form($frm, $err);
 print_simple_box_end();
-echo '<center><p><input type="submit" value="' . get_string("savechanges") . "\"></p></center>\n";
+echo '<center><p><input type="submit" value="' . get_string("savechanges") . "\" /></p></center>\n";
 echo "</form>\n";
 
 admin_externalpage_print_footer($adminroot);
diff --git a/admin/enrol_config.php b/admin/enrol_config.php
index f69e7d5477..6046263c94 100644
--- a/admin/enrol_config.php
+++ b/admin/enrol_config.php
@@ -59,7 +59,7 @@
 
     $enrolment->config_form($frm);
 
-    echo "<center><p><input type=\"submit\" value=\"".get_string("savechanges")."\"></p></center>\n";
+    echo "<center><p><input type=\"submit\" value=\"".get_string("savechanges")."\" /></p></center>\n";
     echo "</form>";
 
     print_simple_box_end();
diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index 284ab76b0e..a887de7b8b 100644
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -181,7 +181,7 @@ echo get_string('username') . ":\n";
 if (!empty($formerror['username'])) {
     echo '<span class="error"> * </span>';
 }
-echo '<input type="text" name="username" size="20" maxlength="100">';
+echo '<input type="text" name="username" size="20" maxlength="100" />';
 
 // choose a remote host
 echo " " . get_string('remotehost', 'mnet') . ":\n";
@@ -200,7 +200,7 @@ $accessmenu['deny'] = get_string('deny', 'mnet');
 choose_from_menu($accessmenu, 'access');
 
 // submit button
-echo '<input type="submit" value="' . get_string('addtoacl', 'mnet') . '">';
+echo '<input type="submit" value="' . get_string('addtoacl', 'mnet') . '" />';
 echo "</form></div>\n";
 
 // print errors
diff --git a/admin/register.php b/admin/register.php
index a7e2bd7135..7058e07ad5 100644
--- a/admin/register.php
+++ b/admin/register.php
@@ -62,8 +62,8 @@
    
     echo "<input type=\"hidden\" name=\"url\" value=\"$CFG->wwwroot\">\n";
     echo "<input type=\"hidden\" name=\"secret\" value=\"$CFG->siteidentifier\">\n";
-    echo "<input type=\"hidden\" name=\"host\" value=\"".$_SERVER["HTTP_HOST"]."\">\n";
-    echo "<input type=\"hidden\" name=\"lang\" value=\"".current_language()."\">\n";
+    echo "<input type=\"hidden\" name=\"host\" value=\"".$_SERVER["HTTP_HOST"]."\" />\n";
+    echo "<input type=\"hidden\" name=\"lang\" value=\"".current_language()."\" />\n";
     echo "</td></tr>\n";
 
     echo "<tr valign=\"top\">\n";
@@ -114,18 +114,18 @@
 
     $count = count_records('course')-1;
     echo get_string("courses").": ".$count;
-    echo "<input type=\"hidden\" name=\"courses\" value=\"$count\">\n";
+    echo "<input type=\"hidden\" name=\"courses\" value=\"$count\" />\n";
     echo '<br />';
 
     $count = count_records('user', 'deleted', 0);
     echo get_string("users").": ".$count;
-    echo "<input type=\"hidden\" name=\"users\" value=\"$count\">\n";
+    echo "<input type=\"hidden\" name=\"users\" value=\"$count\" />\n";
     echo '<br />';
 
     // total number of role assignments
     $count = count_records('role_assignments'); 
     echo get_string('roleassignments', 'role').": ".$count;
-    echo "<input type=\"hidden\" name=\"roleassignments\" value=\"$count\">\n";
+    echo "<input type=\"hidden\" name=\"roleassignments\" value=\"$count\" />\n";
     echo '<br />';
 
     // first find all distinct roles with mod/course:update
@@ -140,22 +140,22 @@
     
     $count = count_records_sql($sql);
     echo get_string("teachers").": ".$count;
-    echo "<input type=\"hidden\" name=\"courseupdaters\" value=\"$count\">\n";
+    echo "<input type=\"hidden\" name=\"courseupdaters\" value=\"$count\" />\n";
     echo '<br />';
 
     $count = count_records('forum_posts');
     echo get_string("posts", 'forum').": ".$count;
-    echo "<input type=\"hidden\" name=\"posts\" value=\"$count\">\n";
+    echo "<input type=\"hidden\" name=\"posts\" value=\"$count\" />\n";
     echo '<br />';
 
     $count = count_records('question');
     echo get_string("questions", 'quiz').": ".$count;
-    echo "<input type=\"hidden\" name=\"questions\" value=\"$count\">\n";
+    echo "<input type=\"hidden\" name=\"questions\" value=\"$count\" />\n";
     echo '<br />';
 
     $count = count_records('resource');
     echo get_string("modulenameplural", "resource").": ".$count;
-    echo "<input type=\"hidden\" name=\"resources\" value=\"$count\">\n";
+    echo "<input type=\"hidden\" name=\"resources\" value=\"$count\" />\n";
     echo '<br />';
 
     echo "</td>\n";
@@ -167,7 +167,7 @@
 
     echo "<tr valign=\"top\">\n";
     echo "<td align=\"right\">".get_string("administrator").":</td>\n";
-    echo "<td><input size=\"50\" type=\"text\" name=\"adminname\" value=\"".fullname($admin, true)."\"></td>\n";
+    echo "<td><input size=\"50\" type=\"text\" name=\"adminname\" value=\"".fullname($admin, true)."\" /></td>\n";
     echo "</tr>\n";
 
     echo "<tr valign=\"top\">\n";
@@ -187,7 +187,7 @@
 
     echo "<tr valign=\"top\">\n";
     echo "<td align=\"right\">&nbsp;</td>\n";
-    echo "<td><input type=\"submit\" value=\"".get_string("registrationsend")."\"></td>\n";
+    echo "<td><input type=\"submit\" value=\"".get_string("registrationsend")."\" /></td>\n";
     echo "</tr>\n";
 
 
diff --git a/blocks/search_forums/block_search_forums.php b/blocks/search_forums/block_search_forums.php
index 4f76b79035..340a52eb6a 100644
--- a/blocks/search_forums/block_search_forums.php
+++ b/blocks/search_forums/block_search_forums.php
@@ -26,7 +26,7 @@ class block_search_forums extends block_base {
 
         $advancedsearch = get_string('advancedsearch', 'block_search_forums');
 
-        //Accessibility: replaced <input value=">" type="submit"> with configurable text/'silent' character.
+        //Accessibility: replaced <input value=" />" type="submit"> with configurable text/'silent' character.
         check_theme_arrows();
         // Theme config, $CFG->block_search_button = $THEME->rarrow .'<span class="accesshide">'.get_string('search').'</span>';
         $button = (isset($CFG->block_search_button)) ? $CFG->block_search_button : get_string('go');
diff --git a/blog/TODO.txt b/blog/TODO.txt
index 4f34ff1514..8a24914c13 100644
--- a/blog/TODO.txt
+++ b/blog/TODO.txt
@@ -190,7 +190,7 @@ define('MAGPIE_CACHE_FRESH_ONLY', false); //should be exposed as an admin config
 //below is a section removed from edit.php.
 <?php
 if($CFG->blog_useweblog_rpc) {
-echo "<input type=checkbox name=weblogrpc value=\"1\">Send update notice to weblogs.com<br>(may cause longer load time)&nbsp;";
+echo "<input type=checkbox name=weblogrpc value=\"1\" />Send update notice to weblogs.com<br>(may cause longer load time)&nbsp;";
 }?>
 
 � DH - RSS - All rss/atom scripts should use a blogFilter with arguments passed in to be used in loading correct blogEntries. Either the news page or a new function in BlogFilter should build the cache filename. Create a new page that has full drop down menu options to select a specific feed type (filter news feeds by category, user, date to start with)
diff --git a/course/search.php b/course/search.php
index da00455ccd..bbafea3cea 100644
--- a/course/search.php
+++ b/course/search.php
@@ -155,9 +155,9 @@
 
             echo "<form id=\"movecourses\" action=\"search.php\" method=\"post\">";
             echo "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\">";
-            echo "<input type=\"hidden\" name=\"search\" value=\"".s($search, true)."\">";
-            echo "<input type=\"hidden\" name=\"page\" value=\"$page\">";
-            echo "<input type=\"hidden\" name=\"perpage\" value=\"$perpage\">";
+            echo "<input type=\"hidden\" name=\"search\" value=\"".s($search, true)."\" />";
+            echo "<input type=\"hidden\" name=\"page\" value=\"$page\" />";
+            echo "<input type=\"hidden\" name=\"perpage\" value=\"$perpage\" />";
             echo "<table align=\"center\" border=0 cellspacing=2 cellpadding=4 class=\"generalbox\"><tr>";
             echo "<th scope=\"col\">$strcourses</th>";
             echo "<th scope=\"col\">$strcategory</th>";
diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php
index 90c294070b..a8c93b5f10 100644
--- a/enrol/authorize/locallib.php
+++ b/enrol/authorize/locallib.php
@@ -71,7 +71,7 @@ function authorize_print_orders($courseid, $userid)
         popup_form($baseurl.'&amp;status='.$status.'&amp;course=',$popupcrs,'coursesmenu',$courseid,'','','',false);echo"</td>\n";
         if (has_capability('enrol/authorize:uploadcsv', get_context_instance(CONTEXT_USER, $USER->id))) {
             echo "<form method='get' action='uploadcsv.php'>";
-            echo "<td rowspan=2 align='right' valign='middle' width='50%'><input type='submit' value='".get_string('uploadcsv', 'enrol_authorize')."'></td>";
+            echo "<td rowspan=2 align='right' valign='middle' width='50%'><input type='submit' value='".get_string('uploadcsv', 'enrol_authorize')."' /></td>";
             echo "</form>";
         }
         else {
@@ -228,7 +228,7 @@ function authorize_print_order_details($orderno)
     }
 
     echo "<form action=\"index.php\" method=\"post\">\n";
-    echo "<input type=\"hidden\" name=\"order\" value=\"$orderno\">\n";
+    echo "<input type=\"hidden\" name=\"order\" value=\"$orderno\" />\n";
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"" . sesskey() . "\" />";
 
     $settled = authorize_settled($order);
@@ -266,7 +266,7 @@ function authorize_print_order_details($orderno)
             $strcaptureyes = get_string('captureyes', 'enrol_authorize');
             $table->data[] = array("<b>$strs->confirm:</b>",
             "$strcaptureyes <br />
-            <input type='hidden' name='confirm' value='1'><input type='submit' name='". ORDER_CAPTURE ."' value='$authstrs->capture' />
+            <input type='hidden' name='confirm' value='1' /><input type='submit' name='". ORDER_CAPTURE ."' value='$authstrs->capture' />
             &nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
         }
         else {
@@ -328,8 +328,8 @@ function authorize_print_order_details($orderno)
                 $cbunenrol = print_checkbox('unenrol', '1', !empty($unenrol), '', '', '', true);
                 $table->data[] = array("<b>$authstrs->unenrolstudent</b>", $cbunenrol);
                 $table->data[] = array("<b>$strhowmuch</b>",
-                    "<input type='hidden' name='confirm' value='1'>
-                     <input type='text' size='5' name='amount' value='$amount'>
+                    "<input type='hidden' name='confirm' value='1' />
+                     <input type='text' size='5' name='amount' value='$amount' />
                      $strcanbecredit<br /><input type='submit' name='".ORDER_REFUND."' value='$authstrs->refund'>");
             }
             else {
@@ -371,8 +371,8 @@ function authorize_print_order_details($orderno)
             if (empty($confirm)) {
                 $strvoidyes = get_string('voidyes', 'enrol_authorize');
                 $table->data[] = array("<b>$strs->confirm:</b>",
-                    "$strvoidyes<br /><input type='hidden' name='".ORDER_VOID."' value='y'>
-                     <input type='hidden' name='confirm' value='1'>
+                    "$strvoidyes<br /><input type='hidden' name='".ORDER_VOID."' value='y' />
+                     <input type='hidden' name='confirm' value='1' />
                      <input type='submit' value='$authstrs->void'>
                      &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
             }
@@ -418,9 +418,9 @@ function authorize_print_order_details($orderno)
                     $cbunenrol = print_checkbox('unenrol', '1', !empty($unenrol), '', '', '', true);
                     $table->data[] = array("<b>$authstrs->unenrolstudent</b>", $cbunenrol);
                     $table->data[] = array("<b>$strs->confirm:</b>",
-                        "$strsubvoidyes<br /><input type='hidden' name='".ORDER_VOID."' value='y'>
-                         <input type='hidden' name='confirm' value='1'>
-                         <input type='hidden' name='suborder' value='$suborderno'>
+                        "$strsubvoidyes<br /><input type='hidden' name='".ORDER_VOID."' value='y' />
+                         <input type='hidden' name='confirm' value='1' />
+                         <input type='hidden' name='suborder' value='$suborderno' />
                          <input type='submit' value='$authstrs->void'>
                          &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
                 }
@@ -457,8 +457,8 @@ function authorize_print_order_details($orderno)
             $cbunenrol = print_checkbox('unenrol', '1', !empty($unenrol), '', '', '', true);
             $table->data[] = array("<b>$authstrs->unenrolstudent</b>", $cbunenrol);
             $table->data[] = array("<b>$strs->confirm:</b>",
-                "<input type='hidden' name='".ORDER_DELETE."' value='y'>
-                 <input type='hidden' name='confirm' value='1'>
+                "<input type='hidden' name='".ORDER_DELETE."' value='y' />
+                 <input type='hidden' name='confirm' value='1' />
                  <input type='submit' value='$authstrs->delete'>
                  &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
         }
diff --git a/enrol/authorize/uploadcsv.php b/enrol/authorize/uploadcsv.php
index 5ec81f24b3..f13dfbd346 100644
--- a/enrol/authorize/uploadcsv.php
+++ b/enrol/authorize/uploadcsv.php
@@ -33,10 +33,10 @@
 /// Print submit form
     $maxuploadsize = get_max_upload_file_size();
     echo '<center><form method="post" enctype="multipart/form-data" action="uploadcsv.php">
-          <input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'">
+          <input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'" />
           <input type="hidden" name="sesskey" value="'.$USER->sesskey.'">';
           upload_print_form_fragment(1, array('csvfile'), array(get_string('file')));
-    echo '<input type="submit" value="'.get_string('upload').'">';
+    echo '<input type="submit" value="'.get_string('upload').'" />';
     echo '</form></center><br />';
 
 /// Print footer
diff --git a/enrol/manual/enrol.html b/enrol/manual/enrol.html
index fee7c259cf..c1a05fa8ac 100644
--- a/enrol/manual/enrol.html
+++ b/enrol/manual/enrol.html
@@ -47,7 +47,7 @@
               <td><?php print_string('allowguests') ?>:&nbsp; </td>
               <td>
                 <input name="id" value="<?php p($course->id) ?>" type="hidden">
-                <input name="loginasguest" value="yes" type="hidden">
+                <input name="loginasguest" value="yes" type="hidden" />
                 <input value="<?php print_string('loginguest') ?>" type="submit">
               </td>
             </tr>
diff --git a/filter/algebra/algebradebug.php b/filter/algebra/algebradebug.php
index 787a68e8c4..75b86bad59 100644
--- a/filter/algebra/algebradebug.php
+++ b/filter/algebra/algebradebug.php
@@ -332,21 +332,21 @@ function slasharguments($texexp, $md5) {
            target="inlineframe">
             <center>
              <input type="text" name="algebra" size="50"
-                    value="sin(z)/(x^2+y^2)">
+                    value="sin(z)/(x^2+y^2)" />
             </center>
            <ol>
-           <li>First click on this button <input type="submit" name="ShowDB" value="Show DB Entry">
+           <li>First click on this button <input type="submit" name="ShowDB" value="Show DB Entry" />
                to see the cache_filters database entry for this expression.</li>
            <li>If the database entry looks corrupt, click on this button to delete it:
-               <input type="submit" name="DeleteDB" value="Delete DB Entry"></li>
-           <li>Now click on this button <input type="submit" name="TeXStage1" value="First Stage Tex Translation">.
+               <input type="submit" name="DeleteDB" value="Delete DB Entry" /></li>
+           <li>Now click on this button <input type="submit" name="TeXStage1" value="First Stage Tex Translation" />.
                A preliminary translation into TeX will appear in the box below.</li>
-           <li>Next click on this button <input type="submit" name="TeXStage2" value="Second Stage Tex Translation">.
+           <li>Next click on this button <input type="submit" name="TeXStage2" value="Second Stage Tex Translation" />.
                A more refined translation into TeX will appear in the box below.</li>
-           <li>Then click on this button <input type="submit" name="ShowImage" value="Show Image">
+           <li>Then click on this button <input type="submit" name="ShowImage" value="Show Image" />
                to show a graphic image of the algebraic expression.</li>
            <li>Finally check your slash arguments setting
-               <input type="submit" name="SlashArguments" value="Check Slash Arguments"></li>
+               <input type="submit" name="SlashArguments" value="Check Slash Arguments" /></li>
            </ol>
           </form> <br /> <br />
        <center>
diff --git a/filter/tex/texdebug.php b/filter/tex/texdebug.php
index 2db14a7c73..6120f8c157 100644
--- a/filter/tex/texdebug.php
+++ b/filter/tex/texdebug.php
@@ -209,17 +209,17 @@
            target="inlineframe">
             <center>
              <input type="text" name="tex" size="50"
-                    value="f(x)=\Bigint_{-\infty}^x~e^{-t^2}dt">
+                    value="f(x)=\Bigint_{-\infty}^x~e^{-t^2}dt" />
             </center>
            <ol>
-           <li>First click on this button <input type="submit" name="ShowDB" value="Show DB Entry">
+           <li>First click on this button <input type="submit" name="ShowDB" value="Show DB Entry" />
                to see the cache_filters database entry for this expression.</li>
            <li>If the database entry looks corrupt, click on this button to delete it:
-               <input type="submit" name="DeleteDB" value="Delete DB Entry"></li>
-           <li>Then click on this button <input type="submit" name="ShowImage" value="Show Image">
+               <input type="submit" name="DeleteDB" value="Delete DB Entry" /></li>
+           <li>Then click on this button <input type="submit" name="ShowImage" value="Show Image" />
                to show a graphic image of the algebraic expression.</li>
            <li>Finally check your slash arguments setting
-               <input type="submit" name="SlashArguments" value="Check Slash Arguments"></li>
+               <input type="submit" name="SlashArguments" value="Check Slash Arguments" /></li>
            </ol>
           </form> <br /> <br />
        <center>
diff --git a/filter/tex/texed.php b/filter/tex/texed.php
index c0069428f4..d20fa9a66f 100644
--- a/filter/tex/texed.php
+++ b/filter/tex/texed.php
@@ -74,8 +74,8 @@
           <form action="texed.php" method="get"
            target="inlineframe">
              <input type="text" name="formdata" size="50"
-                    value="\Large f(x)=\Bigint_{-\infty}^x~e^{-t^2}dt">
-             <input type="submit">
+                    value="\Large f(x)=\Bigint_{-\infty}^x~e^{-t^2}dt" />
+             <input type="submit" />
           </form> <br /> <br />
           <iframe name="inlineframe" align="middle" width="80%" height="100">
           &lt;p&gt;Something is wrong...&lt;/p&gt; 
diff --git a/iplookup/ipatlas/ip-atlas_prefs.php b/iplookup/ipatlas/ip-atlas_prefs.php
index dde0f0005a..589ba98c66 100644
--- a/iplookup/ipatlas/ip-atlas_prefs.php
+++ b/iplookup/ipatlas/ip-atlas_prefs.php
@@ -124,7 +124,7 @@ print "</select><br /><br />";
 
 } else {
 
-  print "<input type=\"hidden\" name=\"seldrawmode\" value=\"0\">";
+  print "<input type=\"hidden\" name=\"seldrawmode\" value=\"0\" />";
 
 }
 
@@ -134,7 +134,7 @@ print "</select><br /><br />";
 <?php
 if($drawmode == "GD") {
 print '
-<input type="hidden" name="cssdot" value="reddot.gif">
+<input type="hidden" name="cssdot" value="reddot.gif" />
 
 <table><tr>
 
@@ -201,9 +201,9 @@ print "<option value=\"$filename\">$curdot";
 print "</select><br />";
 
 print '
-<input type="hidden" name="shape" value="Diamond">
-<input type="hidden" name="color" value="Red">
-<input type="hidden" name="size" value="3">
+<input type="hidden" name="shape" value="Diamond" />
+<input type="hidden" name="color" value="Red" />
+<input type="hidden" name="size" value="3" />
 ';
 
 }
diff --git a/iplookup/ipatlas/plot.php b/iplookup/ipatlas/plot.php
index 878001d9d9..838469b509 100644
--- a/iplookup/ipatlas/plot.php
+++ b/iplookup/ipatlas/plot.php
@@ -125,7 +125,7 @@ print '
 <br /><br />
 <form method="GET" action="'.$PHP_SELF.'#map">
 <table width="100%"><tr><td nowrap align="left">
-'.t("IP/Hostname:").' <input value="'.$values["address"].'" type="text" size="30" name="address"><input type="Submit" value="'.t("Submit").'"></td><td align="right" width="100%">
+'.t("IP/Hostname:").' <input value="'.$values["address"].'" type="text" size="30" name="address" /><input type="Submit" value="'.t("Submit").'" /></td><td align="right" width="100%">
 [ <a href="ip-atlas_prefs.php?lastquery='?><?php  if(isset($HTTP_GET_VARS["address"])) { echo $HTTP_GET_VARS["address"]; } ?><?php  echo '">'.t("preferences").'</a> ]
 [ <a href="'."$PHP_SELF".'">'.t("locate me").'</a> ]
 </td></tr></table>
diff --git a/lang/en_utf8/help/quiz/calculated.html b/lang/en_utf8/help/quiz/calculated.html
index 7ec8250247..2baecf89f0 100644
--- a/lang/en_utf8/help/quiz/calculated.html
+++ b/lang/en_utf8/help/quiz/calculated.html
@@ -20,14 +20,14 @@ Calculated questions offers a way to create individual numerical question by the
 <tr valign="top">
 <td align="right"><p><b>Correct Answer Formula:</b></p></td>
     <td>
-    <input align="left" type="text" id="formula0" name="answer[]" size="20" value="{a} + {b}">&nbsp;&nbsp;
-    <input type="hidden" name="fraction[]" value="1.0">
+    <input align="left" type="text" id="formula0" name="answer[]" size="20" value="{a} + {b}" />&nbsp;&nbsp;
+    <input type="hidden" name="fraction[]" value="1.0" />
     </td>
 </tr>
 <tr valign="top">
     <td align="right"><p><b>Tolerance:</b></p></td>
     <td>
-    <input align="left" type="text" id="tolerance0&quot;" name="tolerance[]" size="15" value="0.01">±
+    <input align="left" type="text" id="tolerance0&quot;" name="tolerance[]" size="15" value="0.01" />±
     </td>
 </tr>
 <tr valign="top">
diff --git a/lib/editor/htmlarea/coursefiles.php b/lib/editor/htmlarea/coursefiles.php
index 8d6b2951c1..f714f7dfde 100644
--- a/lib/editor/htmlarea/coursefiles.php
+++ b/lib/editor/htmlarea/coursefiles.php
@@ -468,7 +468,7 @@
                     echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />\n";
                     echo " <input type=\"hidden\" name=\"action\" value=\"zip\" />\n";
                     echo " <input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />\n";
-                    echo " <INPUT TYPE=text name=name SIZE=35 value=\"new.zip\" />\n";
+                    echo " <INPUT type=\"text\" name=\"name\" size=\"35\" value=\"new.zip\" />\n";
                     echo " <input type=\"submit\" value=\"".get_string("createziparchive")."\" />";
                     echo "</form>\n";
                     echo "</td>\n<td>\n";
diff --git a/lib/editor/htmlarea/popups/select_color.php b/lib/editor/htmlarea/popups/select_color.php
index 0d6f4742be..a364f263b9 100644
--- a/lib/editor/htmlarea/popups/select_color.php
+++ b/lib/editor/htmlarea/popups/select_color.php
@@ -70,7 +70,7 @@ function ValidateColor(string) {                // return valid color code
  <tr>
   <td style="background:buttonface" valign=center><div style="background-color: #000000; padding: 1; height: 21px; width: 50px"><div id="ColorPreview" style="height: 100%; width: 100%"></div></div></td>
   <td style="background:buttonface" valign=center><input type="text" name="ColorHex"
-    id="ColorHex" value="" size=15 style="font-size: 12px"></td>
+    id="ColorHex" value="" size=15 style="font-size: 12px" /></td>
   <td style="background:buttonface" width=100%></td>
  </tr>
 </table>
diff --git a/lib/rsslib.php b/lib/rsslib.php
index 8eef655c08..f3f333b5ab 100644
--- a/lib/rsslib.php
+++ b/lib/rsslib.php
@@ -508,7 +508,7 @@ function rss_get_form($act='none', $url='', $rssid='', $preferredtitle='', $shar
     $returnstring .= '<input type="hidden" name="user" value="'. $USER->id .'" />'."\n";
     $returnstring .= '<br /><input type="submit" value="';
     $validatestring = "<a href=\"#\" 
-onClick=\"window.open('http://feedvalidator.org/check.cgi?url='+getElementId('block_rss').elements['url'].value,'validate','width=640,height=480,scrollbars=yes,status=yes,resizable=yes');return true;\">". get_string('validatefeed', 'block_rss_client')."</a>";
+onClick=\"window.open('http://feedvalidator.org/check.cgi?url='+getElementId('block_rss').elements['url'].value,'validate','width=640,height=480,scrollbars=yes,status=yes,resizable=yes');return true;\" />". get_string('validatefeed', 'block_rss_client')."</a>";
 
     if ($act == 'rssedit') {
         $returnstring .= $stredit;
diff --git a/lib/speller/controls.html b/lib/speller/controls.html
index 1e7ed5737d..868c64e07c 100644
--- a/lib/speller/controls.html
+++ b/lib/speller/controls.html
@@ -111,11 +111,11 @@ function init_spell() {
 		<table border="0" cellpadding="0" cellspacing="0" border="0">
 		<tr>
 			<td>
-			<input class="buttonDefault" type="button" value="Ignore" onClick="ignore_word();">
+			<input class="buttonDefault" type="button" value="Ignore" onClick="ignore_word();" />
 			</td>
 			<td>&nbsp;&nbsp;</td>
 			<td>
-			<input class="buttonDefault" type="button" value="Ignore All" onClick="ignore_all();">
+			<input class="buttonDefault" type="button" value="Ignore All" onClick="ignore_all();" />
 			</td>
 		</tr>
 		<tr>
@@ -124,11 +124,11 @@ function init_spell() {
 		<tr>
 
 			<td>
-			<input class="buttonDefault" type="button" value="Replace" onClick="replace_word();">
+			<input class="buttonDefault" type="button" value="Replace" onClick="replace_word();" />
 			</td>
 			<td>&nbsp;&nbsp;</td>
 			<td>
-			<input class="buttonDefault" type="button" value="Replace All" onClick="replace_all();">
+			<input class="buttonDefault" type="button" value="Replace All" onClick="replace_all();" />
 			</td>
 		</tr>
 		<tr>
@@ -136,11 +136,11 @@ function init_spell() {
 		</tr>
 		<tr>
 			<td>
-			<input class="buttonDefault" type="button" name="btnUndo" value="Undo" onClick="undo();" disabled>
+			<input class="buttonDefault" type="button" name="btnUndo" value="Undo" onClick="undo();" disabled />
 			</td>
 			<td>&nbsp;&nbsp;</td>
 			<td>
-			<input class="buttonDefault" type="button" value="Close" onClick="end_spell();">
+			<input class="buttonDefault" type="button" value="Close" onClick="end_spell();" />
 			</td>
 		</tr>
 		</table>
diff --git a/lib/speller/spellchecker.html b/lib/speller/spellchecker.html
index 5811ae993e..0a303ac8f7 100644
--- a/lib/speller/spellchecker.html
+++ b/lib/speller/spellchecker.html
@@ -45,7 +45,7 @@ function postWords() {
 		bodyDoc.write('<p>Spell check in progress...</p>');
 		bodyDoc.write('<form action="'+speller.spellCheckScript+'" method="post">');
 		for( var i = 0; i < speller.textInputs.length; i++ ) {
-			bodyDoc.write('<input type="hidden" name="textinputs[]" value="'+encodeForPost(speller.textInputs[i].value)+'">');
+			bodyDoc.write('<input type="hidden" name="textinputs[]" value="'+encodeForPost(speller.textInputs[i].value)+'" />');
 		}
 		bodyDoc.write('</form>');
 		bodyDoc.write('</body>');
diff --git a/lib/speller/wordWindow.js b/lib/speller/wordWindow.js
index 68df5c0ca5..553b9c49eb 100644
--- a/lib/speller/wordWindow.js
+++ b/lib/speller/wordWindow.js
@@ -258,7 +258,7 @@ function _getWordObject( textIndex, wordIndex ) {
 
 function _wordInputStr( word ) {
 	var str = '<input readonly ';
-	str += 'class="blend" type="text" value="' + word + '" size="' + word.length + '">';
+	str += 'class="blend" type="text" value="' + word + '" size="' + word.length + '" />';
 	return str;
 }
 
diff --git a/login/mnet_email.php b/login/mnet_email.php
index d08a13b710..dc2fa96ec5 100644
--- a/login/mnet_email.php
+++ b/login/mnet_email.php
@@ -28,8 +28,8 @@ print_simple_box_start('center','50%','','20');
   <form method="post">
     <input type="hidden" name="sesskey" value="<?php echo $sesskey; ?>">
     <?php echo get_string('email') ?>:
-    <input type="text" name="email" size="" maxlength="100">
-    <input type="submit" value="Find Login">
+    <input type="text" name="email" size="" maxlength="100" />
+    <input type="submit" value="Find Login" />
   </form>
 <?php
 
diff --git a/mod/data/edit.php b/mod/data/edit.php
index e89569c7a5..e2b884a925 100755
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -309,25 +309,25 @@
             $maxuploadsize = get_max_upload_file_size();
             echo '<div style="text-align:center">';
             echo '<form enctype="multipart/form-data" action="import.php" method="post">';
-            echo '<input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'">';
+            echo '<input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'" />';
             echo '<input name="d" value="'.$data->id.'" type="hidden" />';
             echo '<input name="sesskey" value="'.sesskey().'" type="hidden" />';
             echo '<table align="center" cellspacing="0" cellpadding="2" border="0">';
             echo '<tr>';
             echo '<td align="right">'.get_string('csvfile', 'data').':</td>';
-            echo '<td><input type="file" name="recordsfile" size="30">';
+            echo '<td><input type="file" name="recordsfile" size="30" />';
             helpbutton('importcsv', get_string('csvimport', 'data'), 'data', true, false);
             echo '</td><tr>';
             echo '<td align="right">'.get_string('fielddelimiter', 'data').':</td>';
-            echo '<td><input type="text" name="fielddelimiter" size="6">';
+            echo '<td><input type="text" name="fielddelimiter" size="6" />';
             echo get_string('defaultfielddelimiter', 'data').'</td>';
             echo '</tr>';
             echo '<td align="right">'.get_string('fieldenclosure', 'data').':</td>';
-            echo '<td><input type="text" name="fieldenclosure" size="6">';
+            echo '<td><input type="text" name="fieldenclosure" size="6" />';
             echo get_string('defaultfieldenclosure', 'data').'</td>';
             echo '</tr>';
             echo '</table>';
-            echo '<input type="submit" value="'.get_string('uploadfile', 'data').'">';
+            echo '<input type="submit" value="'.get_string('uploadfile', 'data').'" />';
             echo '</form>';
             echo '</div>';
             print_simple_box_end();
diff --git a/mod/glossary/config.html b/mod/glossary/config.html
index 76ab50342a..7c4953da52 100644
--- a/mod/glossary/config.html
+++ b/mod/glossary/config.html
@@ -5,23 +5,23 @@
 <form method="post" action="module.php" id="form">
 <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
-<table cellpadding=9 cellspacing=0 >
-<tr valign=top>
-    <td colspan = 3 align=center><strong><?php print_string("glossaryleveldefaultsettings","glossary") ?></strong></td>
+<table cellpadding="9" cellspacing="0" >
+<tr valign="top">
+    <td colspan="3" align="center"><strong><?php print_string("glossaryleveldefaultsettings","glossary") ?></strong></td>
 </tr>
-<tr valign=top>
-    <td align=right>glossary_entbypage:</td>
+<tr valign="top">
+    <td align="right">glossary_entbypage:</td>
     <td>
-    <input name=glossary_entbypage type=text size=3 value="<?php p(isset($CFG->glossary_entbypage) ? $CFG->glossary_entbypage : 10) ?>" />
+    <input name="glossary_entbypage" type="text" size="3" value="<?php p(isset($CFG->glossary_entbypage) ? $CFG->glossary_entbypage : 10) ?>" />
     </td>
     <td>
     <?php print_string("entbypage", "glossary") ?>
     </td>
 </tr>
-<tr valign=top>
-    <td align=right>glossary_dupentries:</td>
+<tr valign="top">
+    <td align="right">glossary_dupentries:</td>
     <td>
-    <select size=1 name=glossary_dupentries>
+    <select size="1" name="glossary_dupentries">
 <?php 
     $yselected = "";
     $nselected = "";
@@ -31,18 +31,18 @@
         $nselected = " selected=\"selected\" ";
     }
 ?>
-    <option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
-    <option value=0 <?php p($nselected) ?>><?php p($no)?></option>
+    <option value="1" <?php p($yselected) ?>><?php p($yes)?></option>
+    <option value="0" <?php p($nselected) ?>><?php p($no)?></option>
     </select>
     </td>
     <td>
     <?php print_string("cnfallowdupentries", "glossary") ?>
     </td>
 </tr>
-<tr valign=top>
-    <td align=right>glossary_allowcomments:</td>
+<tr valign="top">
+    <td align="right">glossary_allowcomments:</td>
     <td>
-    <select size=1 name=glossary_allowcomments>
+    <select size="1" name="glossary_allowcomments">
 <?php 
     $yselected = "";
     $nselected = "";
@@ -52,18 +52,18 @@
         $nselected = " selected=\"selected\" ";
     }
 ?>
-    <option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
-    <option value=0 <?php p($nselected) ?>><?php p($no)?></option>
+    <option value="1" <?php p($yselected) ?>><?php p($yes)?></option>
+    <option value="0" <?php p($nselected) ?>><?php p($no)?></option>
     </select>
     </td>
     <td>
     <?php print_string("cnfallowcomments", "glossary") ?>
     </td>
 </tr>
-<tr valign=top>
-    <td align=right>glossary_linkbydefault:</td>
+<tr valign="top">
+    <td align="right">glossary_linkbydefault:</td>
     <td>
-    <select size=1 name=glossary_linkbydefault>
+    <select size="1" name="glossary_linkbydefault">
 <?php 
     $yselected = "";
     $nselected = "";
@@ -73,18 +73,18 @@
         $nselected = " selected=\"selected\" ";
     }
 ?>
-    <option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
-    <option value=0 <?php p($nselected) ?>><?php p($no)?></option>
+    <option value="1" <?php p($yselected) ?>><?php p($yes)?></option>
+    <option value="0" <?php p($nselected) ?>><?php p($no)?></option>
     </select>
     </td>
     <td>
     <?php print_string("cnflinkglossaries", "glossary") ?>
     </td>
 </tr>
-<tr valign=top>
-    <td align=right>glossary_defaultapproval:</td>
+<tr valign="top">
+    <td align="right">glossary_defaultapproval:</td>
     <td>
-    <select size=1 name=glossary_defaultapproval>
+    <select size="1" name="glossary_defaultapproval">
 <?php 
     $yselected = "";
     $nselected = "";
@@ -94,16 +94,16 @@
         $nselected = " selected=\"selected\" ";
     }
 ?>
-    <option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
-    <option value=0 <?php p($nselected) ?>><?php p($no)?></option>
+    <option value="1" <?php p($yselected) ?>><?php p($yes)?></option>
+    <option value="0" <?php p($nselected) ?>><?php p($no)?></option>
     </select>
     </td>
     <td>
     <?php print_string("cnfapprovalstatus", "glossary") ?>
     </td>
 </tr>
-<tr valign=top>
-        <td align=right>glossary_enablerssfeeds:</td>
+<tr valign="top">
+        <td align="right">glossary_enablerssfeeds:</td>
         <td>
     <?php
         if (!isset($CFG->enablerssfeeds) || $CFG->enablerssfeeds == 0) {
@@ -131,13 +131,13 @@
     ?>
     </td>
 </tr>
-<tr valign=top>
-    <td colspan = 3 align=center><strong><?php print_string("entryleveldefaultsettings","glossary") ?></strong></td>
+<tr valign="top">
+    <td colspan ="3" align="center"><strong><?php print_string("entryleveldefaultsettings","glossary") ?></strong></td>
 </tr>
-<tr valign=top>
-    <td align=right>glossary_linkentries:</td>
+<tr valign="top">
+    <td align="right">glossary_linkentries:</td>
     <td>
-    <select size=1 name=glossary_linkentries>
+    <select size="1" name="glossary_linkentries">
 <?php 
     $yselected = "";
     $nselected = "";
@@ -147,18 +147,18 @@
         $nselected = " selected=\"selected\" ";
     }
 ?>
-    <option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
-    <option value=0 <?php p($nselected) ?>><?php p($no)?></option>
+    <option value="1" <?php p($yselected) ?>><?php p($yes)?></option>
+    <option value="0" <?php p($nselected) ?>><?php p($no)?></option>
     </select>
     </td>
     <td>
     <?php print_string("cnflinkentry", "glossary") ?>
     </td>
 </tr>
-<tr valign=top>
-    <td align=right>glossary_casesensitive:</td>
+<tr valign="top">
+    <td align="right">glossary_casesensitive:</td>
     <td>
-    <select size=1 name=glossary_casesensitive>
+    <select size="1" name="glossary_casesensitive">
 <?php 
     $yselected = "";
     $nselected = "";
@@ -168,18 +168,18 @@
         $nselected = " selected=\"selected\" ";
     }
 ?>
-    <option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
-    <option value=0 <?php p($nselected) ?>><?php p($no)?></option>
+    <option value="1" <?php p($yselected) ?>><?php p($yes)?></option>
+    <option value="0" <?php p($nselected) ?>><?php p($no)?></option>
     </select>
     </td>
     <td>
     <?php print_string("cnfcasesensitive", "glossary") ?>
     </td>
 </tr>
-<tr valign=top>
-    <td align=right>glossary_fullmatch:</td>
+<tr valign="top">
+    <td align="right">glossary_fullmatch:</td>
     <td>
-    <select size=1 name=glossary_fullmatch>
+    <select size="1" name="glossary_fullmatch">
 <?php 
     $yselected = "";
     $nselected = "";
@@ -189,19 +189,19 @@
         $nselected = " selected=\"selected\" ";
     }
 ?>
-    <option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
-    <option value=0 <?php p($nselected) ?>><?php p($no)?></option>
+    <option value="1" <?php p($yselected) ?>><?php p($yes)?></option>
+    <option value="0" <?php p($nselected) ?>><?php p($no)?></option>
     </select>
     </td>
     <td>
     <?php print_string("cnffullmatch", "glossary") ?>
     </td>
 </tr>
-<tr valign=top>
-    <td colspan = 3 align=center><a name=formats><strong><?php print_string("displayformatssetup","glossary") ?></strong></td>
+<tr valign="top">
+    <td colspan ="3" align="center"><a name="formats"><strong><?php print_string("displayformatssetup","glossary") ?></strong></td>
 </tr>
 <tr>
-    <td colspan=3 align=center>
+    <td colspan="3" align="center">
 <?php
 
     //Update and get available formats
@@ -240,7 +240,7 @@
     </td>
 </tr>
 <tr>
-    <td colspan=3 align=center>
+    <td colspan="3" align="center">
         <input type="submit" value="<?php print_string("savechanges") ?>" /></td>
 </tr>
 </table>
diff --git a/mod/hotpot/config.html b/mod/hotpot/config.html
index 2ffce2cd3c..049de865e8 100644
--- a/mod/hotpot/config.html
+++ b/mod/hotpot/config.html
@@ -12,9 +12,9 @@
         ?></td>
         <td><?PHP print_string("configshowtimes", "hotpot") ?></td>
     </tr>
-    <tr valign=top>
+    <tr valign="top">
         <td align="right"><p>hotpot_excelencodings:</p></td>
-        <td><input name=hotpot_excelencodings type=text size=30 value="<?PHP p($CFG->hotpot_excelencodings) ?>" /></td>
+        <td><input name="hotpot_excelencodings" type="text" size="30" value="<?PHP p($CFG->hotpot_excelencodings) ?>" /></td>
         <td><?PHP print_string("configexcelencodings", "hotpot") ?></td>
     </tr>
     <tr>
diff --git a/mod/hotpot/hotpot-full.js b/mod/hotpot/hotpot-full.js
index 0ea1fa3161..55a95d0ba0 100644
--- a/mod/hotpot/hotpot-full.js
+++ b/mod/hotpot/hotpot-full.js
@@ -518,11 +518,11 @@ function QuizLogin(LoginPrompt) {
 		if (Login[0]) { // user name
 			var v = getCookie(self, 'UserName');
 			html += '<tr>'
-				+	'<th align="right" nowrap scope="row">' + MSG[0] + ' :</th>'
+				+	'<th align="right" nowrap="nowrap" scope="row">' + MSG[0] + ' :</th>'
 				+	'<td>'
 			;
 			if (typeof(Login[0])=='boolean') { // text box
-				html += '<input type=text name=UserName value="' + v + '">';
+				html += '<input type="text" name="UserName" value="' + v + '" />';
 			} else { // drop down menu of names
 				// pattern to match commas and white space
 				var comma = (window.RegExp) ? new RegExp('\\s*,\\s*') : ',';
@@ -530,7 +530,7 @@ function QuizLogin(LoginPrompt) {
 				if (typeof(Login[0])=='string') {
 					Login[0] = Login[0].split(comma);
 				}
-				html += '<select name=UserName size=1>'
+				html += '<select name="UserName" size="1">'
 					+ '<option value=""></option>'
 				;
 				for(var i=0; i<Login[0].length; i++) {
@@ -548,20 +548,20 @@ function QuizLogin(LoginPrompt) {
 		}
 		if (Login[1]) { // user ID
 			var v = getCookie(self, 'UserID');
-			html += '<tr><th align="right" nowrap scope="row">' + MSG[1] + ' :</th><td><input type=text name=UserID value="' + v + '"></td></tr>';
+			html += '<tr><th align="right" nowrap="nowrap" scope="row">' + MSG[1] + ' :</th><td><input type="text" name="UserID" value="' + v + '" /></td></tr>';
 		}
 		if (Login[2]) { // user email
 			var v = getCookie(self, 'UserEmail');
-			html += '<tr><th align="right" nowrap scope="row">' + MSG[2] +' :</th><td><input type=text name=UserEmail value="' + v + '"></td></tr>';
+			html += '<tr><th align="right" nowrap="nowrap" scope="row">' + MSG[2] +' :</th><td><input type="text" name="UserEmail" value="' + v + '" /></td></tr>';
 		}
 		if (Login[3]) { // quiz password
 			var v = getCookie(self, 'Password');
-			html += '<tr><th align="right" nowrap scope="row">' + MSG[3] + ' :</th><td><input type=password name=Password value="' + v + '"></td></tr>';
+			html += '<tr><th align="right" nowrap="nowrap" scope="row">' + MSG[3] + ' :</th><td><input type="password" name="Password" value="' + v + '" /></td></tr>';
 		}
 		if (Login[4]) { // cookie lifespan
 			var v = getCookie(self, 'CookieExpiry');
 			html += '<tr>'
-				+ 	'<th align="right" nowrap scope="row">' + MSG[4] + ' :</th>'
+				+ 	'<th align="right" nowrap="nowrap" scope="row">' + MSG[4] + ' :</th>'
 				+ 	'<td>'
 				+		'<select name="CookieExpiry" size=1>'
 				+ 			makeOption('session', v, MSG[7])
@@ -576,8 +576,8 @@ function QuizLogin(LoginPrompt) {
 		html += 	'<tr>'
 			+		'<th scope="row">&nbsp;</th>'
 			+		'<td nowrap>'
-			+			'<input type=submit value="' + MSG[5] + '"> '
-			+ 			'<input type=button value="' + MSG[6] + '" onClick="opener.goBack();self.close();">'
+			+			'<input type="submit" value="' + MSG[5] + '" /> '
+			+ 			'<input type="button" value="' + MSG[6] + '" onClick="opener.goBack();self.close();" />'
 			+		'</td>'
 			+	'</tr>'
 			+ '</table></form></body></html>'
@@ -856,7 +856,7 @@ function AddStudentDetailsToResultForm() {
 		sDetails += hpHiddenField('email', window.UserEmail);
 	}
 	if (sDetails && window.RegExp) {
-		// insert sDetails before '<input...Score...></input>'
+		// insert sDetails before '<input...Score... /></input>'
 		var r = new RegExp('<input[^>]*Score[^>]*><\\/input>', 'i');
 		var m = r.exec(ResultForm);
 		if (m) {
@@ -1928,7 +1928,7 @@ function hpHiddenField(name, value, comma, forceHTML) {
 		}
 		field = '<field><fieldname>' + name + '</fieldname><fielddata>' + value + '</fielddata></field>';
 	} else {
-		field = '<input type=hidden name="' + name + '" value="' + value + '">';
+		field = '<input type=hidden name="' + name + '" value="' + value + '" />';
 	}
 	return field;
 }
@@ -2121,7 +2121,7 @@ function hpFeedback() {
 			html += '</td></tr>'
 				+	'<tr><th valign="top" align="right" scope="row">' + FEEDBACK[9] + ':</th>'
 				+	'<td><TEXTAREA name="message" rows="10" cols="40"></TEXTAREA></td></tr>'
-				+	'<tr><td>&nbsp;</td><td><input type="submit" value="' + FEEDBACK[6] + '">'
+				+	'<tr><td>&nbsp;</td><td><input type="submit" value="' + FEEDBACK[6] + '" />'
 				+ 	hpHiddenField('realname', FEEDBACK[2], ',', true)
 				+ 	hpHiddenField('email', FEEDBACK[3], ',', true)
 				+ 	hpHiddenField('subject', document.title, ',', true)
@@ -2135,7 +2135,7 @@ function hpFeedback() {
 				var i_max = FEEDBACK[1].length;
 				if (i_max>1) { // several teachers
 					html += '<html><body>'
-						+ '<form action="' + FEEDBACK[0] + '" method="POST" onsubmit="this.action+=this.recipient.options[this.recipient.selectedIndex].value">'
+						+ '<form action="' + FEEDBACK[0] + '" method="post" onsubmit="this.action+=this.recipient.options[this.recipient.selectedIndex].value">'
 						+ '<table border="0">'
 						+ '<tr><th valign="top" align="right" scope="row">' + FEEDBACK[7] + ':</th><td>' + document.title + '</td></tr>'
 						+ '<tr><th valign="top" align="right" scope="row">' + FEEDBACK[8] + ': </th><td>'
@@ -2146,7 +2146,7 @@ function hpFeedback() {
 					}
 					html += '</select>';
 					html += '</td></tr>'
-						+	'<tr><td>&nbsp;</td><td><input type="submit" value="' + FEEDBACK[6] + '">'
+						+	'<tr><td>&nbsp;</td><td><input type="submit" value="' + FEEDBACK[6] + '" />'
 						+	'</td></tr></table></form></body></html>'
 					;
 				} else if (i_max==1) { // one teacher
diff --git a/mod/hotpot/mod.html b/mod/hotpot/mod.html
index e69a7b236d..3633e472e4 100644
--- a/mod/hotpot/mod.html
+++ b/mod/hotpot/mod.html
@@ -71,7 +71,7 @@ $text_source_options = array(
                     "return hotpot_lockoptions('form', 'namesource', namelockitems, nameoffvalues)"
                 );
             } else {
-                print '<input type="hidden" name="namesource" value="'.HOTPOT_TEXTSOURCE_SPECIFIC.'">';
+                print '<input type="hidden" name="namesource" value="'.HOTPOT_TEXTSOURCE_SPECIFIC.'" />';
             }
             print '<input type="text" name="name" size=40 value="'.$form->name.'">';
         ?></td>
@@ -102,7 +102,7 @@ $text_source_options = array(
                 choose_from_menu($text_source_options, "summarysource", "$form->summarysource", "");
                 print '<br />';
             } else {
-                print '<input type="hidden" name="summarysource" value="'.HOTPOT_TEXTSOURCE_SPECIFIC.'">';
+                print '<input type="hidden" name="summarysource" value="'.HOTPOT_TEXTSOURCE_SPECIFIC.'" />';
             }
             if (function_exists("print_textarea") && isset($usehtmleditor)) {
                 print_textarea($usehtmleditor, 10, 65, 680, 400, "summary", $form->summary);
@@ -342,7 +342,7 @@ $text_source_options = array(
                     );
                     choose_from_menu($options, "displaynext", "$form->displaynext", "");
                 } else {
-                    print '<input type="hidden" name="displaynext" value="'.HOTPOT_NO.'">'."\n";
+                    print '<input type="hidden" name="displaynext" value="'.HOTPOT_NO.'" />'."\n";
                 }
             ?>
 </table>
diff --git a/mod/hotpot/report.php b/mod/hotpot/report.php
index 39d59d352a..b4007f79d6 100644
--- a/mod/hotpot/report.php
+++ b/mod/hotpot/report.php
@@ -524,7 +524,7 @@ function hotpot_print_report_selector(&$course, &$hotpot, &$formdata) {
         $value = $formdata[$name];
         print choose_from_menu($options, $name, $value, "", "", 0, true);
     };
-    print '<input type="submit" value="'.get_string('reportbutton', 'hotpot').'"></td></tr>';
+    print '<input type="submit" value="'.get_string('reportbutton', 'hotpot').'" /></td></tr>';
 
     $menus = array();
 
diff --git a/mod/hotpot/report/overview/report.php b/mod/hotpot/report/overview/report.php
index f0e87b85a1..365f7b1558 100644
--- a/mod/hotpot/report/overview/report.php
+++ b/mod/hotpot/report/overview/report.php
@@ -115,14 +115,14 @@ class hotpot_report extends hotpot_default_report {
 			$strdeletecheck = get_string('deleteattemptcheck','quiz');
 			$table->start = $this->deleteform_javascript();
 			$table->start .= '<form method="post" action="report.php" id="deleteform" onsubmit="'."return deletecheck('".$strdeletecheck."', 'selection')".'">'."\n";
-			$table->start .= '<input type="hidden" name="del" value="selection">'."\n";
+			$table->start .= '<input type="hidden" name="del" value="selection" />'."\n";
 			$table->start .= '<input type="hidden" name="id" value="'.$cm->id.'">'."\n";
 			$table->finish = '<center>'."\n";
-			$table->finish .= '<input type="submit" value="'.get_string("deleteselected").'">&nbsp;'."\n";
+			$table->finish .= '<input type="submit" value="'.get_string("deleteselected").'" />&nbsp;'."\n";
 			if ($abandoned) {
-				$table->finish .= '<input type=button value="'.get_string('deleteabandoned', 'hotpot').'" onClick="if(deletecheck('."'".addslashes(get_string('deleteabandonedcheck', 'hotpot', $abandoned))."', 'abandoned', true".')) getElementById(\'deleteform\').submit();">'."\n";
+				$table->finish .= '<input type=button value="'.get_string('deleteabandoned', 'hotpot').'" onClick="if(deletecheck('."'".addslashes(get_string('deleteabandonedcheck', 'hotpot', $abandoned))."', 'abandoned', true".')) getElementById(\'deleteform\').submit();" />'."\n";
 			}
-			$table->finish .= '<input type=button value="'.get_string("deleteall").'" onClick="if(deletecheck('."'".addslashes($strdeletecheck)."', 'all', true".'))getElementById(\'deleteform\').submit();">'."\n";
+			$table->finish .= '<input type=button value="'.get_string("deleteall").'" onClick="if(deletecheck('."'".addslashes($strdeletecheck)."', 'all', true".'))getElementById(\'deleteform\').submit();" />'."\n";
 			$table->finish .= '</center>'."\n";
 			$table->finish .= '</form>'."\n";
 		}
diff --git a/mod/hotpot/template/v6.php b/mod/hotpot/template/v6.php
index d6e4d94e3a..f82ca1d32d 100644
--- a/mod/hotpot/template/v6.php
+++ b/mod/hotpot/template/v6.php
@@ -904,7 +904,7 @@ class hotpot_xml_quiz_template extends hotpot_xml_template_default {
                         $a++;
                     }
 
-                    $gap .= '<input type="text" id="Gap'.$q.'" onfocus="TrackFocus('.$q.')" onblur="LeaveGap()" class="GapBox" size="'.$gapsize.'"></input>';
+                    $gap .= '<input type="text" id="Gap'.$q.'" onfocus="TrackFocus('.$q.')" onblur="LeaveGap()" class="GapBox" size="'.$gapsize.'" /></input>';
                 }
                 if ($includeclues) {
                     $clue = $this->parent->xml_value($question_record, $question."['clue'][0]['#']");
@@ -1255,7 +1255,7 @@ class hotpot_xml_quiz_template extends hotpot_xml_template_default {
                     $question_type==HOTPOT_JQUIZ_HYBRID
                 ) {
                     $str .= '<div class="ShortAnswer" id="Q_'.$q.'_SA"><form method="post" action="" onsubmit="return false;"><div>';
-                    $str .= '<input type="text" id="Q_'.$q.'_Guess" onfocus="TrackFocus('."'".'Q_'.$q.'_Guess'."'".')" onblur="LeaveGap()" class="ShortAnswerBox" size="9"></input><br /><br />';
+                    $str .= '<input type="text" id="Q_'.$q.'_Guess" onfocus="TrackFocus('."'".'Q_'.$q.'_Guess'."'".')" onblur="LeaveGap()" class="ShortAnswerBox" size="9" /></input><br /><br />';
 
                     $caption = $this->v6_expand_CheckCaption();
                     $str .= $this->v6_expand_jquiz_button($caption, "CheckShortAnswer($q)");
diff --git a/mod/hotpot/template/v6/hp6sendresults.js_ b/mod/hotpot/template/v6/hp6sendresults.js_
index b860ec8f05..cff751d134 100644
--- a/mod/hotpot/template/v6/hp6sendresults.js_
+++ b/mod/hotpot/template/v6/hp6sendresults.js_
@@ -6,17 +6,17 @@ var UserName = '';
 var StartTime = (new Date()).toLocaleString();
 
 var ResultForm = '<html><body><form name="Results" action="[strFormMailURL]" method="post" enctype="x-www-form-encoded">';
-ResultForm += '<input type="hidden" name="recipient" value="[strEMail]"></input>';
-ResultForm += '<input type="hidden" name="subject" value="[strEscapedExerciseTitle]"></input>';
-ResultForm += '<input type="hidden" name="Exercise" value="[strEscapedExerciseTitle]"></input>';
-ResultForm += '<input type="hidden" name="realname" value=""></input>';
-ResultForm += '<input type="hidden" name="Score" value=""></input>';
-ResultForm += '<input type="hidden" name="Start_Time" value=""></input>';
-ResultForm += '<input type="hidden" name="End_Time" value=""></input>';
-ResultForm += '<input type="hidden" name="title" value="Thanks!"></input>';
-[inclPageBGColor]ResultForm += '<input type="hidden" name="bgcolor" value="[strPageBGColor]"></input>';[/inclPageBGColor]
-ResultForm += '<input type="hidden" name="text_color" value="[strTitleColor]"></input>';
-ResultForm += '<input type="hidden" name="sort" value="order:realname,Exercise,Score,Start_Time,End_Time"></input>';
+ResultForm += '<input type="hidden" name="recipient" value="[strEMail]" /></input>';
+ResultForm += '<input type="hidden" name="subject" value="[strEscapedExerciseTitle]" /></input>';
+ResultForm += '<input type="hidden" name="Exercise" value="[strEscapedExerciseTitle]" /></input>';
+ResultForm += '<input type="hidden" name="realname" value="" /></input>';
+ResultForm += '<input type="hidden" name="Score" value="" /></input>';
+ResultForm += '<input type="hidden" name="Start_Time" value="" /></input>';
+ResultForm += '<input type="hidden" name="End_Time" value="" /></input>';
+ResultForm += '<input type="hidden" name="title" value="Thanks!" /></input>';
+[inclPageBGColor]ResultForm += '<input type="hidden" name="bgcolor" value="[strPageBGColor]" /></input>';[/inclPageBGColor]
+ResultForm += '<input type="hidden" name="text_color" value="[strTitleColor]" /></input>';
+ResultForm += '<input type="hidden" name="sort" value="order:realname,Exercise,Score,Start_Time,End_Time" /></input>';
 ResultForm += '</form></body></html>';
 
 function GetUserName(){
diff --git a/mod/hotpot/template/v6/jcross6.js_ b/mod/hotpot/template/v6/jcross6.js_
index 85b90e2bd7..11833c4544 100644
--- a/mod/hotpot/template/v6/jcross6.js_
+++ b/mod/hotpot/template/v6/jcross6.js_
@@ -19,7 +19,7 @@ var Locked = false;
 var TimeOver = false;
 
 var InputStuff = '<form method="post" action="" onsubmit="return false;"><span class="ClueNum">[strClueNum]: </span>';
-InputStuff += '[strClue] <input onfocus="CurrentBox=this;InTextBox=true;" onblur="InTextBox=false;" id="[strBoxId]" type="edit" size="[strEditSize]" maxlength="[strMaxLength]"></input>';
+InputStuff += '[strClue] <input onfocus="CurrentBox=this;InTextBox=true;" onblur="InTextBox=false;" id="[strBoxId]" type="edit" size="[strEditSize]" maxlength="[strMaxLength]" /></input>';
 InputStuff += '<button class="FuncButton" onfocus="FuncBtnOver(this)" onblur="FuncBtnOut(this)" onmouseover="FuncBtnOver(this)" onmouseout="FuncBtnOut(this)" onmousedown="FuncBtnDown(this)" onmouseup="FuncBtnOut(this)" onclick="EnterGuess([strParams])">[strEnterCaption]</button>';
 InputStuff += '[inclHint]<button class="FuncButton" onfocus="FuncBtnOver(this)" onblur="FuncBtnOut(this)" onmouseover="FuncBtnOver(this)" onmouseout="FuncBtnOut(this)" onmousedown="FuncBtnDown(this)" onmouseup="FuncBtnOut(this)" onclick="ShowHint([strParams])">[strHintCaption]</button>[/inclHint]';
 InputStuff += '</form>';
diff --git a/mod/hotpot/view.php b/mod/hotpot/view.php
index 8eb89e2160..268d7f27bd 100644
--- a/mod/hotpot/view.php
+++ b/mod/hotpot/view.php
@@ -80,8 +80,8 @@
             print '<div align="center">';
             print get_string('requirepasswordmessage', 'quiz').'<br /><br />';
             print '<b>'.get_string('password').':</b> ';
-            print '<input name="hppassword" type="password" value=""> ';
-            print '<input type="submit" value="'.get_string("ok").'"> ';
+            print '<input name="hppassword" type="password" value="" /> ';
+            print '<input type="submit" value="'.get_string("ok").'" /> ';
             print "</div>\n";
             print_simple_box_end();
             print "</form>\n";
diff --git a/mod/lams/mod.html b/mod/lams/mod.html
index 6c0c4bb1fb..4527579f6c 100644
--- a/mod/lams/mod.html
+++ b/mod/lams/mod.html
@@ -52,7 +52,7 @@ if (!isset($form->create_sequence_url)) {
 <tr>
 <td align="right"><b><?php  print_string("name") ?>:</b></td>
 <td>
-<input type="text" id="name" name="name" size="30">
+<input type="text" id="name" name="name" size="30" />
 </td>
 </tr>
 <td align=right><p><b><?php print_string("introduction", "lams") ?>:</b></p>
diff --git a/mod/lesson/highscores.php b/mod/lesson/highscores.php
index fc85a60429..32daf09437 100644
--- a/mod/lesson/highscores.php
+++ b/mod/lesson/highscores.php
@@ -144,7 +144,7 @@
                  <input type="hidden" name="mode" value="save" />
                  <input type="hidden" name="sesskey" value="'.sesskey().'" />';
 
-            echo get_string("entername", "lesson").": <input type=\"text\" name=\"name\" size=\"7\" maxlength=\"5\">\n<p>\n";
+            echo get_string("entername", "lesson").": <input type=\"text\" name=\"name\" size=\"7\" maxlength=\"5\" />\n<p>\n";
             lesson_print_submit_link(get_string("submitname", "lesson"), 'nickname');
             echo "</p>\n</form>\n</div>\n";
             print_simple_box_end();
diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php
index 184f2529ef..a4bf98ffea 100644
--- a/mod/quiz/report/grading/report.php
+++ b/mod/quiz/report/grading/report.php
@@ -348,10 +348,10 @@ class quiz_report extends quiz_default_report {
         // Display the form with one part for each selected attempt
 
         echo '<form method="post" action="report.php">'.
-            '<input type="hidden" name="mode" value="grading">'.
+            '<input type="hidden" name="mode" value="grading" />'.
             '<input type="hidden" name="q" value="'.$quiz->id.'">'.
-            '<input type="hidden" name="sesskey" value="'.sesskey().'">'.
-            '<input type="hidden" name="action" value="viewquestion">'.
+            '<input type="hidden" name="sesskey" value="'.sesskey().'" />'.
+            '<input type="hidden" name="action" value="viewquestion" />'.
             '<input type="hidden" name="questionid" value="'.$question->id.'">';
 
         foreach ($attempts as $attempt) {
@@ -384,7 +384,7 @@ class quiz_report extends quiz_default_report {
 
             echo '</div>';
         }
-        echo '<div align="center"><input type="submit" value="'.get_string('savechanges').'"></div>'.
+        echo '<div align="center"><input type="submit" value="'.get_string('savechanges').'" /></div>'.
             '</form>';
 
         if ($usehtmleditor) {
diff --git a/mod/resource/type/file/localfile.php b/mod/resource/type/file/localfile.php
index c84728606b..98740ab258 100644
--- a/mod/resource/type/file/localfile.php
+++ b/mod/resource/type/file/localfile.php
@@ -37,7 +37,7 @@
     <br />
     <div align="center" class="form">
     <form id="myform">
-    <input type="file" size="60" name="myfile"><br />
+    <input type="file" size="60" name="myfile" /><br />
     <input type="button" value="<?php print_string('localfileselect','resource') ?>" 
            onClick="return set_value(getElementById('myform').myfile.value)">
     <input type="button" value="<?php print_string('cancel') ?>" 
diff --git a/mod/resource/type/file/localpath.php b/mod/resource/type/file/localpath.php
index 6a51d248b4..b6575abbfd 100644
--- a/mod/resource/type/file/localpath.php
+++ b/mod/resource/type/file/localpath.php
@@ -42,8 +42,8 @@
     <div align="center" class="form">
     <form id="myform" action="localpath.php" method="post">
     <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>">
-    <input type="hidden" name="pathname" value="">
-    <input type="file" size="60" name="myfile"><br />
+    <input type="hidden" name="pathname" value="" />
+    <input type="file" size="60" name="myfile" /><br />
     <input type="button" value="<?php print_string('localfileselect','resource') ?>" 
            onClick="return set_value(getElementById('myform').myfile.value)">
     <input type="button" value="<?php print_string('cancel') ?>" 
diff --git a/mod/resource/type/repository/hive/openhive.php b/mod/resource/type/repository/hive/openhive.php
index 474bf6429f..10f40c48cb 100644
--- a/mod/resource/type/repository/hive/openhive.php
+++ b/mod/resource/type/repository/hive/openhive.php
@@ -42,21 +42,21 @@ $query .= '&HIVE_SESSION='.$SESSION->HIVE_SESSION;
 
     echo '<form id="OPEN_HIVE_FORM" action="'. $CFG->hiveprotocol .'://'. $CFG->hivehost .':'. $CFG->hiveport .''. $CFG->hivepath .'" method="post">';
 
-    echo '<input type="hidden" name="HISTORY" value="">';
-    echo '<input type="hidden" name="hiveLanguage" value="en_AU">';
-    echo '<input type="hidden" name="PUBCATEGORY_LIST" value="">';
-    echo '<input type="hidden" name="CATEGORY_LIST" value="">';
-    echo '<input type="hidden" name="HIDE_LOGOUT" value="Y">';
+    echo '<input type="hidden" name="HISTORY" value="" />';
+    echo '<input type="hidden" name="hiveLanguage" value="en_AU" />';
+    echo '<input type="hidden" name="PUBCATEGORY_LIST" value="" />';
+    echo '<input type="hidden" name="CATEGORY_LIST" value="" />';
+    echo '<input type="hidden" name="HIDE_LOGOUT" value="Y" />';
     echo '<input type="hidden" name="mkurl" value="'.$CFG->wwwroot.'/mod/resource/type/repository/hive/makelink.php">';
-    echo '<input type="hidden" name="HIDE_CHANGEUSERDETAILS" value="Y">';
-    echo '<input type="hidden" name="HIVE_RET" value="ORG">';
-    echo '<input type="hidden" name="HIVE_PAGE" value="Lite Browse">';
-    echo '<input type="hidden" name="HIVE_REQ" value="2113">';
-    echo '<input type="hidden" name="HIVE_ERRCODE" value="0">';
-    echo '<input type="hidden" name="mklms" value="Moodle">';
-    echo '<input type="hidden" name="HIVE_PROD" value="0">';
-    echo '<input type="hidden" name="HIVE_REF" value="hin:hive@Hive Login HTML Template">';
-    echo '<input type="hidden" name="HIVE_LITEMODE" value="liteBrowse">';
+    echo '<input type="hidden" name="HIDE_CHANGEUSERDETAILS" value="Y" />';
+    echo '<input type="hidden" name="HIVE_RET" value="ORG" />';
+    echo '<input type="hidden" name="HIVE_PAGE" value="Lite Browse" />';
+    echo '<input type="hidden" name="HIVE_REQ" value="2113" />';
+    echo '<input type="hidden" name="HIVE_ERRCODE" value="0" />';
+    echo '<input type="hidden" name="mklms" value="Moodle" />';
+    echo '<input type="hidden" name="HIVE_PROD" value="0" />';
+    echo '<input type="hidden" name="HIVE_REF" value="hin:hive@Hive Login HTML Template" />';
+    echo '<input type="hidden" name="HIVE_LITEMODE" value="liteBrowse" />';
     echo '<input type="hidden" name="HIVE_SEREF" value="'.$CFG->wwwroot.'/sso/hive/expired.php">';
     echo '<input type="hidden" name="HIVE_SESSION" value="'.$SESSION->HIVE_SESSION.'">';
     echo '</form>';
diff --git a/mod/wiki/ewiki/plugins/moodle/downloads.php b/mod/wiki/ewiki/plugins/moodle/downloads.php
index e3148d6307..a90fa55b6f 100644
--- a/mod/wiki/ewiki/plugins/moodle/downloads.php
+++ b/mod/wiki/ewiki/plugins/moodle/downloads.php
@@ -107,7 +107,7 @@ function ewiki_page_fileupload($id, $data, $action, $def_sec="") {
           '" method="POST" enctype="multipart/form-data">' ;
       require_once($CFG->dirroot.'/lib/uploadlib.php');
       $o .= upload_print_form_fragment(1,array(EWIKI_UP_UPLOAD),array(ewiki_t("file")),false,null,0,0,true);
-      $o .= '<input type="submit" value="' . EWIKI_PAGE_UPLOAD . '"><br /><br />'
+      $o .= '<input type="submit" value="' . EWIKI_PAGE_UPLOAD . '" /><br /><br />'
           .'<b>' . ewiki_t("comment") . '</b><br /><textarea name="comment" cols="35" rows="3"></textarea><br /><br />';
       
       if (empty($ewiki_upload_sections[$def_sec])) {
diff --git a/question/type/datasetdependent/datasetitems.php b/question/type/datasetdependent/datasetitems.php
index 6b91adf8d9..d750d5cdbf 100644
--- a/question/type/datasetdependent/datasetitems.php
+++ b/question/type/datasetdependent/datasetitems.php
@@ -278,7 +278,7 @@
               <input type=\"hidden\" name=\"qtype\" value=\"$question->qtype\"/>
               <input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\"/>
               <input type=\"hidden\" name=\"wizardpage\" value=\"datasetitems\"/>
-              <input type=\"submit\" name=\"backtoquiz\" value=\"$strbacktoquiz\">
+              <input type=\"submit\" name=\"backtoquiz\" value=\"$strbacktoquiz\" />
               </form></center>\n";
     } else {
           notify( $strdataitemneed );
diff --git a/user/messageselect.php b/user/messageselect.php
index 4a43e9104d..505849262c 100644
--- a/user/messageselect.php
+++ b/user/messageselect.php
@@ -76,9 +76,9 @@
         if (count($SESSION->emailto[$id])) {
             if ($preview) {
                 echo '<form method="post" action="messageselect.php" style="margin: 0 20px;">
-<input type="hidden" name="returnto" value="'.stripslashes($returnto).'">
-<input type="hidden" name="id" value="'.$id.'">
-<input type="hidden" name="format" value="'.$format.'">
+<input type="hidden" name="returnto" value="'.stripslashes($returnto).'" />
+<input type="hidden" name="id" value="'.$id.'" />
+<input type="hidden" name="format" value="'.$format.'" />
 ';
                 echo "<h3>".get_string('previewhtml')."</h3><div class=\"messagepreview\">\n".format_text(stripslashes($messagebody),$format)."\n</div>";
                 echo "\n<p align=\"center\"><input type=\"submit\" name=\"send\" value=\"Send\" /> <input type=\"submit\" name=\"edit\" value=\"Edit\" /></p>\n</form>";
-- 
2.39.5