From: gustav_delius <gustav_delius>
Date: Sun, 12 Sep 2004 14:41:49 +0000 (+0000)
Subject: closed <input /> <br /> <hr />
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a9ef4a630a576ab2e5a3bf34e43eca8a5a6b5767;p=moodle.git

closed <input /> <br /> <hr />
---

diff --git a/mod/assignment/config.html b/mod/assignment/config.html
index 26248960d4..b00b76a509 100644
--- a/mod/assignment/config.html
+++ b/mod/assignment/config.html
@@ -15,7 +15,7 @@
 
 <tr>
     <td colspan=3 align=center>
-	<input type="submit" value="<?php print_string("savechanges") ?>"></td>
+	<input type="submit" value="<?php print_string("savechanges") ?>" /></td>
 </tr>
 </table>
 
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index d6df442643..ff17c7a83d 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -265,9 +265,9 @@ function assignment_cron () {
                 "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
                 "<a href=\"$CFG->wwwroot/mod/assignment/index.php?id=$course->id\">$strassignments</a> ->".
                 "<a href=\"$CFG->wwwroot/mod/assignment/view.php?id=$mod->id\">$submission->name</a></font></p>";
-                $posthtml .= "<hr><font face=\"sans-serif\">";
+                $posthtml .= "<hr /><font face=\"sans-serif\">";
                 $posthtml .= "<p>".get_string("assignmentmailhtml", "assignment", $assignmentinfo)."</p>";
-                $posthtml .= "</font><hr>";
+                $posthtml .= "</font><hr />";
             } else {
                 $posthtml = "";
             }
@@ -682,10 +682,10 @@ function assignment_print_upload_form($assignment) {
 
     echo "<DIV ALIGN=CENTER>";
     echo "<FORM ENCTYPE=\"multipart/form-data\" METHOD=\"POST\" ACTION=\"upload.php?id=$assignment->id\">";
-    echo " <INPUT TYPE=hidden NAME=MAX_FILE_SIZE value=\"$assignment->maxbytes\">";
-    echo " <INPUT TYPE=hidden NAME=id VALUE=\"$assignment->id\">";
-    echo " <INPUT NAME=\"newfile\" TYPE=\"file\" size=\"50\">";
-    echo " <INPUT TYPE=submit NAME=save VALUE=\"".get_string("uploadthisfile")."\">";
+    echo " <INPUT TYPE=hidden NAME=MAX_FILE_SIZE value=\"$assignment->maxbytes\" />";
+    echo " <INPUT TYPE=hidden NAME=id VALUE=\"$assignment->id\" />";
+    echo " <INPUT NAME=\"newfile\" TYPE=\"file\" size=\"50\" />";
+    echo " <INPUT TYPE=submit NAME=save VALUE=\"".get_string("uploadthisfile")."\" />";
     echo "</FORM>";
     echo "</DIV>";
 }
@@ -782,7 +782,7 @@ function assignment_print_recent_mod_activity($activity, $course, $detail=false)
             echo "<img src=\"$CFG->pixpath/f/$file->icon\" height=16 width=16 border=0 alt=\"file\">";
             echo "&nbsp;<a target=\"uploadedfile\" HREF=\"$CFG->wwwroot/$file->url\">$file->name</A>";
         }
-        echo "<br>";
+        echo "<br />";
     }
     echo "<a href=\"$CFG->wwwroot/user/view.php?id="
          . $activity->user->userid . "&course=$course\">"
diff --git a/mod/assignment/mod.html b/mod/assignment/mod.html
index c4c9d0e7fa..27157086e4 100644
--- a/mod/assignment/mod.html
+++ b/mod/assignment/mod.html
@@ -30,7 +30,7 @@
 <tr valign="top">
     <td align=right><p><b><?php print_string("assignmentname", "assignment") ?>:</b></p></td>
     <td>
-        <input type="text" name="name" size=60 value="<?php p($form->name) ?>">
+        <input type="text" name="name" size=60 value="<?php p($form->name) ?>" />
     </td>
 </tr>
 <tr valign="top">
diff --git a/mod/assignment/restorelib.php b/mod/assignment/restorelib.php
index f93cc6cff0..2956885eae 100644
--- a/mod/assignment/restorelib.php
+++ b/mod/assignment/restorelib.php
@@ -62,7 +62,7 @@
             $newid = insert_record ("assignment",$assignment);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","assignment")." \"".$assignment->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","assignment")." \"".$assignment->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -140,7 +140,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -296,7 +296,7 @@
             }
             break;
         default:
-            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br>";                 //Debug
+            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br />";                 //Debug
             break;
         }
 
diff --git a/mod/assignment/submissions.php b/mod/assignment/submissions.php
index 2a24577234..8412ef2d7d 100644
--- a/mod/assignment/submissions.php
+++ b/mod/assignment/submissions.php
@@ -111,8 +111,8 @@
                 // Make sure that we aren't overwriting any recent feedback from other teachers. (see bug #324)
                 if ($timewas < $submission->timemarked && (!empty($submission->grade)) && (!empty($submission->comment))) {
                     notify(get_string("failedupdatefeedback", "assignment", fullname($users[$submission->userid]))
-                    . "<br>" . get_string("grade") . ": $newsubmission->grade" 
-                    . "<br>" . get_string("feedback", "assignment") . ": $newsubmission->comment\n");
+                    . "<br />" . get_string("grade") . ": $newsubmission->grade" 
+                    . "<br />" . get_string("feedback", "assignment") . ": $newsubmission->comment\n");
                 } else { //print out old feedback and grade
                     if (empty($submission->timemodified)) {   // eg for offline assignments
                         $newsubmission->timemodified = $timenow;
diff --git a/mod/assignment/view.php b/mod/assignment/view.php
index 5da4375c91..32e6da4c4a 100644
--- a/mod/assignment/view.php
+++ b/mod/assignment/view.php
@@ -86,7 +86,7 @@
             echo "<br />";
         }
     } else if ($assignment->grade > 0) {
-        echo "<b>".get_string("maximumgrade")."</b>: $assignment->grade<br>";
+        echo "<b>".get_string("maximumgrade")."</b>: $assignment->grade<br />";
     }
 
     echo "<br />";
diff --git a/mod/attendance/add.php b/mod/attendance/add.php
index 5ce7d9d69f..c9f982659b 100644
--- a/mod/attendance/add.php
+++ b/mod/attendance/add.php
@@ -166,8 +166,8 @@ $form->hours = isset($CFG->attendance_default_hours)?$CFG->attendance_default_ho
 ?>
 <FORM name="form" method="post" action="<?php echo $ME ?>">
 <CENTER>
-<INPUT type="submit" value="<?php  print_string("savechanges") ?>">
-<INPUT type="submit" name="cancel" value="<?php  print_string("cancel") ?>">
+<INPUT type="submit" value="<?php  print_string("savechanges") ?>" />
+<INPUT type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
 <TABLE cellpadding=5>
 
 <TR valign=top>
@@ -263,17 +263,17 @@ for ($i=0;$i<=100;$i++){ $opt2[$i] = $i; } ?>
 
 </TABLE>
 <!-- These hidden variables are always the same -->
-<INPUT type="hidden" name=course        value="<?php p($form->course) ?>">
-<INPUT type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>">
-<INPUT type="hidden" name=section       value="<?php p($form->section) ?>">
-<INPUT type="hidden" name=module        value="<?php p($form->module) ?>">
-<INPUT type="hidden" name=modulename    value="<?php p($form->modulename) ?>">
-<INPUT type="hidden" name=instance      value="<?php p($form->instance) ?>">
-<INPUT type="hidden" name=mode          value="<?php p($form->mode) ?>">
-<INPUT type="hidden" name=numsections   value="<?php p($course->numsections) ?>">
+<INPUT type="hidden" name=course        value="<?php p($form->course) ?>" />
+<INPUT type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>" />
+<INPUT type="hidden" name=section       value="<?php p($form->section) ?>" />
+<INPUT type="hidden" name=module        value="<?php p($form->module) ?>" />
+<INPUT type="hidden" name=modulename    value="<?php p($form->modulename) ?>" />
+<INPUT type="hidden" name=instance      value="<?php p($form->instance) ?>" />
+<INPUT type="hidden" name=mode          value="<?php p($form->mode) ?>" />
+<INPUT type="hidden" name=numsections   value="<?php p($course->numsections) ?>" />
 <BR />
-<INPUT type="submit" value="<?php print_string("savechanges") ?>">
-<INPUT type="submit" name="cancel" value="<?php print_string("cancel") ?>">
+<INPUT type="submit" value="<?php print_string("savechanges") ?>" />
+<INPUT type="submit" name="cancel" value="<?php print_string("cancel") ?>" />
 </CENTER>
 </FORM>
 
diff --git a/mod/attendance/mod.html b/mod/attendance/mod.html
index 7674f0c630..76e76009f9 100755
--- a/mod/attendance/mod.html
+++ b/mod/attendance/mod.html
@@ -200,18 +200,18 @@ if ($form->hours >1) {
 } // if ($form->id)
 ?>
 <!-- These hidden variables are always the same -->
-<INPUT type="hidden" name=course        value="<?php p($form->course) ?>">
-<INPUT type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>">
-<INPUT type="hidden" name=section       value="<?php p($form->section) ?>">
-<INPUT type="hidden" name=module        value="<?php p($form->module) ?>">
-<INPUT type="hidden" name=modulename    value="<?php p($form->modulename) ?>">
-<INPUT type="hidden" name=instance      value="<?php p($form->instance) ?>">
-<INPUT type="hidden" name=mode          value="<?php p($form->mode) ?>">
+<INPUT type="hidden" name=course        value="<?php p($form->course) ?>" />
+<INPUT type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>" />
+<INPUT type="hidden" name=section       value="<?php p($form->section) ?>" />
+<INPUT type="hidden" name=module        value="<?php p($form->module) ?>" />
+<INPUT type="hidden" name=modulename    value="<?php p($form->modulename) ?>" />
+<INPUT type="hidden" name=instance      value="<?php p($form->instance) ?>" />
+<INPUT type="hidden" name=mode          value="<?php p($form->mode) ?>" />
 <BR />
 <?php
   echo "<a href=\"../mod/attendance/add.php?id=".$form->course . "&section=".$form->section ."\">" . get_string("addmultiple","attendance") . "</a><br /><br />";
 ?>
-<INPUT type="submit" value="<?php print_string("savechanges") ?>">
-<INPUT type="submit" name="cancel" value="<?php print_string("cancel") ?>">
+<INPUT type="submit" value="<?php print_string("savechanges") ?>" />
+<INPUT type="submit" name="cancel" value="<?php print_string("cancel") ?>" />
 </CENTER>
 </FORM>
diff --git a/mod/attendance/restorelib.php b/mod/attendance/restorelib.php
index 993dc38832..3e2a10d76f 100644
--- a/mod/attendance/restorelib.php
+++ b/mod/attendance/restorelib.php
@@ -54,7 +54,7 @@
             $newid = insert_record ("attendance",$attendance);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","attendance")." \"".$attendance->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","attendance")." \"".$attendance->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -121,7 +121,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
diff --git a/mod/attendance/teacheredit.php b/mod/attendance/teacheredit.php
index 2a2a1e2657..6b24525931 100755
--- a/mod/attendance/teacheredit.php
+++ b/mod/attendance/teacheredit.php
@@ -111,8 +111,8 @@ if (empty($form->id)) {
     ?>
 <FORM name="form" method="post" action="<?php echo "$CFG->wwwroot/course/mod.php"; ?>">
 <CENTER>
-<INPUT type="submit" value="<?php  print_string("savechanges") ?>">
-<INPUT type="submit" name="cancel" value="<?php  print_string("cancel") ?>">
+<INPUT type="submit" value="<?php  print_string("savechanges") ?>" />
+<INPUT type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
 
 <?php  // if we're modifying an existing instance of attendance instead 
     //   of creating a new one
@@ -204,19 +204,19 @@ if ($form->hours >1) {
 } // if ($form->id)
 ?>
 <!-- These hidden variables are always the same -->
-<INPUT type="hidden" name=course        value="<?php p($form->course) ?>">
-<INPUT type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>">
-<INPUT type="hidden" name=section       value="<?php p($form->section) ?>">
-<INPUT type="hidden" name=module        value="<?php p($form->module) ?>">
-<INPUT type="hidden" name=modulename    value="<?php p($form->modulename) ?>">
-<INPUT type="hidden" name=instance      value="<?php p($form->instance) ?>">
-<INPUT type="hidden" name=mode          value="<?php p($form->mode) ?>">
+<INPUT type="hidden" name=course        value="<?php p($form->course) ?>" />
+<INPUT type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>" />
+<INPUT type="hidden" name=section       value="<?php p($form->section) ?>" />
+<INPUT type="hidden" name=module        value="<?php p($form->module) ?>" />
+<INPUT type="hidden" name=modulename    value="<?php p($form->modulename) ?>" />
+<INPUT type="hidden" name=instance      value="<?php p($form->instance) ?>" />
+<INPUT type="hidden" name=mode          value="<?php p($form->mode) ?>" />
 <BR />
 <?php
   echo "<a href=\"../mod/attendance/add.php?id=".$form->course . "&section=".$form->section ."\">Add multiple rolls</a><br /><br />";
 ?>
-<INPUT type="submit" value="<?php print_string("savechanges") ?>">
-<INPUT type="submit" name="cancel" value="<?php print_string("cancel") ?>">
+<INPUT type="submit" value="<?php print_string("savechanges") ?>" />
+<INPUT type="submit" name="cancel" value="<?php print_string("cancel") ?>" />
 </CENTER>
 </FORM>
 
diff --git a/mod/chat/gui_text/index.php b/mod/chat/gui_text/index.php
index d6157713f6..7d16dbfc93 100644
--- a/mod/chat/gui_text/index.php
+++ b/mod/chat/gui_text/index.php
@@ -96,7 +96,7 @@ if ($arsc_my = arsc_getdatafromsid($arsc_sid))
        echo "<a href=\"../version_".$arsc_my["version"]."/index.php?arsc_sid=".$arsc_my["sid"]."&arsc_lastid=".$arsc_lastid."&arsc_pretext=".urlencode("/msg ".$arsc_a["user"]." ")."\">".$arsc_opstring.$arsc_a["user"]."</a>\n";
       }
      }
-     echo "<br>";
+     echo "<br />";
      $arsc_result = mysql_query("SELECT * from arsc_room_$arsc_room WHERE timeid > '$arsc_lastid' ORDER BY timeid DESC");
      while ($arsc_a = mysql_fetch_array($arsc_result))
      {
diff --git a/mod/chat/restorelib.php b/mod/chat/restorelib.php
index ea4088d808..0c0732eb32 100644
--- a/mod/chat/restorelib.php
+++ b/mod/chat/restorelib.php
@@ -52,7 +52,7 @@
             $newid = insert_record ("chat",$chat);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","chat")." \"".$chat->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","chat")." \"".$chat->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -126,7 +126,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -180,7 +180,7 @@
             $status = true;
             break;
         default:
-            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br>";                 //Debug
+            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br />";                 //Debug
             break;
         }
 
diff --git a/mod/choice/restorelib.php b/mod/choice/restorelib.php
index 2d0f3bd533..22b5fd08a3 100644
--- a/mod/choice/restorelib.php
+++ b/mod/choice/restorelib.php
@@ -78,7 +78,7 @@
             $newid = insert_record ("choice",$choice);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","choice")." \"".$choice->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","choice")." \"".$choice->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -144,7 +144,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -228,7 +228,7 @@
             $status = true;
             break;
         default:
-            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br>";                 //Debug
+            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br />";                 //Debug
             break;
         }
 
diff --git a/mod/choice/view.php b/mod/choice/view.php
index 3940a60738..5f241a7a89 100644
--- a/mod/choice/view.php
+++ b/mod/choice/view.php
@@ -105,16 +105,16 @@
         foreach ($choice->answer as $key => $answer) {
             if ($answer) {
                 echo "<TD ALIGN=CENTER>";
-                echo "<INPUT type=radio name=answer value=\"$key\" ".$answerchecked[$key].">";
+                echo "<INPUT type=radio name=answer value=\"$key\" ".$answerchecked[$key]." />";
                 p($answer);
                 echo "</TD>";
             }
         }
     
         echo "</TR></TABLE>";
-        echo "<INPUT type=hidden name=id value=\"$cm->id\">";
+        echo "<INPUT type=hidden name=id value=\"$cm->id\" />";
         if (isstudent($course->id) or isteacher($course->id, 0, false)) {
-            echo "<INPUT type=submit value=\"".get_string("savemychoice","choice")."\">";
+            echo "<INPUT type=submit value=\"".get_string("savemychoice","choice")."\" />";
         } else {
             print_string('havetologin', 'choice');
         }
diff --git a/mod/dialogue/lib.php b/mod/dialogue/lib.php
index 688426f5f0..e54c9c53b0 100644
--- a/mod/dialogue/lib.php
+++ b/mod/dialogue/lib.php
@@ -92,7 +92,7 @@ function dialogue_cron () {
                 "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
                 "<a href=\"$CFG->wwwroot/mod/dialogue/index.php?id=$course->id\">dialogues</a> ->".
                 "<a href=\"$CFG->wwwroot/mod/dialogue/view.php?id=$cm->id\">$dialogue->name</a></font></p>";
-                $posthtml .= "<hr><font face=\"sans-serif\">";
+                $posthtml .= "<hr /><font face=\"sans-serif\">";
                 $posthtml .= "<p>".get_string("dialoguemailhtml", "dialogue", $dialogueinfo)."</p>";
                 $posthtml .= "</font><hr />";
             } else {
diff --git a/mod/dialogue/restorelib.php b/mod/dialogue/restorelib.php
index 73600f8fad..2b8b30bb01 100644
--- a/mod/dialogue/restorelib.php
+++ b/mod/dialogue/restorelib.php
@@ -57,7 +57,7 @@
             $newid = insert_record ("dialogue",$dialogue);
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","dialogue")." \"".$dialogue->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","dialogue")." \"".$dialogue->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -134,7 +134,7 @@
                 if (($i+1) % 50 == 0) {
                     echo ".";
                     if (($i+1) % 1000 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
@@ -202,7 +202,7 @@
                 if (($i+1) % 50 == 0) {
                     echo ".";
                     if (($i+1) % 1000 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
diff --git a/mod/exercise/assessments.php b/mod/exercise/assessments.php
index 18954a2367..4664559ed2 100644
--- a/mod/exercise/assessments.php
+++ b/mod/exercise/assessments.php
@@ -95,7 +95,7 @@
                 number_format($exercise->gradinggrade * $assessment->gradinggrade / 100, 0), "");
         echo "</td></tr>\n";
         echo "<tr><td colspan=\"2\" align=\"center\">"; 
-        echo "<INPUT TYPE=submit VALUE=\"".get_string("amend", "exercise")."\">\n";
+        echo "<INPUT TYPE=submit VALUE=\"".get_string("amend", "exercise")."\" />\n";
         echo "</td></tr>\n";
         echo "</table>\n";
         echo "</CENTER>";
diff --git a/mod/exercise/locallib.php b/mod/exercise/locallib.php
index 0d4a3ae624..db0ce701d7 100644
--- a/mod/exercise/locallib.php
+++ b/mod/exercise/locallib.php
@@ -1568,11 +1568,11 @@ function exercise_print_assessment_form($exercise, $assessment = false, $allowch
     // FORM is needed for Mozilla browsers, else radio bttons are not checked
         ?>
     <form name="assessmentform" method="post" action="assessments.php">
-    <INPUT TYPE="hidden" NAME="id" VALUE="<?PHP echo $cm->id ?>">
-    <input type="hidden" name="aid" value="<?PHP echo $assessment->id ?>">
-    <input type="hidden" name="action" value="updateassessment">
-    <input type="hidden" name="resubmit" value="0">
-    <input type="hidden" name="returnto" value="<?PHP echo $returnto ?>">
+    <INPUT TYPE="hidden" NAME="id" VALUE="<?PHP echo $cm->id ?>" />
+    <input type="hidden" name="aid" value="<?PHP echo $assessment->id ?>" />
+    <input type="hidden" name="action" value="updateassessment" />
+    <input type="hidden" name="resubmit" value="0" />
+    <input type="hidden" name="returnto" value="<?PHP echo $returnto ?>" />
     <?PHP
     if ($assessment) {
         if (!$assessmentowner = get_record("user", "id", $assessment->userid)) {
@@ -1687,10 +1687,10 @@ function exercise_print_assessment_form($exercise, $assessment = false, $allowch
                                         }
                                     }
                                 if ($checked) {
-                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED> &nbsp;&nbsp;&nbsp;\n";
+                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED=\"checked\" /> &nbsp;&nbsp;&nbsp;\n";
                                     }
                                 else {
-                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\"> &nbsp;&nbsp;&nbsp;\n";
+                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
                                     }
                                 }
                             echo "&nbsp;&nbsp;&nbsp;<B>$SCALE->end</B></CENTER>\n";
@@ -1768,10 +1768,10 @@ function exercise_print_assessment_form($exercise, $assessment = false, $allowch
                                         }
                                     }
                                 if ($checked) {
-                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED> &nbsp;&nbsp;&nbsp;\n";
+                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED=\"checked\" /> &nbsp;&nbsp;&nbsp;\n";
                                     }
                                 else {
-                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\"> &nbsp;&nbsp;&nbsp;\n";
+                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
                                     }
                                 }
                             echo "&nbsp;&nbsp;&nbsp;<B>$SCALE->end</B></CENTER>\n";
@@ -1873,10 +1873,10 @@ function exercise_print_assessment_form($exercise, $assessment = false, $allowch
 
                 echo "  <TD>$iplus1</TD><TD>".text_to_html($elements[$i]->description)."</TD>\n";
                 if ($selection == $i) {
-                    echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\" CHECKED></TD>\n";
+                    echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\" CHECKED=\"checked\" /></TD>\n";
                     }
                 else {
-                    echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\"></TD>\n";
+                    echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\" /></TD>\n";
                     }
                 echo "<TD align=center>{$elements[$i]->maxscore}</TD></TR>\n";
                 }
@@ -1930,9 +1930,9 @@ function exercise_print_assessment_form($exercise, $assessment = false, $allowch
                         echo "<TR valign=top>\n";
 
                         if ($selection == $j) {
-                            echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED></TD>\n";
+                            echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED=\"checked\" /></TD>\n";
                             }else {
-                            echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\"></TD>\n";
+                            echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" /></TD>\n";
                             }
                         echo "<TD>".text_to_html($rubrics[$j]->description)."</TD>\n";
                         }
@@ -2047,7 +2047,7 @@ function exercise_print_assessments_by_user_for_admin($exercise, $user) {
                 get_string("amend", "exercise")." ".get_string("gradeforstudentsassessment","exercise",
                 $course->student)."</a>\n";
             echo " | <a href=\"assessments.php?action=adminconfirmdelete&id=$cm->id&aid=$assessment->id\">".
-                get_string("delete", "exercise")."</a></p><hr>\n";
+                get_string("delete", "exercise")."</a></p><hr />\n";
             }
         }
     }
@@ -2071,7 +2071,7 @@ function exercise_print_assessments_for_admin($exercise, $submission) {
             echo "<p><center><b>".get_string("assessmentby", "exercise", fullname($user))."</b></center></p>\n";
             exercise_print_assessment_form($exercise, $assessment);
             echo "<p align=\"right\"><a href=\"assessments.php?action=adminconfirmdelete&id=$cm->id&aid=$assessment->id\">".
-                get_string("delete", "exercise")."</a></p><hr>\n";
+                get_string("delete", "exercise")."</a></p><hr />\n";
             }
         }
     }
@@ -2367,12 +2367,12 @@ function exercise_print_teacher_assessment_form($exercise, $assessment, $submiss
 
     ?>
     <form name="assessmentform" method="post" action="assessments.php">
-    <INPUT TYPE="hidden" NAME="id" VALUE="<?PHP echo $cm->id ?>">
-    <input type="hidden" name="said" value="<?PHP echo $assessment->id ?>">
-    <input type="hidden" name="sid" value="<?PHP echo $submission->id ?>">
-    <input type="hidden" name="action" value="updateteacherassessment">
-    <input type="hidden" name="resubmit" value="0">
-    <input type="hidden" name="returnto" value="<?PHP echo $returnto ?>">
+    <INPUT TYPE="hidden" NAME="id" VALUE="<?PHP echo $cm->id ?>" />
+    <input type="hidden" name="said" value="<?PHP echo $assessment->id ?>" />
+    <input type="hidden" name="sid" value="<?PHP echo $submission->id ?>" />
+    <input type="hidden" name="action" value="updateteacherassessment" />
+    <input type="hidden" name="resubmit" value="0" />
+    <input type="hidden" name="returnto" value="<?PHP echo $returnto ?>" />
     <?PHP
 
     // now print a normal assessment form based on the student's assessment for this submission 
@@ -2482,10 +2482,10 @@ function exercise_print_teacher_assessment_form($exercise, $assessment, $submiss
                                     }
                                 }
                                 if ($checked) {
-                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED> &nbsp;&nbsp;&nbsp;\n";
+                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED=\"checked\" /> &nbsp;&nbsp;&nbsp;\n";
                                 }
                                 else {
-                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\"> &nbsp;&nbsp;&nbsp;\n";
+                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
                                 }
                             }
                             echo "&nbsp;&nbsp;&nbsp;<B>$SCALE->end</B></CENTER>\n";
@@ -2561,10 +2561,10 @@ function exercise_print_teacher_assessment_form($exercise, $assessment, $submiss
                                     }
                                 }
                                 if ($checked) {
-                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED> &nbsp;&nbsp;&nbsp;\n";
+                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED=\"checked\" /> &nbsp;&nbsp;&nbsp;\n";
                                 }
                                 else {
-                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\"> &nbsp;&nbsp;&nbsp;\n";
+                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
                                 }
                             }
                             echo "&nbsp;&nbsp;&nbsp;<B>$SCALE->end</B></CENTER>\n";
@@ -2662,10 +2662,10 @@ function exercise_print_teacher_assessment_form($exercise, $assessment, $submiss
                 echo "<TR valign=top>\n";
                 echo "  <TD>$iplus1</TD><TD>".text_to_html($elements[$i]->description)."</TD>\n";
                 if ($selection == $i) {
-                    echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\" CHECKED></TD>\n";
+                    echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\" CHECKED=\"checked\" /></TD>\n";
                 }
                 else {
-                    echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\"></TD>\n";
+                    echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\" /></TD>\n";
                 }
                 echo "<TD align=center>{$elements[$i]->maxscore}</TD></TR>\n";
             }
@@ -2715,9 +2715,9 @@ function exercise_print_teacher_assessment_form($exercise, $assessment, $submiss
                         }
                         echo "<TR valign=top>\n";
                         if ($selection == $j) {
-                            echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED></TD>\n";
+                            echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED=\"checked\" /></TD>\n";
                         } else {
-                            echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\"></TD>\n";
+                            echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" /></TD>\n";
                         }
                         echo "<TD>".text_to_html($rubrics[$j]->description)."</TD>\n";
                     }
@@ -2865,11 +2865,11 @@ function exercise_print_upload_form($exercise) {
 
     echo "<DIV ALIGN=CENTER>";
     echo "<FORM ENCTYPE=\"multipart/form-data\" METHOD=\"POST\" ACTION=upload.php>";
-    echo " <INPUT TYPE=hidden NAME=MAX_FILE_SIZE value=\"$exercise->maxbytes\">";
-    echo " <INPUT TYPE=hidden NAME=id VALUE=\"$cm->id\">";
-    echo "<b>".get_string("title", "exercise")."</b>: <INPUT NAME=\"title\" TYPE=\"text\" SIZE=\"60\" MAXSIZE=\"100\"><BR><BR>\n";
-    echo " <INPUT NAME=\"newfile\" TYPE=\"file\" size=\"50\">";
-    echo " <INPUT TYPE=submit NAME=save VALUE=\"".get_string("uploadthisfile")."\">";
+    echo " <INPUT TYPE=hidden NAME=MAX_FILE_SIZE value=\"$exercise->maxbytes\" />";
+    echo " <INPUT TYPE=hidden NAME=id VALUE=\"$cm->id\" />";
+    echo "<b>".get_string("title", "exercise")."</b>: <INPUT NAME=\"title\" TYPE=\"text\" SIZE=\"60\" MAXSIZE=\"100\" /><BR><BR>\n";
+    echo " <INPUT NAME=\"newfile\" TYPE=\"file\" size=\"50\" />";
+    echo " <INPUT TYPE=submit NAME=save VALUE=\"".get_string("uploadthisfile")."\" />";
     echo " (".get_string("maximumupload").": ".display_size($exercise->maxbytes).")\n"; 
     echo "</FORM>";
     echo "</DIV>";
diff --git a/mod/exercise/restorelib.php b/mod/exercise/restorelib.php
index e791d8773c..c95fd7097b 100644
--- a/mod/exercise/restorelib.php
+++ b/mod/exercise/restorelib.php
@@ -75,7 +75,7 @@
             $newid = insert_record ("exercise",$exercise);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","exercise")." \"".$exercise->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","exercise")." \"".$exercise->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -132,7 +132,7 @@
             if (($i+1) % 10 == 0) {
                 echo ".";
                 if (($i+1) % 200 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -180,7 +180,7 @@
                 if (($i+1) % 10 == 0) {
                     echo ".";
                     if (($i+1) % 200 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
@@ -239,7 +239,7 @@
                 if (($i+1) % 50 == 0) {
                     echo ".";
                     if (($i+1) % 1000 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
@@ -311,7 +311,7 @@
                 if (($i+1) % 50 == 0) {
                     echo ".";
                     if (($i+1) % 1000 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
@@ -366,7 +366,7 @@
                 if (($i+1) % 50 == 0) {
                     echo ".";
                     if (($i+1) % 1000 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 4eb2cf8a62..f123ed5723 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -720,7 +720,7 @@ function forum_print_recent_activity($course, $isteacher, $timestart) {
                 }
                 $date = userdate($post->modified, $strftimerecent);
                 $fullname = fullname($post, $isteacher);
-                echo "<p $teacheronly><font size=1>$date - $fullname<br>";
+                echo "<p $teacheronly><font size=1>$date - $fullname<br />";
                 echo "\"<a href=\"$CFG->wwwroot/mod/forum/$log->url\">";
                 if (!empty($CFG->filterall)) {
                     $post->subject = filter_text("<nolink>$post->subject</nolink>", $course->id);
@@ -1825,7 +1825,7 @@ function forum_print_search_form($course, $search="", $return=false, $type="") {
         $output = "<table border=0 cellpadding=10 cellspacing=0><tr><td align=center>";
         $output .= "<form name=search action=\"$CFG->wwwroot/mod/forum/search.php\">";
         $output .= "<font size=\"-1\">";
-        $output .= "<input name=search type=text size=15 value=\"$search\"><br>";
+        $output .= "<input name=search type=text size=15 value=\"$search\"><br />";
         $output .= "<input value=\"".get_string("searchforums", "forum")."\" type=submit>";
         $output .= "</font>";
         $output .= "<input name=id type=hidden value=\"$course->id\">";
@@ -2527,7 +2527,7 @@ function forum_print_latest_discussions($forum_id=0, $forum_numdiscussions=5,
                     $link = false;
                 }
                 forum_print_post($discussion, $forum->course, $ownpost, $reply=0, $link, $assessed=false);
-                echo "<br>\n";
+                echo "<br />\n";
             break;
         }
     }
@@ -2809,7 +2809,7 @@ function forum_print_recent_mod_activity($activity, $course, $detail=false) {
     echo $activity->content->subject;
     echo "</a>$closeformat";
 
-    echo "<br><font size=\"2\">";
+    echo "<br /><font size=\"2\">";
     echo "<a href=\"$CFG->wwwroot/user/view.php?id=" . $activity->user->userid . "&course=" . "$course\">"
          . $activity->user->fullname . "</a>";
     echo " - " . userdate($activity->timestamp) . "</font></td></tr>";
diff --git a/mod/forum/restorelib.php b/mod/forum/restorelib.php
index d09764a377..f9571bcc0a 100644
--- a/mod/forum/restorelib.php
+++ b/mod/forum/restorelib.php
@@ -90,7 +90,7 @@
             }
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","forum")." \"".$forum->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","forum")." \"".$forum->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -158,7 +158,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -232,7 +232,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -263,7 +263,7 @@
                 $temp_discussion->userid = $discussion->userid;
                 //Update discussion (only firstpost and userid will be changed)
                 $status = update_record("forum_discussions",$temp_discussion);
-                //echo "Updated firstpost ".$old_firstpost." to ".$temp_discussion->firstpost."<br>";                //Debug
+                //echo "Updated firstpost ".$old_firstpost." to ".$temp_discussion->firstpost."<br />";                //Debug
             } else {
                 $status = false;
             }
@@ -319,7 +319,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -363,7 +363,7 @@
                 //Create temp post record
                 $temp_post->id = $post->id;
                 $temp_post->parent = $post->parent;
-                //echo "Updated parent ".$old_parent." to ".$temp_post->parent."<br>";                //Debug
+                //echo "Updated parent ".$old_parent." to ".$temp_post->parent."<br />";                //Debug
                 //Update post (only parent will be changed)
                 $status = update_record("forum_posts",$temp_post);
             }
@@ -466,7 +466,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -652,7 +652,7 @@
             $status = true;
             break;
         default:
-            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br>";                 //Debug
+            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br />";                 //Debug
             break;
         }
 
@@ -865,14 +865,14 @@
                         $post->message = addslashes($result);
                         $status = update_record("forum_posts",$post);
                         if ($CFG->debug>7) {
-                            echo "<br><hr>".$content."<br>changed to</br>".$result."<hr><br>";
+                            echo "<br /><hr />".$content."<br />changed to<br />".$result."<hr /><br />";
                         }
                     }
                     //Do some output
                     if (($i+1) % 5 == 0) {
                         echo ".";
                         if (($i+1) % 100 == 0) {
-                            echo "<br>";
+                            echo "<br />";
                         }
                         backup_flush(300);
                     }
@@ -900,14 +900,14 @@
                         $forum->intro = addslashes($result);
                         $status = update_record("forum",$forum);
                         if ($CFG->debug>7) {
-                            echo "<br><hr>".$content."<br>changed to</br>".$result."<hr><br>";
+                            echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
                         }
                     }
                     //Do some output
                     if (($i+1) % 5 == 0) {
                         echo ".";
                         if (($i+1) % 100 == 0) {
-                            echo "<br>";
+                            echo "<br />";
                         }
                         backup_flush(300);
                     }
@@ -936,14 +936,14 @@
                         $resource->alltext = addslashes($result);
                         $status = update_record("resource",$resource);
                         if ($CFG->debug>7) {
-                            echo "<br><hr>".$content."<br>changed to</br>".$result."<hr><br>";
+                            echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
                         }
                     }
                     //Do some output
                     if (($i+1) % 5 == 0) {
                         echo ".";
                         if (($i+1) % 100 == 0) {
-                            echo "<br>";
+                            echo "<br />";
                         }
                         backup_flush(300);
                     }
@@ -971,14 +971,14 @@
                         $resource->summary = addslashes($result);
                         $status = update_record("resource",$resource);
                         if ($CFG->debug>7) {
-                            echo "<br><hr>".$content."<br>changed to</br>".$result."<hr><br>";
+                            echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
                         }
                     }
                     //Do some output
                     if (($i+1) % 5 == 0) {
                         echo ".";
                         if (($i+1) % 100 == 0) {
-                            echo "<br>";
+                            echo "<br />";
                         }
                         backup_flush(300);
                     }
diff --git a/mod/forum/subscriber.html b/mod/forum/subscriber.html
index a78fa1ecb5..9417bbeb70 100644
--- a/mod/forum/subscriber.html
+++ b/mod/forum/subscriber.html
@@ -1,7 +1,7 @@
 
 <form name="subscriberform" id="subscriberform" method="post" action="subscribers.php">
-<input type="hidden" name="previoussearch" value="<?php echo $previoussearch ?>">
-<input type="hidden" name="id" value="<?php echo $id?>">
+<input type="hidden" name="previoussearch" value="<?php echo $previoussearch ?>" />
+<input type="hidden" name="id" value="<?php echo $id?>" />
   <table align="center" border="0" cellpadding="5" cellspacing="0">
     <tr>
       <td valign="top">
diff --git a/mod/glossary/comment.html b/mod/glossary/comment.html
index 6025e9dc7c..cdfaae1df4 100644
--- a/mod/glossary/comment.html
+++ b/mod/glossary/comment.html
@@ -32,7 +32,7 @@
     <?php
         if ($usehtmleditor) {   /// Trying this out for a while
             print_string('formathtml');
-            echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'">';
+            echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'" />';
         } else {
             if (!isset($form->format)) {
                 $form->format = $defaultformat;
@@ -48,16 +48,16 @@
 	<p align=center>
 	<?php 
 	    if (isset($comment->id)) {
-		    echo "<input type=\"hidden\" name=cid value=\"$comment->id\">";
+		    echo "<input type=\"hidden\" name=cid value=\"$comment->id\" />";
    	    }
 	?>
-	<input type="hidden" name=id value="<?php p($cm->id) ?>">
-	<input type="hidden" name=eid value="<?php p($entry->id) ?>">
-	<input type="hidden" name=action value="<?php p($action) ?>">
+	<input type="hidden" name=id value="<?php p($cm->id) ?>" />
+	<input type="hidden" name=eid value="<?php p($entry->id) ?>" />
+	<input type="hidden" name=action value="<?php p($action) ?>" />
 	<input type="hidden" name=confirm value="1">
 
-	<input type="submit" value="<?php print_string("savechanges") ?>">
-	<input type="reset" value="<?php print_string("revert") ?>">
+	<input type="submit" value="<?php print_string("savechanges") ?>" />
+	<input type="reset" value="<?php print_string("revert") ?>" />
 	</P>
 </td>
 </tr>
diff --git a/mod/glossary/comment.php b/mod/glossary/comment.php
index ef80a3713d..f5120883ba 100644
--- a/mod/glossary/comment.php
+++ b/mod/glossary/comment.php
@@ -99,16 +99,16 @@
             glossary_print_comment($course, $cm, $glossary, $entry, $comment);
 
             print_simple_box_start("center","40%", "#FFBBBB");
-            echo "<center><br>" . get_string("areyousuredeletecomment","glossary");
+            echo "<center><br />" . get_string("areyousuredeletecomment","glossary");
             ?>
                 <form name="form" method="post" action="comment.php">
-                <input type="hidden" name=id            value="<?php p($id) ?>">
-                <input type="hidden" name=eid           value="<?php p($eid) ?>">
-                <input type="hidden" name=cid           value="<?php p($cid) ?>">
-                <input type="hidden" name=action        value="delete">
-                <input type="hidden" name=confirm       value="1">
-                <input type="submit" value=" <?php print_string("yes")?> ">
-                <input type=button value=" <?php print_string("no")?> " onclick="javascript:history.go(-1);">
+                <input type="hidden" name=id            value="<?php p($id) ?>" />
+                <input type="hidden" name=eid           value="<?php p($eid) ?>" />
+                <input type="hidden" name=cid           value="<?php p($cid) ?>" />
+                <input type="hidden" name=action        value="delete" />
+                <input type="hidden" name=confirm       value="1" />
+                <input type="submit" value=" <?php print_string("yes")?> " />
+                <input type=button value=" <?php print_string("no")?> " onclick="javascript:history.go(-1);" />
 
                 </form>
                 </center>
diff --git a/mod/glossary/config.html b/mod/glossary/config.html
index 57ac5bf72d..4753f7e121 100644
--- a/mod/glossary/config.html
+++ b/mod/glossary/config.html
@@ -11,7 +11,7 @@
 <tr valign=top>
     <td align=right><p>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") ?>
@@ -261,7 +261,7 @@
 </tr>
 <tr>
     <td colspan=3 align=center>
-	<input type="submit" value="<?php print_string("savechanges") ?>"></td>
+	<input type="submit" value="<?php print_string("savechanges") ?>" /></td>
 </tr>
 </table>
 
diff --git a/mod/glossary/edit.html b/mod/glossary/edit.html
index bbff83113d..10c7e64b96 100644
--- a/mod/glossary/edit.html
+++ b/mod/glossary/edit.html
@@ -17,14 +17,14 @@ if (isset($errors)) {
     <td valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="5">
         <tr>
           <td width="150" align=right><p><b><?php echo get_string("concept","glossary") ?>:</b></p></td>
-          <td><input type="text" name="concept" size=30 value="<?php p($newentry->concept) ?>"></td>
+          <td><input type="text" name="concept" size=30 value="<?php p($newentry->concept) ?>" /></td>
         </tr>
         <tr>
           <td align="right"><p><b><?php echo get_string("categories","glossary") ?>:</b></p></td>
           <td valign="top">
     <?php
         $categories = get_records("glossary_categories","glossaryid",$glossary->id,'name ASC');
-        echo "<select size=\"5\" name=\"categories[]\" multiple=\"yes\">";
+        echo "<select size=\"5\" name=\"categories[]\" multiple=\"yes\" />";
         echo "<option value=\"0\">" . get_string("notcategorised","glossary") . "</option>";
 
         if ( $categories ) {
@@ -60,9 +60,9 @@ if (isset($errors)) {
           <td colspan="2">
 <?php
     if ( !$glossary->usedynalink ) {
-      echo '<input type="hidden" name=usedynalink value="0">';
-      echo '<input type="hidden" name=casesensitive value="0">';
-      echo '<input type="hidden" name=fullmatch value="0">';
+      echo '<input type="hidden" name=usedynalink value="0" />';
+      echo '<input type="hidden" name=casesensitive value="0" />';
+      echo '<input type="hidden" name=fullmatch value="0" />';
     } else {
         echo '<script>var items = [\'casesensitive\',\'fullmatch\'];</script>';
 
@@ -71,7 +71,7 @@ if (isset($errors)) {
         } else {
             $selected = "";
         }
-        echo '<input type="checkbox" name="usedynalink" value=1 ' . $selected . ' onclick="return lockoptions(\'form\',\'usedynalink\', items)"> ';
+        echo '<input type="checkbox" name="usedynalink" value=1 ' . $selected . ' onclick="return lockoptions(\'form\',\'usedynalink\', items)" /> ';
         echo '<font size="-1">';
         print_string("entryusedynalink","glossary");
         echo '</font>';
@@ -83,7 +83,7 @@ if (isset($errors)) {
         } else {
             $selected = "";
         }
-        echo '<input type="checkbox" name="casesensitive" value=1 ' . $selected . '> ';
+        echo '<input type="checkbox" name="casesensitive" value=1 ' . $selected . ' /> ';
         echo '<font size="-1">';
         print_string("casesensitive","glossary");
         echo '</font>';
@@ -96,7 +96,7 @@ if (isset($errors)) {
         } else {
             $selected = "";
         }
-        echo '<input type="checkbox" name="fullmatch" value=1 ' . $selected . '> ';
+        echo '<input type="checkbox" name="fullmatch" value=1 ' . $selected . ' /> ';
         echo '<font size="-1">';
         print_string("fullmatch","glossary");
         echo '</font>';
@@ -143,7 +143,7 @@ if (isset($errors)) {
     <?php
         if ($usehtmleditor) {   /// Trying this out for a while
             print_string('formathtml');
-            echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'">';
+            echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'" />';
         } else {
             if (!isset($newentry->format)) {
                 $newentry->format = $defaultformat;
@@ -158,8 +158,8 @@ if (isset($errors)) {
 <tr valign=top>
     <td align=right><p><b><?php print_string("attachment", "glossary") ?>:<br />(<?php print_string("optional") ?>)&nbsp;</b></p></td>
     <td>
-    <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo get_max_upload_file_size($CFG->maxbytes, $course->maxbytes) ?>">
-    <input type="file" name="attachment" size=40>
+    <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo get_max_upload_file_size($CFG->maxbytes, $course->maxbytes) ?>" />
+    <input type="file" name="attachment" size=40 />
     <?php
        helpbutton("attachment", get_string("attachment", "glossary"), "glossary");
        print_string("maxsize", "", display_size(get_max_upload_file_size($CFG->maxbytes, $course->maxbytes)));
@@ -170,21 +170,21 @@ if (isset($errors)) {
 <td colspan=2>
     <p align=center>
     <?php if (isset($newentry->id)) {
-        echo "<input type=\"hidden\" name=e value=\"$newentry->id\">";
+        echo "<input type=\"hidden\" name=e value=\"$newentry->id\" />";
       }
   ?>
 
-  <input type="hidden" name=husedynalink value="1">
-  <input type="hidden" name=hcasesensitive value="0">
-  <input type="hidden" name=hfullmatch value="1">
+  <input type="hidden" name=husedynalink value="1" />
+  <input type="hidden" name=hcasesensitive value="0" />
+  <input type="hidden" name=hfullmatch value="1" />
 
-  <input type="hidden" name=id value="<?php p($cm->id) ?>">
-  <input type="hidden" name=mode value="<?php p($mode) ?>">
-  <input type="hidden" name=hook value="<?php p($hook) ?>">
+  <input type="hidden" name=id value="<?php p($cm->id) ?>" />
+  <input type="hidden" name=mode value="<?php p($mode) ?>" />
+  <input type="hidden" name=hook value="<?php p($hook) ?>" />
   <input type="hidden" name=confirm value="1">
 
-  <input type="submit" value="<?php print_string("savechanges") ?>">
-  <input type="reset" value="<?php print_string("revert") ?>">
+  <input type="submit" value="<?php print_string("savechanges") ?>" />
+  <input type="reset" value="<?php print_string("revert") ?>" />
   </P>
 </td>
 </tr>
diff --git a/mod/glossary/editcategories.html b/mod/glossary/editcategories.html
index 9c4742b7e7..852bcc6b2b 100644
--- a/mod/glossary/editcategories.html
+++ b/mod/glossary/editcategories.html
@@ -8,7 +8,7 @@
 <tr valign=top>
     <td align=right><p><b><?php echo get_string("name") ?>:</b></p></td>
     <td>
-        <INPUT type="text" name="name" size=30 value="<?php p($name) ?>">
+        <INPUT type="text" name="name" size=30 value="<?php p($name) ?>" />
     </td>
 </tr>
 <tr valign=top>
@@ -31,13 +31,13 @@
 </tr>
 <td colspan=2>
 	<p align=center>
-	<input type="hidden" name=id value="<?php p($cm->id) ?>">
-	<input type="hidden" name=action value="<?php p($action) ?>">
-	<input type="hidden" name=confirm value=1>
-	<input type="hidden" name=mode value='cat'>
-	<input type="hidden" name=hook value="<?php p($hook) ?>">
-	<input type="submit" value="<?php print_string("savechanges") ?>">
-	<input type="reset" value="<?php print_string("back","glossary") ?>"  onclick="javascript:history.go(-1);">
+	<input type="hidden" name=id value="<?php p($cm->id) ?>" />
+	<input type="hidden" name=action value="<?php p($action) ?>" />
+	<input type="hidden" name=confirm value=1 />
+	<input type="hidden" name=mode value='cat' />
+	<input type="hidden" name=hook value="<?php p($hook) ?>" />
+	<input type="submit" value="<?php print_string("savechanges") ?>" />
+	<input type="reset" value="<?php print_string("back","glossary") ?>"  onclick="javascript:history.go(-1);" />
 	</P>
 </td>
 </tr>
diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php
index da00f5eb83..cfc5149ecf 100644
--- a/mod/glossary/editcategories.php
+++ b/mod/glossary/editcategories.php
@@ -100,7 +100,7 @@
                 echo "<p align=\"center\">" . get_string("delete"). " " . get_string("category","glossary") . "<font size=\"3\">";
 
                 print_simple_box_start("center","40%", "#FFBBBB");
-                echo "<center><b>$category->name</b><br>";
+                echo "<center><b>$category->name</b><br />";
                 
                 $num_entries = count_records("glossary_entries_categories","categoryid",$category->id);
                 if ( $num_entries ) {
@@ -111,13 +111,13 @@
 ?>
                 <form name="form" method="post" action="editcategories.php">
 
-                <input type="hidden" name=id          value="<?php p($cm->id) ?>">
-                <input type="hidden" name=action      value="delete">
-                <input type="hidden" name=confirm     value="1">
-                <input type="hidden" name=mode         value="<?php echo $mode ?>">
-                <input type="hidden" name=hook         value="<?php echo $hook ?>">
-                <table border=0 widTH=100><tr><td align=right width=50%>
-                <input type="submit" value=" <?php print_string("yes")?> ">
+                <input type="hidden" name=id          value="<?php p($cm->id) ?>" />
+                <input type="hidden" name=action      value="delete" />
+                <input type="hidden" name=confirm     value="1" />
+                <input type="hidden" name=mode         value="<?php echo $mode ?>" />
+                <input type="hidden" name=hook         value="<?php echo $hook ?>" />
+                <table border=0 widTH=100><tr><td align=right width="50%" />
+                <input type="submit" value=" <?php print_string("yes")?> " />
                 </form>
                 </td><td align=left width=50%>
 
diff --git a/mod/glossary/exportentry.php b/mod/glossary/exportentry.php
index 3def1c5b06..ea64172e3f 100644
--- a/mod/glossary/exportentry.php
+++ b/mod/glossary/exportentry.php
@@ -53,7 +53,7 @@
         if ( !$confirm ) {
             echo "<center>";
             $areyousure = get_string("areyousureexport","glossary");
-            notice_yesno ("<center><h2>$entry->concept</h2><p align=center>$areyousure<br><b>$mainglossary->name</b>?",
+            notice_yesno ("<center><h2>$entry->concept</h2><p align=center>$areyousure<br /><b>$mainglossary->name</b>?",
                 "exportentry.php?id=$id&mode=$mode&hook=$hook&entry=$entry->id&confirm=1",
                 "view.php?id=$cm->id&mode=$mode&hook=$hook" );
 
diff --git a/mod/glossary/formats.php b/mod/glossary/formats.php
index fdd3867076..5df14db240 100644
--- a/mod/glossary/formats.php
+++ b/mod/glossary/formats.php
@@ -259,10 +259,10 @@
     </tr>
     <tr>
         <td colspan=3 align=center>
-        <input type="submit" value="<?php print_string("savechanges") ?>"></td>
+        <input type="submit" value="<?php print_string("savechanges") ?>" /></td>
     </tr>
-    <input type="hidden" name=id    value="<?php p($id) ?>">
-    <input type="hidden" name=mode    value="edit">
+    <input type="hidden" name=id    value="<?php p($id) ?>" />
+    <input type="hidden" name=mode    value="edit" />
     <?PHP
     
     print_simple_box_end();    
diff --git a/mod/glossary/import.html b/mod/glossary/import.html
index 756d4362e2..c2a00417d4 100644
--- a/mod/glossary/import.html
+++ b/mod/glossary/import.html
@@ -3,7 +3,7 @@
 <tr>
     <td align=right valign=top width="30%"><p><b><?php print_string("filetoimport","glossary") ?>:</b></p></td>
     <td width="70%">
-    <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo get_max_upload_file_size() ?>">
+    <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo get_max_upload_file_size() ?>" />
     <input type="file" name="file" size=40> <br />
     <?php 
        helpbutton("filetoimport", get_string("filetoimport", "glossary"), "glossary"); 
@@ -23,7 +23,7 @@
         </select> <?PHP helpbutton("destination", get_string("destination", "glossary"), "glossary") ?></td>
         <td width="25%">
         <p align="right"><?PHP p(get_string("importcategories","glossary")) ?>:</td>
-        <td width="25%"><input type="checkbox" name="catsincl" value="1"> <?PHP helpbutton("importcategories", get_string("importcategories", "glossary"), "glossary") ?></td>
+        <td width="25%"><input type="checkbox" name="catsincl" value="1" /> <?PHP helpbutton("importcategories", get_string("importcategories", "glossary"), "glossary") ?></td>
       </tr>
     </table>
     </td>
@@ -33,15 +33,15 @@
     <table border="0" cellpadding="3" cellspacing="3" width="100%">
       <tr>
         <td width="50%">
-        <p align="right"><input type="submit" value="<?php print_string("savechanges") ?>"></td>
-        <td width="50%"><input type="reset" value="<?php print_string("revert") ?>"></td>
+        <p align="right"><input type="submit" value="<?php print_string("savechanges") ?>" /></td>
+        <td width="50%"><input type="reset" value="<?php print_string("revert") ?>" /></td>
       </tr>
     </table>
     </td>
 </tr>
 </table>
-<input type="hidden" name="id" value="<?PHP p($id) ?>">
-<input type="hidden" name="l" value="<?PHP p($l) ?>">
-<input type="hidden" name="lasttab" value="<?PHP p($lasttab) ?>">
-<input type="hidden" name="step" value="1">
+<input type="hidden" name="id" value="<?PHP p($id) ?>" />
+<input type="hidden" name="l" value="<?PHP p($l) ?>" />
+<input type="hidden" name="lasttab" value="<?PHP p($lasttab) ?>" />
+<input type="hidden" name="step" value="1" />
 </form> 
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index d676416931..934b205c21 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -262,7 +262,7 @@ function glossary_print_recent_activity($course, $isteacher, $timestart) {
             
             $user = get_record("user","id",$entry->userid);
             $fullname = fullname($user, $isteacher);
-            echo "<p><font size=1>$date - $fullname<br>";
+            echo "<p><font size=1>$date - $fullname<br />";
             echo "\"<a href=\"$CFG->wwwroot/mod/glossary/view.php?g=$entry->glossaryid&mode=entry&hook=$entry->id\">";
             echo "$entry->concept";
             echo "</a>\"</font></p>";
@@ -462,7 +462,7 @@ function glossary_debug($debug,$text,$br=1) {
     if ( $debug ) {
         echo '<font color=red>' . $text . '</font>';
         if ( $br ) {
-            echo '<br>';
+            echo '<br />';
         }
     }
 }
@@ -1262,7 +1262,7 @@ for ($row = 0; $row < $numrows; $row++) {
       </td>
     </tr>
     <tr>
-      <td width="100%" bgcolor="<?php p($tablecolor) ?>"><hr></td>
+      <td width="100%" bgcolor="<?php p($tablecolor) ?>"><hr /></td>
     </tr>
     <tr>
       <td width="100%" bgcolor="<?php p($tablecolor) ?>">
@@ -1430,7 +1430,7 @@ global $CFG;
               if ((int) ($i % $letters_by_line) != 0 or $i == 0) {
                    echo ' | ';
               } else {
-                   echo '<br>';
+                   echo '<br />';
               }
           }
      }
@@ -1515,7 +1515,7 @@ global $CFG;
          $sort        = get_string("sortby", "glossary");
      }
 
-     echo "<br>$sort: $sbtag<a title=\"$ssort $sordertitle\" href=\"$CFG->wwwroot/mod/glossary/view.php?id=$cm->id&sortkey=$sorder$sneworder&mode=$mode\">$ssort$sicon</a>$sendbtag | ".
+     echo "<br />$sort: $sbtag<a title=\"$ssort $sordertitle\" href=\"$CFG->wwwroot/mod/glossary/view.php?id=$cm->id&sortkey=$sorder$sneworder&mode=$mode\">$ssort$sicon</a>$sendbtag | ".
                           "$fbtag<a title=\"$fsort $fordertitle\" href=\"$CFG->wwwroot/mod/glossary/view.php?id=$cm->id&sortkey=$forder$fneworder&mode=$mode\">$fsort$ficon</a>$fendbtag<br />";
 }
 
diff --git a/mod/glossary/mod.html b/mod/glossary/mod.html
index dff1201815..a530c8c712 100644
--- a/mod/glossary/mod.html
+++ b/mod/glossary/mod.html
@@ -72,7 +72,7 @@ if (!isset($form->assesstimefinish)) {
 <TR valign=top>
     <TD align=right><P><B><?php print_string("name") ?>:</B></P></TD>
     <TD>
-        <INPUT type="text" name="name" size=30 value="<?php p($form->name) ?>">
+        <INPUT type="text" name="name" size=30 value="<?php p($form->name) ?>" />
     </TD>
 </TR>
 <tr valign=top>
@@ -95,7 +95,7 @@ if (!isset($form->assesstimefinish)) {
 <TR valign=top>
     <TD align=right><P><B><?php echo get_string("entbypage", "glossary") ?>:</B></P></TD>
     <TD>
-		<input name=entbypage type=text size=2 value="<?php p($form->entbypage) ?>"> <?php helpbutton("entbypage", get_string("entbypage", "glossary"), "glossary") ?>
+		<input name=entbypage type=text size=2 value="<?php p($form->entbypage) ?>" /> <?php helpbutton("entbypage", get_string("entbypage", "glossary"), "glossary") ?>
     </TD>
 </TR>
 
@@ -114,12 +114,12 @@ if (isadmin() ) {
         }
     }
 ?> 
-  <input type="checkbox" name="globalglossary" value=1 <?PHP p($selected)?>> <?php helpbutton("globalglossary", get_string("globalglossary", "glossary"), "glossary") ?>
+  <input type="checkbox" name="globalglossary" value=1 selected="<?PHP p($selected)?>" /> <?php helpbutton("globalglossary", get_string("globalglossary", "glossary"), "glossary") ?>
     </TD>
 </TR>
 <?php
 } else {
-   echo '<INPUT type="hidden" name=globalglossary value="' . $form->globalglossary . '">';
+   echo '<INPUT type="hidden" name=globalglossary value="' . $form->globalglossary . '" />';
 }
 ?>
 <?php
@@ -147,11 +147,11 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
 </TR>
 <?php
 } else {
-	echo "<INPUT type=\"hidden\" name=mainglossary value=\"0\">";
+	echo "<INPUT type=\"hidden\" name=mainglossary value=\"0\" />";
 }
 ?>
 <TR valign=top>
-    <TD align=right><P><B><?php p(get_string("studentcanpost", "glossary")) ?>:</B><br>
+    <TD align=right><P><B><?php p(get_string("studentcanpost", "glossary")) ?>:</B><br />
     <font size=1><?php p(get_string("warningstudentcapost","glossary")) ?></font></P></TD>
     <TD>
   <select size="1" name="studentcanpost">
@@ -246,7 +246,7 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
     </TD>
 </TR>
 <TR valign=top>
-<td colspan=2><hr>
+<td colspan=2><hr />
 </tr>
 </tr>
 <TR valign=top>
@@ -405,9 +405,9 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
             echo "<input name=\"userating\" type=checkbox value=1 ";
             echo " onclick=\"return lockoptions('form','userating', subitemsall)\" ";
             if ($form->assessed) {
-                echo " checked ";
+                echo " checked=\"checked\" ";
             }
-            echo ">";
+            echo " />";
             echo get_string("ratingsuse", "glossary").":";
             echo "<br />";
 
@@ -427,9 +427,9 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
             echo " onclick=\"return lockoptions('form','ratingtime', subitemstime)\" ";
             if ($form->assesstimestart and $form->assesstimefinish and $form->assessed) {
                 $form->ratingtime = 1;
-                echo " checked ";
+                echo " checked=\"checked\" ";
             }
-            echo ">";
+            echo " />";
 
             print_string("ratingtime", "glossary");
             echo "<table align=left><tr><td align=right nowrap>";
@@ -442,19 +442,19 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
             print_time_selector("finishhour", "finishminute", $form->assesstimefinish);
             echo "<br />";
             echo "</td></tr></table>";
-            echo "<input type=\"hidden\" name=\"hratingtime\" value=0>";
-            echo "<input type=\"hidden\" name=\"hassessed\" value=0>";
-            echo "<input type=\"hidden\" name=\"hscale\" value=0>";
-            echo "<input type=\"hidden\" name=\"hstartday\" value=0>";
-            echo "<input type=\"hidden\" name=\"hstartmonth\" value=0>";
-            echo "<input type=\"hidden\" name=\"hstartyear\" value=0>";
-            echo "<input type=\"hidden\" name=\"hstarthour\" value=0>";
-            echo "<input type=\"hidden\" name=\"hstartminute\" value=0>";
-            echo "<input type=\"hidden\" name=\"hfinishday\" value=0>";
-            echo "<input type=\"hidden\" name=\"hfinishmonth\" value=0>";
-            echo "<input type=\"hidden\" name=\"hfinishyear\" value=0>";
-            echo "<input type=\"hidden\" name=\"hfinishhour\" value=0>";
-            echo "<input type=\"hidden\" name=\"hfinishminute\" value=0>";
+            echo "<input type=\"hidden\" name=\"hratingtime\" value=0 />";
+            echo "<input type=\"hidden\" name=\"hassessed\" value=0 />";
+            echo "<input type=\"hidden\" name=\"hscale\" value=0 />";
+            echo "<input type=\"hidden\" name=\"hstartday\" value=0 />";
+            echo "<input type=\"hidden\" name=\"hstartmonth\" value=0 />";
+            echo "<input type=\"hidden\" name=\"hstartyear\" value=0 />";
+            echo "<input type=\"hidden\" name=\"hstarthour\" value=0 />";
+            echo "<input type=\"hidden\" name=\"hstartminute\" value=0 />";
+            echo "<input type=\"hidden\" name=\"hfinishday\" value=0 />";
+            echo "<input type=\"hidden\" name=\"hfinishmonth\" value=0 />";
+            echo "<input type=\"hidden\" name=\"hfinishyear\" value=0 />";
+            echo "<input type=\"hidden\" name=\"hfinishhour\" value=0 />";
+            echo "<input type=\"hidden\" name=\"hfinishminute\" value=0 />";
 
             echo "<script>";
             echo "lockoptions('form','userating', subitemsall);";
@@ -470,13 +470,13 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
 </tr>
 </TABLE>
 <!-- These hidden variables are always the same -->
-<INPUT type="hidden" name=course        value="<?php p($form->course) ?>">
-<INPUT type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>">
-<INPUT type="hidden" name=section       value="<?php p($form->section) ?>">
-<INPUT type="hidden" name=module        value="<?php p($form->module) ?>">
-<INPUT type="hidden" name=modulename    value="<?php p($form->modulename) ?>">
-<INPUT type="hidden" name=instance      value="<?php p($form->instance) ?>">
-<INPUT type="hidden" name=mode          value="<?php p($form->mode) ?>">
-<INPUT type="submit" value="<?php print_string("savechanges") ?>">
+<INPUT type="hidden" name=course        value="<?php p($form->course) ?>" />
+<INPUT type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>" />
+<INPUT type="hidden" name=section       value="<?php p($form->section) ?>" />
+<INPUT type="hidden" name=module        value="<?php p($form->module) ?>" />
+<INPUT type="hidden" name=modulename    value="<?php p($form->modulename) ?>" />
+<INPUT type="hidden" name=instance      value="<?php p($form->instance) ?>" />
+<INPUT type="hidden" name=mode          value="<?php p($form->mode) ?>" />
+<INPUT type="submit" value="<?php print_string("savechanges") ?>" />
 </CENTER>
 </FORM>
diff --git a/mod/glossary/print.php b/mod/glossary/print.php
index da6c46f7ce..a9a9ca1c3d 100644
--- a/mod/glossary/print.php
+++ b/mod/glossary/print.php
@@ -144,7 +144,7 @@
 
     $site = get_record("course","id",1);
     echo '<p align="right"><font size=-1>' . userdate(time()) . '</font></p>';
-    echo '<strong>' . $site->fullname . '</strong><br>';
+    echo '<strong>' . $site->fullname . '</strong><br />';
     echo get_string("course") . ': <strong>' . $course->fullname . ' ('. $course->shortname . ')</strong><br />';
     echo get_string("modulename","glossary") . ': <strong>' . $glossary->name . '</strong><p>';
     if ( $allentries ) {
@@ -176,7 +176,7 @@
     
             echo ($definition);
         
-            echo '<br><br>';
+            echo '<br /><br />';
         }
     }
 
diff --git a/mod/glossary/restorelib.php b/mod/glossary/restorelib.php
index e5b80b2283..3fe61f6fbd 100644
--- a/mod/glossary/restorelib.php
+++ b/mod/glossary/restorelib.php
@@ -112,7 +112,7 @@
             $newid = insert_record ("glossary",$glossary);
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","glossary")." \"".$glossary->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","glossary")." \"".$glossary->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -193,7 +193,7 @@
 	        if (($i+1) % 50 == 0) {
       	            echo ".";
             	    if (($i+1) % 1000 == 0) {
-                        echo "<br>";
+                        echo "<br />";
 	            }
       	            backup_flush(300);
                 }
@@ -260,7 +260,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -311,7 +311,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -349,7 +349,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -393,7 +393,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -445,7 +445,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -680,7 +680,7 @@
             }
             break;
         default:
-            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br>";                 //Debug
+            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br />";                 //Debug
             break;
         }
 
diff --git a/mod/glossary/tabs.html b/mod/glossary/tabs.html
index 241bd7b89d..205c8b7b51 100644
--- a/mod/glossary/tabs.html
+++ b/mod/glossary/tabs.html
@@ -49,7 +49,7 @@
 
         $hiddenentries = get_records_select("glossary_entries","glossaryid  = $glossary->id and approved = 0");
         if ($hiddenentries) {
-            $data[GLOSSARY_APPROVAL_VIEW]->caption .= "<br><font size=1>(" . count($hiddenentries) . " " . get_string("entries","glossary") . ")</font>";
+            $data[GLOSSARY_APPROVAL_VIEW]->caption .= "<br /><font size=1>(" . count($hiddenentries) . " " . get_string("entries","glossary") . ")</font>";
             $data[GLOSSARY_APPROVAL_VIEW]->link = "view.php?id=$id&tab=".GLOSSARY_APPROVAL_VIEW;
 
             $data[GLOSSARY_APPROVAL_VIEW]->link = "view.php?id=$id&mode=approval";
@@ -112,5 +112,5 @@
             } 
         break;
     } 
-    echo '<hr>';
+    echo '<hr />';
 ?> 
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 16f451bd1b..b0db9af40c 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -260,20 +260,20 @@
     
     echo '<p align="center">';
     echo '<form method="POST" action="view.php">';
-    echo '<input type="submit" value="'.$strsearch.'" name="searchbutton"> ';
+    echo '<input type="submit" value="'.$strsearch.'" name="searchbutton" /> ';
     if ($mode == 'search') {
-        echo '<input type="text" name="hook" size="20" value="'.$hook.'"> ';
+        echo '<input type="text" name="hook" size="20" value="'.$hook.'" /> ';
     } else {
-        echo '<input type="text" name="hook" size="20" value=""> ';
+        echo '<input type="text" name="hook" size="20" value="" /> ';
     }
     if ($fullsearch) {
         $fullsearchchecked = 'checked="checked"';
     } else {
         $fullsearchchecked = '';
     }
-    echo '<input type="checkbox" name="fullsearch" value="1" '.$fullsearchchecked.'>';
-    echo '<input type="hidden" name="mode" value="search">';
-    echo '<input type="hidden" name="id" value="'.$cm->id.'">';
+    echo '<input type="checkbox" name="fullsearch" value="1" '.$fullsearchchecked.' />';
+    echo '<input type="hidden" name="mode" value="search" />';
+    echo '<input type="hidden" name="id" value="'.$cm->id.'" />';
     echo $strsearchindefinition;
     echo '</form>';
     echo '</p>';
@@ -303,7 +303,7 @@
             for ($i = 0; ($i*$entriesbypage) < $count  ; $i++   ) {
                 if ( $paging != '' ) {
                     if ($i % 20 == 0 and $i) {
-                        $paging .= '<br>';
+                        $paging .= '<br />';
                     } else {
                         $paging .= ' | ';
                     }
@@ -335,7 +335,7 @@
             }
 
             echo "<form name=form method=post action=rate.php>";
-            echo "<input type=hidden name=id value=\"$course->id\">";
+            echo "<input type=hidden name=id value=\"$course->id\" />";
         }
 
         foreach ($allentries as $entry) {
@@ -397,7 +397,7 @@
     }
 
     if ($ratingsmenuused) {
-        echo "<p><center><input type=\"submit\" value=\"".get_string("sendinratings", "glossary")."\">";
+        echo "<p><center><input type=\"submit\" value=\"".get_string("sendinratings", "glossary")."\" />";
         if ($glossary->scale < 0) {
             if ($scale = get_record("scale", "id", abs($glossary->scale))) {
                 print_scale_menu_helpbutton($course->id, $scale );
@@ -415,7 +415,7 @@
     glossary_print_tabbed_table_end();
     if ( $debug and isadmin() ) {
         echo '<p>';
-        print_simple_box("$sqlselect<br> $sqlfrom<br> $sqlwhere<br> $sqlorderby<br> $sqllimit","center","85%");
+        print_simple_box("$sqlselect<br /> $sqlfrom<br /> $sqlwhere<br /> $sqlorderby<br /> $sqllimit","center","85%");
 
         echo "<p align=right><font size=-3>";
         echo microtime_diff($CFG->startpagetime, microtime());
diff --git a/mod/journal/edit.html b/mod/journal/edit.html
index 60f870dde6..0b156d1a77 100644
--- a/mod/journal/edit.html
+++ b/mod/journal/edit.html
@@ -30,9 +30,9 @@
 ?>
 </td></tr>
 <tr><td align=center bgcolor="<?php echo $THEME->cellheading2 ?>" class=generalboxcontent>
-<input type="hidden" name=id value="<?php echo $cm->id ?>">
-<input type="submit" value="<?php  print_string("savechanges") ?>">
-<input type="reset" value="<?php  print_string("revert") ?>">
+<input type="hidden" name=id value="<?php echo $cm->id ?>" />
+<input type="submit" value="<?php  print_string("savechanges") ?>" />
+<input type="reset" value="<?php  print_string("revert") ?>" />
 </td></tr></table>
 </form>
 
diff --git a/mod/journal/lib.php b/mod/journal/lib.php
index f33270355a..572cb61532 100644
--- a/mod/journal/lib.php
+++ b/mod/journal/lib.php
@@ -161,9 +161,9 @@ function journal_cron () {
                 "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
                 "<a href=\"$CFG->wwwroot/mod/journal/index.php?id=$course->id\">journals</a> ->".
                 "<a href=\"$CFG->wwwroot/mod/journal/view.php?id=$mod->id\">$entry->name</a></font></p>";
-                $posthtml .= "<hr><font face=\"sans-serif\">";
+                $posthtml .= "<hr /><font face=\"sans-serif\">";
                 $posthtml .= "<p>".get_string("journalmailhtml", "journal", $journalinfo)."</p>";
-                $posthtml .= "</font><hr>";
+                $posthtml .= "</font><hr />";
             } else {
               $posthtml = "";
             }
diff --git a/mod/journal/mod.html b/mod/journal/mod.html
index 48e1c61c2d..056e7e5bf3 100644
--- a/mod/journal/mod.html
+++ b/mod/journal/mod.html
@@ -22,7 +22,7 @@
 <tr valign=top>
     <td align=right><p><b><?php print_string("journalname", "journal") ?>:</b></p></td>
     <td>
-        <input type="text" name="name" size=30 value="<?php p($form->name) ?>">
+        <input type="text" name="name" size=30 value="<?php p($form->name) ?>" />
     </td>
 </tr>
 
@@ -94,14 +94,14 @@
 
 </table>
 <center>
-<input type="hidden" name=course     value="<?php p($form->course) ?>">
-<input type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>">
-<input type="hidden" name=section       value="<?php p($form->section) ?>">
-<input type="hidden" name=module     value="<?php p($form->module) ?>">
-<input type="hidden" name=modulename value="<?php p($form->modulename) ?>">
-<input type="hidden" name=instance   value="<?php p($form->instance) ?>">
-<input type="hidden" name=mode       value="<?php p($form->mode) ?>">
-<input type="submit" value="<?php print_string("savechanges") ?>">
-<input type="submit" name=cancel value="<?php print_string("cancel") ?>">
+<input type="hidden" name=course     value="<?php p($form->course) ?>" />
+<input type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>" />
+<input type="hidden" name=section       value="<?php p($form->section) ?>" />
+<input type="hidden" name=module     value="<?php p($form->module) ?>" />
+<input type="hidden" name=modulename value="<?php p($form->modulename) ?>" />
+<input type="hidden" name=instance   value="<?php p($form->instance) ?>" />
+<input type="hidden" name=mode       value="<?php p($form->mode) ?>" />
+<input type="submit" value="<?php print_string("savechanges") ?>" />
+<input type="submit" name=cancel value="<?php print_string("cancel") ?>" />
 </form>
 </center>
diff --git a/mod/journal/report.php b/mod/journal/report.php
index 7e82e67c3a..3b761f9cac 100644
--- a/mod/journal/report.php
+++ b/mod/journal/report.php
@@ -134,8 +134,8 @@
 
         if ($allowedtograde) {
             echo "<center>";
-            echo "<input type=hidden name=id value=\"$cm->id\">";
-            echo "<input type=submit value=\"".get_string("saveallfeedback", "journal")."\">";
+            echo "<input type=hidden name=id value=\"$cm->id\" />";
+            echo "<input type=submit value=\"".get_string("saveallfeedback", "journal")."\" />";
             echo "</center>";
             echo "</form>";
         }
diff --git a/mod/journal/restorelib.php b/mod/journal/restorelib.php
index e642d10721..1afd3cd02b 100644
--- a/mod/journal/restorelib.php
+++ b/mod/journal/restorelib.php
@@ -59,7 +59,7 @@
             $newid = insert_record ("journal",$journal);
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","journal")." \"".$journal->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","journal")." \"".$journal->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -138,7 +138,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -240,7 +240,7 @@
             $status = true;
             break;
         default:
-            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br>";                 //Debug
+            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br />";                 //Debug
             break;
         }
 
diff --git a/mod/label/mod.html b/mod/label/mod.html
index 629e483441..c8d8d2c001 100644
--- a/mod/label/mod.html
+++ b/mod/label/mod.html
@@ -31,13 +31,13 @@
 
 </table>
 <!-- these hidden variables are always the same -->
-<input type="hidden" name=course        value="<?php  p($form->course) ?>">
-<input type="hidden" name=coursemodule  value="<?php  p($form->coursemodule) ?>">
-<input type="hidden" name=section       value="<?php  p($form->section) ?>">
-<input type="hidden" name=module        value="<?php  p($form->module) ?>">
-<input type="hidden" name=modulename    value="<?php  p($form->modulename) ?>">
-<input type="hidden" name=instance      value="<?php  p($form->instance) ?>">
-<input type="hidden" name=mode          value="<?php  p($form->mode) ?>">
-<input type="submit" value="<?php  print_string("savechanges") ?>">
+<input type="hidden" name=course        value="<?php  p($form->course) ?>" />
+<input type="hidden" name=coursemodule  value="<?php  p($form->coursemodule) ?>" />
+<input type="hidden" name=section       value="<?php  p($form->section) ?>" />
+<input type="hidden" name=module        value="<?php  p($form->module) ?>" />
+<input type="hidden" name=modulename    value="<?php  p($form->modulename) ?>" />
+<input type="hidden" name=instance      value="<?php  p($form->instance) ?>" />
+<input type="hidden" name=mode          value="<?php  p($form->mode) ?>" />
+<input type="submit" value="<?php  print_string("savechanges") ?>" />
 </center>
 </form>
diff --git a/mod/label/restorelib.php b/mod/label/restorelib.php
index 45e4b6b8fb..25474d6242 100644
--- a/mod/label/restorelib.php
+++ b/mod/label/restorelib.php
@@ -43,7 +43,7 @@
             $newid = insert_record ("label",$label);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","label")." \"".$label->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","label")." \"".$label->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -96,7 +96,7 @@
             }
             break;
         default:
-            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br>";                 //Debug
+            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br />";                 //Debug
             break;
         }
 
diff --git a/mod/lesson/format.php b/mod/lesson/format.php
index 34bc2523bf..93b23f2244 100644
--- a/mod/lesson/format.php
+++ b/mod/lesson/format.php
@@ -50,7 +50,7 @@ class quiz_default_format {
                 case MATCH :
                     $count++;
 
-                    echo "<hr><p><b>$count</b>. ".stripslashes($question->questiontext)."</p>";
+                    echo "<hr /><p><b>$count</b>. ".stripslashes($question->questiontext)."</p>";
                     unset($newpage);
                     $newpage->lessonid = $lesson->id;
                     $newpage->qtype = $question->qtype;
diff --git a/mod/lesson/import.php b/mod/lesson/import.php
index c82b7756b5..69a7850625 100644
--- a/mod/lesson/import.php
+++ b/mod/lesson/import.php
@@ -72,7 +72,7 @@
                 error("Error occurred during post-processing!");
             }
 
-            echo "<hr>";
+            echo "<hr />";
             print_continue("view.php?id=$cm->id");
             print_footer($course);
             exit;
@@ -97,8 +97,8 @@
 
     print_simple_box_start("center", "", "$THEME->cellheading");
     echo "<form enctype=\"multipart/form-data\" method=\"post\" action=import.php>";
-    echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\">\n";
-    echo "<input type=\"hidden\" name=\"pageid\" value=\"".$_GET['pageid']."\">\n";
+    echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n";
+    echo "<input type=\"hidden\" name=\"pageid\" value=\"".$_GET['pageid']."\" />\n";
     echo "<table cellpadding=5>";
 
     echo "<tr><td align=right>";
@@ -110,9 +110,9 @@
     echo "<tr><td align=right>";
     print_string("upload");
     echo ":</td><td>";
-    echo " <input name=\"newfile\" type=\"file\" size=\"50\">";
+    echo " <input name=\"newfile\" type=\"file\" size=\"50\" />";
     echo "</tr><tr><td>&nbsp;</td><td>";
-    echo " <input type=submit name=save value=\"".get_string("uploadthisfile")."\">";
+    echo " <input type=submit name=save value=\"".get_string("uploadthisfile")."\" />";
     echo "</td></tr>";
 
     echo "</table>";
diff --git a/mod/lesson/lesson.php b/mod/lesson/lesson.php
index 65ba1803b7..cbb0545ffe 100644
--- a/mod/lesson/lesson.php
+++ b/mod/lesson/lesson.php
@@ -91,15 +91,15 @@
 		print_heading_with_help(get_string("addabranchtable", "lesson"), "overview", "lesson");
         ?>
         <form name="form" method="post" action="lesson.php">
-        <input type="hidden" name="id" value="<?PHP echo $cm->id ?>">
-        <input type="hidden" name="action" value="insertpage">
-        <input type="hidden" name="pageid" value="<?PHP echo $_GET['pageid'] ?>">
-        <input type="hidden" name="qtype" value="<?PHP echo LESSON_BRANCHTABLE ?>">
+        <input type="hidden" name="id" value="<?PHP echo $cm->id ?>" />
+        <input type="hidden" name="action" value="insertpage" />
+        <input type="hidden" name="pageid" value="<?PHP echo $_GET['pageid'] ?>" />
+        <input type="hidden" name="qtype" value="<?PHP echo LESSON_BRANCHTABLE ?>" />
         <center><table cellpadding=5 border=1>
         <tr><td align="center">
         <tr valign="top">
         <td><b><?php print_string("pagetitle", "lesson"); ?>:</b><br />
-        <input type="text" name="title" size="80" maxsize="255" value=""></td></tr>
+        <input type="text" name="title" size="80" maxsize="255" value="" /></td></tr>
         <?PHP
         echo "<tr><td><b>";
         echo get_string("pagecontents", "lesson").":</b><br />\n";
@@ -125,8 +125,8 @@
         // close table and form
         ?>
         </table><br />
-        <input type="submit" value="<?php  print_string("addabranchtable", "lesson") ?>">
-        <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>">
+        <input type="submit" value="<?php  print_string("addabranchtable", "lesson") ?>" />
+        <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
         </center>
         </form>
         <?PHP
@@ -228,14 +228,14 @@
 		print_heading_with_help(get_string("addaquestionpage", "lesson"), "overview", "lesson");
         ?>
         <form name="form" method="post" action="lesson.php">
-        <input type="hidden" name="id" value="<?PHP echo $cm->id ?>">
-        <input type="hidden" name="action" value="insertpage">
-        <input type="hidden" name="pageid" value="<?PHP echo $_GET['pageid'] ?>">
+        <input type="hidden" name="id" value="<?PHP echo $cm->id ?>" />
+        <input type="hidden" name="action" value="insertpage" />
+        <input type="hidden" name="pageid" value="<?PHP echo $_GET['pageid'] ?>" />
         <center><table cellpadding=5 border=1>
         <tr><td align="center">
         <tr valign="top">
         <td><b><?php print_string("pagetitle", "lesson"); ?>:</b><br />
-        <input type="text" name="title" size="80" maxsize="255" value=""></td></tr>
+        <input type="text" name="title" size="80" maxsize="255" value="" /></td></tr>
         <?PHP
         echo "<tr><td><b>";
         echo get_string("pagecontents", "lesson").":</b><br />\n";
@@ -246,7 +246,7 @@
         choose_from_menu($LESSON_QUESTION_TYPE, "qtype", LESSON_MULTICHOICE, "");
         helpbutton("questiontype", get_string("questiontype", "lesson"), "lesson");
         echo "<br /><b>".get_string("questionoption", "lesson").":</b>\n";
-        echo " <input type=\"checkbox\" name=\"qoption\" value=\"1\"/>";
+        echo " <input type=\"checkbox\" name=\"qoption\" value=\"1\"/ />";
         helpbutton("questionoption", get_string("questionoption", "lesson"), "lesson");
         echo "</td></tr>\n";
         for ($i = 0; $i < $lesson->maxanswers; $i++) {
@@ -271,8 +271,8 @@
         // close table and form
         ?>
         </table><br />
-        <input type="submit" value="<?php  print_string("addaquestionpage", "lesson") ?>">
-        <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>">
+        <input type="submit" value="<?php  print_string("addaquestionpage", "lesson") ?>" />
+        <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
         </center>
         </form>
         <?PHP
@@ -677,11 +677,11 @@
             }
         }
         echo "<form name=\"pageform\" method =\"post\" action=\"view.php\">\n";
-        echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\">\n";
-        echo "<input type=\"hidden\" name=\"action\" value=\"navigation\">\n";
-        echo "<input type=\"hidden\" name=\"pageid\" value=\"$newpageid\">\n";
+        echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n";
+        echo "<input type=\"hidden\" name=\"action\" value=\"navigation\" />\n";
+        echo "<input type=\"hidden\" name=\"pageid\" value=\"$newpageid\" />\n";
         echo "<p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-            get_string("continue", "lesson")."\"></p>\n";
+            get_string("continue", "lesson")."\" /></p>\n";
         echo "</form>\n";
 	}
 	
@@ -786,15 +786,15 @@
         // give teacher a proforma
         ?>
         <form name="editpage" method="post" action="lesson.php">
-        <input type="hidden" name="id" value="<?PHP echo $cm->id ?>">
-        <input type="hidden" name="action" value="updatepage">
-        <input type="hidden" name="pageid" value="<?PHP echo $_GET['pageid'] ?>">
-        <input type="hidden" name="redisplay" value="0">
+        <input type="hidden" name="id" value="<?PHP echo $cm->id ?>" />
+        <input type="hidden" name="action" value="updatepage" />
+        <input type="hidden" name="pageid" value="<?PHP echo $_GET['pageid'] ?>" />
+        <input type="hidden" name="redisplay" value="0" />
         <center><table cellpadding=5 border=1>
         <tr><td align="center">
         <tr valign="top">
         <td><b><?php print_string("pagetitle", "lesson"); ?>:</b><br />
-        <input type="text" name="title" size="80" maxsize="255" value="<?PHP echo $page->title ?>"></td>
+        <input type="text" name="title" size="80" maxsize="255" value="<?PHP echo $page->title ?>" /></td>
         </tr>
         <?PHP
         echo "<tr><td><b>";
@@ -810,9 +810,9 @@
                 echo "&nbsp;&nbsp;";
                 echo " <b>".get_string("casesensitive", "lesson").":</b> \n";
                 if ($page->qoption) {
-                    echo "<input type=\"checkbox\" name=\"qoption\" value=\"1\" checked=\"checked\"/>";
+                    echo "<input type=\"checkbox\" name=\"qoption\" value=\"1\" checked=\"checked\" />";
                 } else {
-                    echo "<input type=\"checkbox\" name=\"qoption\" value=\"1\"/>";
+                    echo "<input type=\"checkbox\" name=\"qoption\" value=\"1\" />";
                 }
                 helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson");
                 break;
@@ -822,9 +822,9 @@
                 echo "&nbsp;&nbsp;";
                 echo " <b>".get_string("multianswer", "lesson").":</b> \n";
                 if ($page->qoption) {
-                    echo "<input type=\"checkbox\" name=\"qoption\" value=\"1\" checked=\"checked\"/>";
+                    echo "<input type=\"checkbox\" name=\"qoption\" value=\"1\" checked=\"checked\" />";
                 } else {
-                    echo "<input type=\"checkbox\" name=\"qoption\" value=\"1\"/>";
+                    echo "<input type=\"checkbox\" name=\"qoption\" value=\"1\" />";
                 }
                 helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson");
                 break;
@@ -836,11 +836,11 @@
                 helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson");
                 break;
             case LESSON_BRANCHTABLE :
-                echo "<input type=\"hidden\" name=\"qtype\" value=\"$page->qtype\">\n";
+                echo "<input type=\"hidden\" name=\"qtype\" value=\"$page->qtype\" />\n";
                 echo "<tr><td><b>".get_string("branchtable", "lesson")."</b> \n";
                 break;
             case LESSON_ENDOFBRANCH :
-                echo "<input type=\"hidden\" name=\"qtype\" value=\"$page->qtype\">\n";
+                echo "<input type=\"hidden\" name=\"qtype\" value=\"$page->qtype\" />\n";
                 echo "<tr><td><b>".get_string("endofbranch", "lesson")."</b> \n";
                 break;                
         }       
@@ -850,7 +850,7 @@
             foreach ($answers as $answer) {
                 $flags = intval($answer->flags); // force into an integer
                 $nplus1 = $n + 1;
-                echo "<input type=\"hidden\" name=\"answerid[$n]\" value=\"$answer->id\">\n";
+                echo "<input type=\"hidden\" name=\"answerid[$n]\" value=\"$answer->id\" />\n";
                 switch ($page->qtype) {
                     case LESSON_MULTICHOICE:
                     case LESSON_TRUEFALSE:
@@ -861,14 +861,14 @@
                         if ($flags & LESSON_ANSWER_EDITOR) {
                             echo " [".get_string("useeditor", "lesson").": ".
                                 "<input type=\"checkbox\" name=\"answereditor[$n]\" value=\"1\" 
-                                checked=\"checked\">";
+                                checked=\"checked\" />";
                             helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson");
                             echo "]<br />\n";
                             print_textarea($usehtmleditor, 20, 70, 630, 300, "answer[$n]", $answer->answer);
                             use_html_editor("answer[$n]"); // switch on the editor
                         } else {
                             echo " [".get_string("useeditor", "lesson").": ".
-                                "<input type=\"checkbox\" name=\"answereditor[$n]\" value=\"1\">";
+                                "<input type=\"checkbox\" name=\"answereditor[$n]\" value=\"1\" />";
                             helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson");
                             echo "]<br />\n";
                             print_textarea(false, 6, 70, 630, 300, "answer[$n]", $answer->answer);
@@ -878,14 +878,14 @@
                         if ($flags & LESSON_RESPONSE_EDITOR) {
                             echo " [".get_string("useeditor", "lesson").": ".
                                 "<input type=\"checkbox\" name=\"responseeditor[$n]\" value=\"1\" 
-                                checked=\"checked\">";
+                                checked=\"checked\" />";
                             helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson");
                             echo "]<br />\n";
                             print_textarea($usehtmleditor, 20, 70, 630, 300, "response[$n]", $answer->response);
                             use_html_editor("response[$n]"); // switch on the editor
                         } else {
                             echo " [".get_string("useeditor", "lesson").": ".
-                                "<input type=\"checkbox\" name=\"responseeditor[$n]\" value=\"1\">";
+                                "<input type=\"checkbox\" name=\"responseeditor[$n]\" value=\"1\" />";
                             helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson");
                             echo "]<br />\n";
                             print_textarea(false, 6, 70, 630, 300, "response[$n]", $answer->response);
@@ -897,13 +897,13 @@
                         if ($flags & LESSON_ANSWER_EDITOR) {
                             echo " [".get_string("useeditor", "lesson").": ".
                                 "<input type=\"checkbox\" name=\"answereditor[$n]\" value=\"1\" 
-                                checked=\"checked\">";
+                                checked=\"checked\" />";
                             helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson");
                             echo "]<br />\n";
                             print_textarea($usehtmleditor, 20, 70, 630, 300, "answer[$n]", $answer->answer);
                         } else {
                             echo " [".get_string("useeditor", "lesson").": ".
-                                "<input type=\"checkbox\" name=\"answereditor[$n]\" value=\"1\">";
+                                "<input type=\"checkbox\" name=\"answereditor[$n]\" value=\"1\" />";
                             helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson");
                             echo "]<br />\n";
                             print_textarea(false, 10, 70, 630, 300, "answer[$n]", $answer->answer);
@@ -921,7 +921,7 @@
         if ($page->qtype != LESSON_ENDOFBRANCH) {
             for ($i = $n; $i < $lesson->maxanswers; $i++) {
                 $iplus1 = $i + 1;
-                echo "<input type=\"hidden\" name=\"answerid[$i]\" value=\"0\">\n";
+                echo "<input type=\"hidden\" name=\"answerid[$i]\" value=\"0\" />\n";
                 switch ($page->qtype) {
                     case LESSON_MULTICHOICE:
                     case LESSON_TRUEFALSE:
@@ -930,14 +930,14 @@
                     case LESSON_MATCHING:
                         echo "<tr><td><b>".get_string("answer", "lesson")." $iplus1:</b>\n";
                         echo " [".get_string("useeditor", "lesson").": ".
-                            "<input type=\"checkbox\" name=\"answereditor[$i]\" value=\"1\">";
+                            "<input type=\"checkbox\" name=\"answereditor[$i]\" value=\"1\" />";
                         helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson");
                         echo "]<br />\n";
                         print_textarea(false, 10, 70, 630, 300, "answer[$i]");
                         echo "</td></tr>\n";
                         echo "<tr><td><b>".get_string("response", "lesson")." $iplus1:</b>\n";
                         echo " [".get_string("useeditor", "lesson").": ".
-                            "<input type=\"checkbox\" name=\"responseeditor[$i]\" value=\"1\">";
+                            "<input type=\"checkbox\" name=\"responseeditor[$i]\" value=\"1\" />";
                         helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson");
                         echo "]<br />\n";
                         print_textarea(false, 10, 70, 630, 300, "response[$i]");
@@ -946,7 +946,7 @@
                     case LESSON_BRANCHTABLE:
                         echo "<tr><td><b>".get_string("description", "lesson")." $iplus1:</b>\n";
                         echo " [".get_string("useeditor", "lesson").": ".
-                            "<input type=\"checkbox\" name=\"answereditor[$i]\" value=\"1\">";
+                            "<input type=\"checkbox\" name=\"answereditor[$i]\" value=\"1\" />";
                         helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson");
                         echo "]<br />\n";
                         print_textarea(false, 10, 70, 630, 300, "answer[$i]");
@@ -963,9 +963,9 @@
         ?>
         </table><br />
         <input type="button" value="<?php print_string("redisplaypage", "lesson") ?>" 
-            onclick="document.editpage.redisplay.value=1;document.editpage.submit();">
-        <input type="submit" value="<?php  print_string("savepage", "lesson") ?>">
-        <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>">
+            onclick="document.editpage.redisplay.value=1;document.editpage.submit();" />
+        <input type="submit" value="<?php  print_string("savepage", "lesson") ?>" />
+        <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
         </center>
         </form>
         <?PHP
diff --git a/mod/lesson/mod.html b/mod/lesson/mod.html
index 92d58bcc56..be308d69b9 100644
--- a/mod/lesson/mod.html
+++ b/mod/lesson/mod.html
@@ -48,7 +48,7 @@
 <TR valign=top>
     <TD align=right><P><B><?php  print_string("name") ?>:</B></P></TD>
     <TD>
-        <INPUT type="text" name="name" size=30 value="<?php  p($form->name) ?>">
+        <INPUT type="text" name="name" size=30 value="<?php  p($form->name) ?>" />
     </TD>
 </TR>
 
@@ -172,13 +172,13 @@
 
 </TABLE>
 <!-- These hidden variables are always the same -->
-<INPUT type="hidden" name=course        value="<?php  p($form->course) ?>">
-<INPUT type="hidden" name=coursemodule  value="<?php  p($form->coursemodule) ?>">
-<INPUT type="hidden" name=section       value="<?php  p($form->section) ?>">
-<INPUT type="hidden" name=module        value="<?php  p($form->module) ?>">
-<INPUT type="hidden" name=modulename    value="<?php  p($form->modulename) ?>">
-<INPUT type="hidden" name=instance      value="<?php  p($form->instance) ?>">
-<INPUT type="hidden" name=mode          value="<?php  p($form->mode) ?>">
-<INPUT type="submit" value="<?php  print_string("savechanges") ?>">
+<INPUT type="hidden" name=course        value="<?php  p($form->course) ?>" />
+<INPUT type="hidden" name=coursemodule  value="<?php  p($form->coursemodule) ?>" />
+<INPUT type="hidden" name=section       value="<?php  p($form->section) ?>" />
+<INPUT type="hidden" name=module        value="<?php  p($form->module) ?>" />
+<INPUT type="hidden" name=modulename    value="<?php  p($form->modulename) ?>" />
+<INPUT type="hidden" name=instance      value="<?php  p($form->instance) ?>" />
+<INPUT type="hidden" name=mode          value="<?php  p($form->mode) ?>" />
+<INPUT type="submit" value="<?php  print_string("savechanges") ?>" />
 </CENTER>
 </FORM>
diff --git a/mod/lesson/restorelib.php b/mod/lesson/restorelib.php
index c19399a130..bdd64b8b7f 100644
--- a/mod/lesson/restorelib.php
+++ b/mod/lesson/restorelib.php
@@ -67,7 +67,7 @@
             $newid = insert_record("lesson", $lesson);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","lesson")." \"".$lesson->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","lesson")." \"".$lesson->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -143,7 +143,7 @@
             if (($i+1) % 10 == 0) {
                 echo ".";
                 if (($i+1) % 200 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -213,7 +213,7 @@
                 if (($i+1) % 10 == 0) {
                     echo ".";
                     if (($i+1) % 200 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
@@ -274,7 +274,7 @@
                 if (($i+1) % 50 == 0) {
                     echo ".";
                     if (($i+1) % 1000 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
@@ -325,7 +325,7 @@
                 if (($i+1) % 50 == 0) {
                     echo ".";
                     if (($i+1) % 1000 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
@@ -407,7 +407,7 @@
             }
             break;
         default:
-            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br>";                 //Debug
+            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br />";                 //Debug
             break;
         }
 
diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index f03e3fa18e..cc2af7c6bb 100644
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -95,14 +95,14 @@
                 }
                 if ($lastpageseen != $firstpageid) {
                     echo "<form name=\"queryform\" method =\"post\" action=\"view.php\">\n";
-                    echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\">\n";
-                    echo "<input type=\"hidden\" name=\"action\" value=\"navigation\">\n";
-                    echo "<input type=\"hidden\" name=\"pageid\">\n";
+                    echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n";
+                    echo "<input type=\"hidden\" name=\"action\" value=\"navigation\" />\n";
+                    echo "<input type=\"hidden\" name=\"pageid\" />\n";
                     print_simple_box("<p align=\"center\">".get_string("youhaveseen","lesson")."</p>",
                             "center");
                     echo "<p align=\"center\"><input type=\"button\" value=\"".get_string("yes").
                         "\" onclick=\"document.queryform.pageid.value='$lastpageseen';document.queryform.submit();\">&nbsp;&nbsp;&nbsp;<input type=\"button\" value=\"".get_string("no").
-                        "\" onclick=\"document.queryform.pageid.value='$firstpageid';document.queryform.submit();\"></p>\n";
+                        "\" onclick=\"document.queryform.pageid.value='$firstpageid';document.queryform.submit();\" /></p>\n";
                     echo "</form>\n";
                     print_footer($course);
                     exit();
@@ -186,26 +186,26 @@
             // get the answers in a set order, the id order
             if ($answers = get_records("lesson_answers", "pageid", $page->id, "id")) {
                 echo "<form name=\"answerform\" method =\"post\" action=\"lesson.php\">";
-                echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\">";
-                echo "<input type=\"hidden\" name=\"action\" value=\"continue\">";
-                echo "<input type=\"hidden\" name=\"pageid\" value=\"$pageid\">";
+                echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />";
+                echo "<input type=\"hidden\" name=\"action\" value=\"continue\" />";
+                echo "<input type=\"hidden\" name=\"pageid\" value=\"$pageid\" />";
                 print_simple_box_start("center");
                 echo '<table width="100%">';
                 switch ($page->qtype) {
                     case LESSON_SHORTANSWER :
                     case LESSON_NUMERICAL :
                         echo "<tr><td align=\"center\">".get_string("youranswer", "lesson").
-                            ": <input type=\"text\" name=\"answer\" size=\"50\" maxlength=\"200\">\n";
+                            ": <input type=\"text\" name=\"answer\" size=\"50\" maxlength=\"200\" />\n";
                         echo '</table>';
                         print_simple_box_end();
                         echo "<p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                            get_string("pleaseenteryouranswerinthebox", "lesson")."\"></p>\n";
+                            get_string("pleaseenteryouranswerinthebox", "lesson")."\" /></p>\n";
                         break;
                     case LESSON_TRUEFALSE :
                         shuffle($answers);
                         foreach ($answers as $answer) {
                             echo "<tr><td>";
-                            echo "<input type=\"radio\" name=\"answerid\" value=\"{$answer->id}\">";
+                            echo "<input type=\"radio\" name=\"answerid\" value=\"{$answer->id}\" />";
                             echo "</td><td>";
                             $options->para = false; // no <p></p>
                             echo format_text(trim($answer->answer), FORMAT_MOODLE, $options);
@@ -214,7 +214,7 @@
                         echo '</table>';
                         print_simple_box_end();
                         echo "<p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                            get_string("pleasecheckoneanswer", "lesson")."\"></p>\n";
+                            get_string("pleasecheckoneanswer", "lesson")."\" /></p>\n";
                         break;
                     case LESSON_MULTICHOICE :
                         $i = 0;
@@ -223,10 +223,10 @@
                             echo "<tr><td>";
                             if ($page->qoption) {
                                 // more than one answer allowed
-                                echo "<input type=\"checkbox\" name=\"answer[$i]\" value=\"{$answer->id}\">";
+                                echo "<input type=\"checkbox\" name=\"answer[$i]\" value=\"{$answer->id}\" />";
                             } else {
                                 // only one answer allowed
-                                echo "<input type=\"radio\" name=\"answerid\" value=\"{$answer->id}\">";
+                                echo "<input type=\"radio\" name=\"answerid\" value=\"{$answer->id}\" />";
                             }
                             echo "</td><td>";
                             $options->para = false; // no <p></p>
@@ -238,10 +238,10 @@
                         print_simple_box_end();
                         if ($page->qoption) {
                             echo "<p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                                get_string("pleasecheckoneormoreanswers", "lesson")."\"></p>\n";
+                                get_string("pleasecheckoneormoreanswers", "lesson")."\" /></p>\n";
                         } else {
                             echo "<p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                                get_string("pleasecheckoneanswer", "lesson")."\"></p>\n";
+                                get_string("pleasecheckoneanswer", "lesson")."\" /></p>\n";
                         }
                         break;
 
@@ -267,17 +267,17 @@
                         echo '</table></table>';
                         print_simple_box_end();
                         echo "<p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                            get_string("pleasematchtheabovepairs", "lesson")."\"></p>\n";
+                            get_string("pleasematchtheabovepairs", "lesson")."\" /></p>\n";
                         break;
 
                     case LESSON_BRANCHTABLE :
                         echo "<tr><td><table width=\"100%\">";
-                        echo "<input type=\"hidden\" name=\"jumpto\">";
+                        echo "<input type=\"hidden\" name=\"jumpto\" />";
                         // don't suffle answers
                         foreach ($answers as $answer) {
                             echo "<tr><td align=\"center\">";
                             echo "<input type=\"button\" value=\"$answer->answer\"";
-                            echo "onclick=\"document.answerform.jumpto.value=$answer->jumpto;document.answerform.submit();\">";
+                            echo "onclick=\"document.answerform.jumpto.value=$answer->jumpto;document.answerform.submit();\" />";
                             echo "</td></tr>";
                         }
                         echo '</table></table>';
@@ -289,8 +289,8 @@
             } else {
                 // a page without answers - find the next (logical) page
                 echo "<form name=\"pageform\" method =\"post\" action=\"view.php\">\n";
-                echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\">\n";
-                echo "<input type=\"hidden\" name=\"action\" value=\"navigation\">\n";
+                echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n";
+                echo "<input type=\"hidden\" name=\"action\" value=\"navigation\" />\n";
                 if ($lesson->nextpagedefault) {
                     // in Flash Card mode...
                     // ...first get number of retakes
@@ -335,9 +335,9 @@
                         $newpageid = LESSON_EOL;
                     }
                 }
-                echo "<input type=\"hidden\" name=\"pageid\" value=\"$newpageid\">\n";
+                echo "<input type=\"hidden\" name=\"pageid\" value=\"$newpageid\" />\n";
                 echo "<p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                    get_string("continue", "lesson")."\"></p>\n";
+                    get_string("continue", "lesson")."\" /></p>\n";
                 echo "</form>\n";
             }
             echo "</table>\n";
@@ -421,14 +421,14 @@
             // if there are no pages give teacher a blank proforma
             ?>
             <form name="form" method="post" action="lesson.php">
-            <input type="hidden" name="id" value="<?PHP echo $cm->id ?>">
-            <input type="hidden" name="action" value="insertpage">
-            <input type="hidden" name="pageid" value="0">
+            <input type="hidden" name="id" value="<?PHP echo $cm->id ?>" />
+            <input type="hidden" name="action" value="insertpage" />
+            <input type="hidden" name="pageid" value="0" />
             <center><table cellpadding=5 border=1>
             <tr><td align="center">
             <tr valign="top">
             <td><p><b><?php print_string("pagetitle", "lesson"); ?>:</b></p></td></tr>
-            <tr><td><input type="text" name="title" size="80" maxsize="255" value=""></td></tr>
+            <tr><td><input type="text" name="title" size="80" maxsize="255" value="" /></td></tr>
             <?PHP
             echo "<tr><td><b>";
             echo get_string("pagecontents", "lesson").":</b><br />\n";
@@ -438,7 +438,7 @@
             choose_from_menu($LESSON_QUESTION_TYPE, "qtype", LESSON_MULTICHOICE, "");
             helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson");
             echo "<br /><b>".get_string("questionoption", "lesson").":</b>\n";
-            echo " <input type=\"checkbox\" name=\"qoption\" value=\"1\"/>";
+            echo " <input type=\"checkbox\" name=\"qoption\" value=\"1\" />";
             helpbutton("questionoption", get_string("questionoption", "lesson"), "lesson");
             echo "</td></tr>\n";
             for ($i = 0; $i < $lesson->maxanswers; $i++) {
@@ -451,17 +451,17 @@
                 echo "</td></tr>\n";
                 if ($i) {
                     // answers 2,3,4... jump to this page
-                    echo "<input type=\"hidden\" name=\"jumpto[$i]\" value =\"0\">\n";
+                    echo "<input type=\"hidden\" name=\"jumpto[$i]\" value =\"0\" />\n";
                 } else {
                     // answer 1 jumps to next page
-                    echo "<input type=\"hidden\" name=\"jumpto[$i]\" value =\"".LESSON_NEXTPAGE."\">\n";
+                    echo "<input type=\"hidden\" name=\"jumpto[$i]\" value =\"".LESSON_NEXTPAGE."\" />\n";
                 }
             }
             // close table and form
             ?>
             </table><br />
-            <input type="submit" value="<?php  print_string("savepage", "lesson") ?>">
-            <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>">
+            <input type="submit" value="<?php  print_string("savepage", "lesson") ?>" />
+            <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
             </center>
             </form>
             <?PHP
@@ -473,8 +473,8 @@
             // print the pages
             echo "<form name=\"lessonpages\" method=\"post\" action=\"view.php\">\n";
             echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\">\n";
-            echo "<input type=\"hidden\" name=\"action\" value=\"navigation\">\n";
-            echo "<input type=\"hidden\" name=\"pageid\">\n";
+            echo "<input type=\"hidden\" name=\"action\" value=\"navigation\" />\n";
+            echo "<input type=\"hidden\" name=\"pageid\" />\n";
             echo "<center><table cellpadding=\"5\" border=\"0\" width=\"80%\">\n";
             if (isteacheredit($course->id)) {
                 echo "<tr><td align=\"right\"><small><a href=\"import.php?id=$cm->id&pageid=0\">".
@@ -593,7 +593,7 @@
                             echo get_string("checkquestion", "lesson");
                         }
                         echo "\" onclick=\"document.lessonpages.pageid.value=$page->id;".
-                            "document.lessonpages.submit();\">";
+                            "document.lessonpages.submit();\" />";
                     }
                     echo "&nbsp;</td></tr>\n";
                 }
diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
index 201c5a05f2..f2b649708e 100644
--- a/mod/quiz/attempt.php
+++ b/mod/quiz/attempt.php
@@ -92,8 +92,8 @@
             echo "<div align=\"center\">\n";
             print_string("requirepasswordmessage", "quiz");
             echo "<br /><br />\n";
-            echo " <input name=\"quizpassword\" type=\"password\" value=\"\">";
-            echo " <input type=\"submit\" value=\"".get_string("ok")."\">\n";
+            echo " <input name=\"quizpassword\" type=\"password\" value=\"\" />";
+            echo " <input type=\"submit\" value=\"".get_string("ok")."\" />\n";
             echo "</div>\n";
 
             print_simple_box_end();
diff --git a/mod/quiz/backuplib.php b/mod/quiz/backuplib.php
index 46e7bc1b70..4ee952bb5d 100644
--- a/mod/quiz/backuplib.php
+++ b/mod/quiz/backuplib.php
@@ -188,7 +188,7 @@
                 if ($counter % 10 == 0) {
                     echo ".";            
                     if ($counter % 200 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
diff --git a/mod/quiz/category.php b/mod/quiz/category.php
index 119952c931..9dc2102594 100644
--- a/mod/quiz/category.php
+++ b/mod/quiz/category.php
@@ -66,11 +66,11 @@
                 $categories = quiz_get_category_menu($course->id);
                 unset($categories[$category->id]);
                 echo "<CENTER><P><FORM ACTION=category.php METHOD=get>";
-                echo "<INPUT TYPE=hidden NAME=id VALUE=\"$course->id\">";
-                echo "<INPUT TYPE=hidden NAME=delete VALUE=\"$category->id\">";
+                echo "<INPUT TYPE=hidden NAME=id VALUE=\"$course->id\" />";
+                echo "<INPUT TYPE=hidden NAME=delete VALUE=\"$category->id\" />";
                 choose_from_menu($categories, "confirm", "", "");
-                echo "<INPUT TYPE=submit VALUE=\"".get_string("categorymoveto", "quiz")."\">";
-                echo "<INPUT TYPE=submit NAME=cancel VALUE=\"$strcancel\">";
+                echo "<INPUT TYPE=submit VALUE=\"".get_string("categorymoveto", "quiz")."\" />";
+                echo "<INPUT TYPE=submit NAME=cancel VALUE=\"$strcancel\" />";
                 echo "</FORM></P></CENTER>";
                 print_footer($course);
                 exit;
@@ -159,21 +159,21 @@
         } else {
             $delete = "<A HREF=\"category.php?id=$course->id&delete=$category->id\">$strdelete</A>";
         }
-        $table->data[] = array ("<INPUT TYPE=text NAME=\"c$category->id\" VALUE=\"$category->name\" SIZE=15>",
-                                "<INPUT TYPE=text NAME=\"i$category->id\" VALUE=\"$category->info\" SIZE=50>",
+        $table->data[] = array ("<INPUT TYPE=text NAME=\"c$category->id\" VALUE=\"$category->name\" SIZE=15 />",
+                                "<INPUT TYPE=text NAME=\"i$category->id\" VALUE=\"$category->info\" SIZE=50 />",
                                 choose_from_menu ($publishoptions, "p$category->id", "$category->publish", "", "", "", true),
                                 "$count", 
                                 $delete);
     }
-    $table->data[] = array ("<INPUT TYPE=text NAME=\"new\" VALUE=\"\" SIZE=15>", 
-                            "<INPUT TYPE=text NAME=\"newinfo\" VALUE=\"\" SIZE=50>", 
+    $table->data[] = array ("<INPUT TYPE=text NAME=\"new\" VALUE=\"\" SIZE=15 />", 
+                            "<INPUT TYPE=text NAME=\"newinfo\" VALUE=\"\" SIZE=50 />", 
                             choose_from_menu ($publishoptions, "newpublish", "", "", "", "", true),
                             "", 
                             "$stradd");
     print_table($table);
-    echo "<INPUT TYPE=hidden NAME=id VALUE=\"$course->id\">";
-    echo "<CENTER><BR><INPUT TYPE=submit VALUE=\"$strsavechanges\"> ";
-    echo "<BR><BR><INPUT TYPE=submit NAME=backtoquiz VALUE=\"$strbacktoquiz\"> ";
+    echo "<INPUT TYPE=hidden NAME=id VALUE=\"$course->id\" />";
+    echo "<CENTER><BR><INPUT TYPE=submit VALUE=\"$strsavechanges\" /> ";
+    echo "<BR><BR><INPUT TYPE=submit NAME=backtoquiz VALUE=\"$strbacktoquiz\" /> ";
     echo "</CENTER>";
     echo "</FORM>";
 
diff --git a/mod/quiz/db/mysql.php b/mod/quiz/db/mysql.php
index 04853452e5..1f64cc8089 100644
--- a/mod/quiz/db/mysql.php
+++ b/mod/quiz/db/mysql.php
@@ -171,7 +171,7 @@ function quiz_upgrade($oldversion) {
                 $questions = get_records("quiz_questions","stamp",$duplicate->id);
                 $add = 1;
                 foreach ($questions as $question) {
-                    echo "Changing question id $question->id stamp to ".$duplicate->id.$add."<br>";
+                    echo "Changing question id $question->id stamp to ".$duplicate->id.$add."<br />";
                     set_field("quiz_questions","stamp",$duplicate->id.$add,"id",$question->id);
                     $add++;
                 }
diff --git a/mod/quiz/db/postgres7.php b/mod/quiz/db/postgres7.php
index 1cccf954db..281fe53917 100644
--- a/mod/quiz/db/postgres7.php
+++ b/mod/quiz/db/postgres7.php
@@ -126,7 +126,7 @@ function quiz_upgrade($oldversion) {
                 $questions = get_records("quiz_questions","stamp",$duplicate->id);
                 $add = 1;
                 foreach ($questions as $question) {
-                    echo "Changing question id $question->id stamp to ".$duplicate->id.$add."<br>";
+                    echo "Changing question id $question->id stamp to ".$duplicate->id.$add."<br />";
                     set_field("quiz_questions","stamp",$duplicate->id.$add,"id",$question->id);
                     $add++;
                 }
diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index a52da9bb40..0291d3bc96 100644
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -203,9 +203,9 @@
 
         ?>
         <form  name="theform" method="post" action=<?php echo $modform->destination ?>>
-        <input type="hidden" name="course"  value="<?php  p($modform->course) ?>">
-        <input type="submit" value="<?php  print_string("savequiz", "quiz") ?>">
-        <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>">
+        <input type="hidden" name="course"  value="<?php  p($modform->course) ?>" />
+        <input type="submit" value="<?php  print_string("savequiz", "quiz") ?>" />
+        <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
         </form>
         </center>
         <?php
diff --git a/mod/quiz/export.php b/mod/quiz/export.php
index ac57cb21d7..1ec3c52711 100644
--- a/mod/quiz/export.php
+++ b/mod/quiz/export.php
@@ -107,12 +107,12 @@
     echo "<tr><td align=\"right\">";
     print_string("exportname", "quiz" );
     echo ":</td><td>";
-    echo "<input type=\"text\" size=\"40\" name=\"exportfilename\" value=\"$exportfilename\">";
+    echo "<input type=\"text\" size=\"40\" name=\"exportfilename\" value=\"$exportfilename\" />";
     echo "</td></tr>";
 
     echo "<tr><td align=\"center\" colspan=\"2\">";
-    echo " <input type=hidden name=category value=\"$category->id\">";
-    echo " <input type=submit name=save value=\"".get_string("exportquestions","quiz")."\">";
+    echo " <input type=hidden name=category value=\"$category->id\" />";
+    echo " <input type=submit name=save value=\"".get_string("exportquestions","quiz")."\" />";
     echo "</td></tr>";
 
     echo "</table>";
diff --git a/mod/quiz/format.php b/mod/quiz/format.php
index 5ab1d4e560..a0bba390f7 100644
--- a/mod/quiz/format.php
+++ b/mod/quiz/format.php
@@ -45,7 +45,7 @@ class quiz_default_format {
         foreach ($questions as $question) {   // Process and store each question
             $count++;
 
-            echo "<hr><p><b>$count</b>. ".stripslashes($question->questiontext)."</p>";
+            echo "<hr /><p><b>$count</b>. ".stripslashes($question->questiontext)."</p>";
 
             $question->category = $this->category->id;
             $question->stamp = make_unique_id_code();  // Set the unique code (not to be changed)
@@ -201,7 +201,7 @@ class quiz_default_format {
         // iterate through questions
         foreach($questions as $question) {
           $count++;
-          echo "<hr><p><b>$count</b>. ".stripslashes($question->questiontext)."</p>";
+          echo "<hr /><p><b>$count</b>. ".stripslashes($question->questiontext)."</p>";
           $expout .= $this->writequestion( $question ) . "\n";
           }
 
diff --git a/mod/quiz/format/aiken/format.php b/mod/quiz/format/aiken/format.php
index 4c888d44b2..52613d1440 100644
--- a/mod/quiz/format/aiken/format.php
+++ b/mod/quiz/format/aiken/format.php
@@ -48,7 +48,7 @@ class quiz_file_format extends quiz_default_format {
                     continue;
                 }
                 //                This will show everyline when file is being processed
-                //                print("$nowline<br>");
+                //                print("$nowline<br />");
                 $leader = substr(ltrim($nowline),0,2);
                 if (strpos(".A)B)C)D)E)F)G)H)I)J)A.B.C.D.E.F.G.H.I.J.",$leader)>0){
                     //trim off the label and space
diff --git a/mod/quiz/format/coursetestmanager/format.php b/mod/quiz/format/coursetestmanager/format.php
index 4ba52ef9e7..d1593128ec 100755
--- a/mod/quiz/format/coursetestmanager/format.php
+++ b/mod/quiz/format/coursetestmanager/format.php
@@ -55,21 +55,21 @@ class quiz_file_format {
 
         echo "<tr><td align=right>";
 		    echo "What is the hostname or IP address of the ODBC Socket Server:</td><td>";
-		    echo " <input name=\"hostname\" type=\"text\" size=\"50\" value=\"".stripslashes($hostname_access_error)."\">";
-		    echo " <input name=\"filename\" type=\"hidden\" value=\"".$filename."\">";
-		    echo " <input name=\"category\" type=\"hidden\" value=\"".$category->id."\">";
-		    echo " <input name=\"format\" type=\"hidden\" value=\"".$form->format."\">";
+		    echo " <input name=\"hostname\" type=\"text\" size=\"50\" value=\"".stripslashes($hostname_access_error)."\" />";
+		    echo " <input name=\"filename\" type=\"hidden\" value=\"".$filename."\" />";
+		    echo " <input name=\"category\" type=\"hidden\" value=\"".$category->id."\" />";
+		    echo " <input name=\"format\" type=\"hidden\" value=\"".$form->format."\" />";
 		    echo "</td><td>&nbsp;</td></tr>";
         echo "<tr><td align=right>";
 		    echo "What is the location of the database (.mdb file) on the Socket Server:</td><td>";
-		    echo " <input name=\"mdbpath\" type=\"text\" size=\"50\" value=\"".stripslashes($mdbpath)."\">";
+		    echo " <input name=\"mdbpath\" type=\"text\" size=\"50\" value=\"".stripslashes($mdbpath)."\" />";
 				echo "</td><td>&nbsp;</td></tr>";
         echo "<tr><td align=right>";
 		    echo "What is the location of the system database (System.mda file) on the Socket Server:</td><td>";
-		    echo " <input name=\"mdapath\" type=\"text\" size=\"50\" value=\"".stripslashes($mdapath)."\">";
+		    echo " <input name=\"mdapath\" type=\"text\" size=\"50\" value=\"".stripslashes($mdapath)."\" />";
 				echo "</td><td>&nbsp;</td></tr>";
 		    echo "<tr><td>&nbsp;</td><td>";
-		    echo " <input type=submit name=save value=\"Connect to Server\">";
+		    echo " <input type=submit name=save value=\"Connect to Server\" />";
 		    echo "</td></tr>";
 		    echo "</table>";
 		    echo "</form>";
@@ -117,17 +117,17 @@ class quiz_file_format {
 		    echo "Choose a category of questions to import:</td><td>";
 		    asort($question_categories);
 		    choose_from_menu($question_categories, "question_category","All Categories","All Categories", "", "allcategories");
-		    echo " <input name=\"filename\" type=\"hidden\" value=\"".$filename."\">";
-		    echo " <input name=\"category\" type=\"hidden\" value=\"".$category->id."\">";
-		    echo " <input name=\"format\" type=\"hidden\" value=\"".$form->format."\">";
+		    echo " <input name=\"filename\" type=\"hidden\" value=\"".$filename."\" />";
+		    echo " <input name=\"category\" type=\"hidden\" value=\"".$category->id."\" />";
+		    echo " <input name=\"format\" type=\"hidden\" value=\"".$form->format."\" />";
 		    if (PHP_OS == "Linux") {
-			    echo " <input name=\"hostname\" type=\"hidden\" value=\"".stripslashes(trim($hostname))."\">";
-			    echo " <input name=\"mdbpath\" type=\"hidden\" value=\"".stripslashes($mdbpath)."\">";
-			    echo " <input name=\"mdapath\" type=\"hidden\" value=\"".stripslashes($mdapath)."\">";
+			    echo " <input name=\"hostname\" type=\"hidden\" value=\"".stripslashes(trim($hostname))."\" />";
+			    echo " <input name=\"mdbpath\" type=\"hidden\" value=\"".stripslashes($mdbpath)."\" />";
+			    echo " <input name=\"mdapath\" type=\"hidden\" value=\"".stripslashes($mdapath)."\" />";
 		    }
 		    echo "</td><td>&nbsp;</td>";
 		    echo "</tr><tr><td>&nbsp;</td><td>";
-		    echo " <input type=submit name=save value=\"Import Questions\">";
+		    echo " <input type=submit name=save value=\"Import Questions\" />";
 		    echo "</td></tr>";
 		    echo "</table>";
 		    echo "</form>";
@@ -173,7 +173,7 @@ class quiz_file_format {
 		//			echo "<pre>";echo htmlspecialchars($qrec[2]); echo "</pre>";
       				$question->questiontext = addslashes(trim($qrec[2]));
 		//			echo "<pre>";echo $question->questiontext; echo "</pre>";
- 			        $question->name = preg_replace("/<br>/", "", $question->questiontext);
+ 			        $question->name = preg_replace("/<br />/", "", $question->questiontext);
          			$question->single = 1;	// Only one answer is allowed -- used for multiple choicers
 							$fractionset = 0;
 							for ($i=4;$i<=7;$i++) {
@@ -193,7 +193,7 @@ class quiz_file_format {
 						case 2:  // TRUE FALSE
 			        $question->qtype = TRUEFALSE; 
       				$question->questiontext = addslashes(trim($qrec[2]));
-			        $question->name = preg_replace("/<br>/", "", $question->questiontext);
+			        $question->name = preg_replace("/<br />/", "", $question->questiontext);
 							// for TF, $question->answer should be 1 for true, 0 for false
  			        if ($qrec[8] == "T") { $question->answer =1;} else { $question->answer = 0; }
 				      // for TF, use $question->feedbacktrue and feedbackfalse
@@ -204,7 +204,7 @@ class quiz_file_format {
 			        $question->qtype = SHORTANSWER;
       				$question->questiontext = addslashes(trim($qrec[2]));
 		//			echo "<pre>";echo $question->questiontext; echo "</pre>";
- 			        $question->name = preg_replace("/<br>/", "", $question->questiontext);
+ 			        $question->name = preg_replace("/<br />/", "", $question->questiontext);
 	          		$question->usecase=0;  // Ignore case -- for SHORT ANSWER questions
 							$answers = explode("~", $qrec[8]);
 							$question->answer[0]=" ";
@@ -234,7 +234,7 @@ class quiz_file_format {
 				}
 				foreach ($questions as $question) {   // Process and store each question
           $count++;
-          echo "<hr><p><b>$count</b>. ".stripslashes($question->questiontext)."</p>";
+          echo "<hr /><p><b>$count</b>. ".stripslashes($question->questiontext)."</p>";
           $question->category = $this->category->id;
           $question->stamp = make_unique_id_code();  // Set the unique code (not to be changed)
           $question->version = 1;                    // Original version of this question
@@ -360,7 +360,7 @@ class quiz_file_format {
         } else  { 
 //        	echo("Successful XML parse.  ");
         	// prepare the array for use in the pull-down
-/*        	echo "<br>count of rows is ". count ($result);
+/*        	echo "<br />count of rows is ". count ($result);
 					echo "<pre>\n";
 					$qResult = HtmlSpecialChars($qResult);
 					echo $qResult;
diff --git a/mod/quiz/import.php b/mod/quiz/import.php
index 0148c61192..727c24656a 100644
--- a/mod/quiz/import.php
+++ b/mod/quiz/import.php
@@ -73,7 +73,7 @@
                       "$CFG->wwwroot/mod/quiz/import.php?category=$category->id");
             }
 
-            echo "<hr>";
+            echo "<hr />";
             print_continue("edit.php");
             print_footer($course);
             exit;
@@ -121,10 +121,10 @@
     echo "<tr><td align=right>";
     print_string("upload");
     echo ":</td><td>";
-    echo " <input name=\"newfile\" type=\"file\" size=\"50\">";
+    echo " <input name=\"newfile\" type=\"file\" size=\"50\" />";
     echo "</tr><tr><td>&nbsp;</td><td>";
-    echo " <input type=hidden name=category value=\"$category->id\">";
-    echo " <input type=submit name=save value=\"".get_string("uploadthisfile")."\">";
+    echo " <input type=hidden name=category value=\"$category->id\" />";
+    echo " <input type=submit name=save value=\"".get_string("uploadthisfile")."\" />";
     echo "</td></tr>";
 
     echo "</table>";
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 16126a3325..932a066f84 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -1811,7 +1811,7 @@ function quiz_print_recent_mod_activity($activity, $course, $detail=false) {
              . $activity->instance . "&attempt="
              . $activity->content->attemptid . "\">" . $grades . "</a> ";
 
-        echo  get_string("attempt", "quiz") . " - " . $activity->content->attempt . "<br>";
+        echo  get_string("attempt", "quiz") . " - " . $activity->content->attempt . "<br />";
     }
     echo "<a href=\"$CFG->wwwroot/user/view.php?id="
          . $activity->user->userid . "&course=$course\">"
diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html
index 4967c2443b..a4dfc748ca 100644
--- a/mod/quiz/mod.html
+++ b/mod/quiz/mod.html
@@ -65,7 +65,7 @@
 <tr valign=top>
     <td align=right><p><b><?php print_string("name") ?>:</b></p></td>
     <td>
-        <input type="text" name="name" size=40 value="<?php p($form->name) ?>">
+        <input type="text" name="name" size=40 value="<?php p($form->name) ?>" />
     </td>
 </tr>
 <tr valign=top>
@@ -249,29 +249,29 @@
 <tr valign=top>
     <td align=right><p><b><?php print_string("requirepassword", "quiz") ?>:</b></p></td>
     <td>
-        <input type="text" name="password" size=40 value="<?php p($form->password) ?>">
+        <input type="text" name="password" size=40 value="<?php p($form->password) ?>" />
         <?php helpbutton("requirepassword", get_string("requirepassword", "quiz"), "quiz"); ?>
     </td>
 </tr>
 <tr valign=top>
     <td align=right><p><b><?php print_string("requiresubnet", "quiz") ?>:</b></p></td>
     <td>
-        <input type="text" name="subnet" size=40 value="<?php p($form->subnet) ?>">
+        <input type="text" name="subnet" size=40 value="<?php p($form->subnet) ?>" />
         <?php helpbutton("requiresubnet", get_string("requiresubnet", "quiz"), "quiz"); ?>
     </td>
 </tr>
     
 </table>
-<input type="hidden" name=questions     value="<?php p($form->questions) ?>">
+<input type="hidden" name=questions     value="<?php p($form->questions) ?>" />
 <!-- these hidden variables are always the same -->
-<input type="hidden" name=course        value="<?php p($form->course) ?>">
-<input type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>">
-<input type="hidden" name=section       value="<?php p($form->section) ?>">
-<input type="hidden" name=module        value="<?php p($form->module) ?>">
-<input type="hidden" name=modulename    value="<?php p($form->modulename) ?>">
-<input type="hidden" name=instance      value="<?php p($form->instance) ?>">
-<input type="hidden" name=mode          value="<?php p($form->mode) ?>">
-<input type="hidden" name=destination   value="<?php echo "$CFG->wwwroot/course/mod.php" ?>">
-<input type="submit" value="<?php print_string("continue") ?>">
+<input type="hidden" name=course        value="<?php p($form->course) ?>" />
+<input type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>" />
+<input type="hidden" name=section       value="<?php p($form->section) ?>" />
+<input type="hidden" name=module        value="<?php p($form->module) ?>" />
+<input type="hidden" name=modulename    value="<?php p($form->modulename) ?>" />
+<input type="hidden" name=instance      value="<?php p($form->instance) ?>" />
+<input type="hidden" name=mode          value="<?php p($form->mode) ?>" />
+<input type="hidden" name=destination   value="<?php echo "$CFG->wwwroot/course/mod.php" ?>" />
+<input type="submit" value="<?php print_string("continue") ?>" />
 </center>
 </form>
diff --git a/mod/quiz/multiple.php b/mod/quiz/multiple.php
index eb93ac7648..cf56739e29 100644
--- a/mod/quiz/multiple.php
+++ b/mod/quiz/multiple.php
@@ -150,8 +150,8 @@
     echo "</TR>";
 
     echo "<TR><TD>&nbsp;</TD><TD>";
-    echo " <INPUT TYPE=hidden NAME=category VALUE=\"$category->id\">";
-    echo " <INPUT TYPE=submit NAME=save VALUE=\"$strcreatemultiple\">";
+    echo " <INPUT TYPE=hidden NAME=category VALUE=\"$category->id\" />";
+    echo " <INPUT TYPE=submit NAME=save VALUE=\"$strcreatemultiple\" />";
     echo "</TD></TR>";
     echo "</TABLE>";
     echo "</FORM>";
diff --git a/mod/quiz/preview.php b/mod/quiz/preview.php
index 63cb916e32..ff8daff0c1 100644
--- a/mod/quiz/preview.php
+++ b/mod/quiz/preview.php
@@ -61,7 +61,7 @@
     print_header();
     print_heading(get_string("previewquestion","quiz"));
 
-    echo "<p align='center'><input type=\"button\" onClick=\"window.close()\" value=\"" . get_string("close", "quiz") . "\"></p>";
+    echo "<p align='center'><input type=\"button\" onClick=\"window.close()\" value=\"" . get_string("close", "quiz") . "\" /></p>";
 
     if (empty($question->id)) {
         $question->id = "";
@@ -141,7 +141,7 @@
 
       echo "<br />";
       echo "<center>";
-      echo "<input name=\"submit\" type=\"submit\" value=\"".get_string("checkanswer", "quiz")."\"/>\n";
+      echo "<input name=\"submit\" type=\"submit\" value=\"".get_string("checkanswer", "quiz")."\" />\n";
       echo "</center>";
       echo "</form>";
     }
diff --git a/mod/quiz/questiontypes/calculated/calculated.html b/mod/quiz/questiontypes/calculated/calculated.html
index e454bf00be..3bed2f9e75 100644
--- a/mod/quiz/questiontypes/calculated/calculated.html
+++ b/mod/quiz/questiontypes/calculated/calculated.html
@@ -1,6 +1,6 @@
 <FORM name="theform" method="post" action="question.php">
 <CENTER>
-<INPUT type="hidden" name="nextwizardpage" value="<?php p($nextwizardpage)?>"/>
+<INPUT type="hidden" name="nextwizardpage" value="<?php p($nextwizardpage)?>" />
 <?php foreach ($calculatedmessages as $message) {formerr("$message<br/>");} ?>
 <TABLE cellpadding=5>
 <TR valign=top>
@@ -12,7 +12,7 @@
 <TR valign=top>
     <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
     <TD>
-        <INPUT type="text" name="name" size=50 value="<?php  p($question->name) ?>">
+        <INPUT type="text" name="name" size=50 value="<?php  p($question->name) ?>" />
         <?php  if (isset($err["name"])) formerr($err["name"]); ?>
     </TD>
 </TR>
@@ -40,7 +40,7 @@
            print_textarea($usehtmleditor, 20, 60, 630, 300, "questiontext", $question->questiontext);
 
            if ($usehtmleditor) {   /// Trying this out for a while
-               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'">';
+               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'" />';
            } else {
                echo "<div align=right>";
                print_string("formattexttype");
@@ -70,8 +70,8 @@
 <TR valign=top>
 <TD align=right><P><B><?php  print_string("correctanswerformula", "quiz") ?>:</B></P></TD>
     <TD>
-    <INPUT align="LEFT" type="text" id="formula0" name="answer[]" size="20" value="<?php  p($answers[0]->answer) ?>"/>&nbsp;&nbsp;
-    <INPUT type="hidden" name="fraction[]" value="1.0"/>
+    <INPUT align="LEFT" type="text" id="formula0" name="answer[]" size="20" value="<?php  p($answers[0]->answer) ?>" />&nbsp;&nbsp;
+    <INPUT type="hidden" name="fraction[]" value="1.0" />
     </TD>
 </TR>
 <TR valign=top>
@@ -107,9 +107,9 @@
 <TR valign=top>
 <TD align=right><P><B><?php  print_string("unit", "quiz") ?>:</B></P></TD>
     <TD>
-        <P><INPUT type="HIDDEN" name="multiplier[]" value="1.0"/>
+        <P><INPUT type="HIDDEN" name="multiplier[]" value="1.0" />
         <INPUT align="LEFT" type="text" id="defaultunit" name="unit[]"
-                size="5" value="<?php  p($units[0]->unit) ?>"/>
+                size="5" value="<?php  p($units[0]->unit) ?>" />
         <B>(<?php  print_string("optional", "quiz") ?>)</B></P>
     </TD>
 </TR>
@@ -128,11 +128,11 @@ for ($i=1; $i<count($units); $i++) {
         <P><B><?php  print_string("multiplier", "quiz") ?>:</B>
         <INPUT type="text" id="<?php  p("multiplier$i") ?>" size="10"
                 align="RIGHT" name="multiplier[]"
-                value="<?php  p($unit->multiplier) ?>"/>
+                value="<?php  p($unit->multiplier) ?>" />
         <B>&nbsp;&nbsp;&nbsp;<?php  print_string("unit", "quiz") ?>:</B>
         <INPUT align="LEFT" type="text" id="<?php  p("unit$i") ?>"
                 name="unit[]"
-                size="5" value="<?php  p($unit->unit) ?>"/></P>
+                size="5" value="<?php  p($unit->unit) ?>" /></P>
     </TD>
 </TR>
 <?PHP
@@ -140,9 +140,9 @@ for ($i=1; $i<count($units); $i++) {
 ?>
 </TABLE>
 
-<input type="hidden" name=id value="<?php  p($question->id) ?>">
-<input type="hidden" name=qtype value="<?php  p($question->qtype) ?>">
-<input type="submit" onClick="return determineMinAndMax();"  value="<?php  print_string("savechanges") ?>">
+<input type="hidden" name=id value="<?php  p($question->id) ?>" />
+<input type="hidden" name=qtype value="<?php  p($question->qtype) ?>" />
+<input type="submit" onClick="return determineMinAndMax();"  value="<?php  print_string("savechanges") ?>" />
 </center>
 </form>
 <script language="javascript">
diff --git a/mod/quiz/questiontypes/datasetdependent/abstractqtype.php b/mod/quiz/questiontypes/datasetdependent/abstractqtype.php
index 662b8be8fb..b460239226 100644
--- a/mod/quiz/questiontypes/datasetdependent/abstractqtype.php
+++ b/mod/quiz/questiontypes/datasetdependent/abstractqtype.php
@@ -439,7 +439,7 @@ class quiz_dataset_dependent_questiontype extends quiz_default_questiontype {
 
         // Print hidden field with dataset info
         echo '<input type="hidden" name="' . $nameprefix
-                . '" value="' . $datasetinput . '"/>';
+                . '" value="' . $datasetinput . '" />';
 
         // Forward to the virtual qtype
         unset($question->response[$nameprefix]);
diff --git a/mod/quiz/questiontypes/datasetdependent/categorydatasetdefinitions.php b/mod/quiz/questiontypes/datasetdependent/categorydatasetdefinitions.php
index 08ed9667f3..835275fb0f 100644
--- a/mod/quiz/questiontypes/datasetdependent/categorydatasetdefinitions.php
+++ b/mod/quiz/questiontypes/datasetdependent/categorydatasetdefinitions.php
@@ -69,9 +69,9 @@
 
     print_simple_box_start("center", "", "$THEME->cellheading");
     echo "<form method=\"post\" action=\"categorydatasetdefinitions.php\">";
-    echo "<input type=\"hidden\" name=\"category\" value=\"$category->id\"/>";
+    echo "<input type=\"hidden\" name=\"category\" value=\"$category->id\" />";
     if ($question) {
-        echo "<input type=\"hidden\" name=\"question\" value=\"$question\"/>";
+        echo "<input type=\"hidden\" name=\"question\" value=\"$question\" />";
     }
     
     echo "<table cellpadding=5>";
@@ -89,14 +89,14 @@
         echo "<tr><td align=right>";
         print_string("itemdefinition", "quiz");
         echo ":</td><td>";
-        echo "<input name=\"name[]\" type=\"text\" size=\"20\" value=\"$definition->name\"/>";
-        echo "<input type=\"hidden\" name=\"id[]\" value=\"$definition->id\"/>";
+        echo "<input name=\"name[]\" type=\"text\" size=\"20\" value=\"$definition->name\" />";
+        echo "<input type=\"hidden\" name=\"id[]\" value=\"$definition->id\" />";
         echo " </td><td> ";
         choose_from_menu($DATASET_TYPES, 'type[]', $definition->type, '');
         echo "</td></tr>\n";
     }
 
-    echo "<tr><td align=\"CENTER\" colspan=\"3\"><input type=submit value=\"".get_string("continue")."\"></td></tr>";
+    echo "<tr><td align=\"CENTER\" colspan=\"3\"><input type=submit value=\"".get_string("continue")."\" /></td></tr>";
     echo "</table>";
     echo "</form>";
     print_simple_box_end();
diff --git a/mod/quiz/questiontypes/datasetdependent/questiondatasets.html b/mod/quiz/questiontypes/datasetdependent/questiondatasets.html
index df30a54570..df269be04a 100644
--- a/mod/quiz/questiontypes/datasetdependent/questiondatasets.html
+++ b/mod/quiz/questiontypes/datasetdependent/questiondatasets.html
@@ -29,30 +29,30 @@
     <TD/>
     <TD/>
     <TD>
-        <INPUT type="hidden" name="name"               value="<?php  p($question->name) ?>"/>
-        <INPUT type="hidden" name="questiontext"       value="<?php  p($question->questiontext) ?>"/>
-        <INPUT type="hidden" name="questiontextformat" value="<?php  p($question->questiontextformat) ?>"/>
-        <INPUT type="hidden" name="image"              value="<?php  p($question->image) ?>"/>
+        <INPUT type="hidden" name="name"               value="<?php  p($question->name) ?>" />
+        <INPUT type="hidden" name="questiontext"       value="<?php  p($question->questiontext) ?>" />
+        <INPUT type="hidden" name="questiontextformat" value="<?php  p($question->questiontextformat) ?>" />
+        <INPUT type="hidden" name="image"              value="<?php  p($question->image) ?>" />
         <?php foreach ($answers as $answer) { ?>
-        <INPUT type="hidden" name="answer[]"              value="<?php  p($answer->answer) ?>"/>
-        <INPUT type="hidden" name="fraction[]"            value="<?php  p($answer->fraction) ?>"/>
-        <INPUT type="hidden" name="feedback[]"            value="<?php  p($answer->feedback) ?>"/>
-        <INPUT type="hidden" name="tolerance[]"           value="<?php  p($answer->tolerance) ?>"/>
-        <INPUT type="hidden" name="tolerancetype[]"       value="<?php  p($answer->tolerancetype) ?>"/>
-        <INPUT type="hidden" name="correctanswerlength[]" value="<?php  p($answer->correctanswerlength) ?>"/>
+        <INPUT type="hidden" name="answer[]"              value="<?php  p($answer->answer) ?>" />
+        <INPUT type="hidden" name="fraction[]"            value="<?php  p($answer->fraction) ?>" />
+        <INPUT type="hidden" name="feedback[]"            value="<?php  p($answer->feedback) ?>" />
+        <INPUT type="hidden" name="tolerance[]"           value="<?php  p($answer->tolerance) ?>" />
+        <INPUT type="hidden" name="tolerancetype[]"       value="<?php  p($answer->tolerancetype) ?>" />
+        <INPUT type="hidden" name="correctanswerlength[]" value="<?php  p($answer->correctanswerlength) ?>" />
         <?php } ?>
         <?php foreach ($units as $unit) { ?>
-        <INPUT type="hidden" name="multiplier[]"   value="<?php  p($unit->multiplier) ?>"/>
-        <INPUT type="hidden" name="unit[]"         value="<?php  p($unit->unit) ?>"/>
+        <INPUT type="hidden" name="multiplier[]"   value="<?php  p($unit->multiplier) ?>" />
+        <INPUT type="hidden" name="unit[]"         value="<?php  p($unit->unit) ?>" />
         <?php } ?>
     </TD>
 </TR>
 </TABLE>
 
-<INPUT type="hidden" name=id value="<?php  p($question->id) ?>">
-<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>">
-<INPUT type="hidden" name="category" value="<?php  p($question->category) ?>"/>
-<INPUT type="submit"      value="<?php  print_string("savechanges") ?>">
+<INPUT type="hidden" name=id value="<?php  p($question->id) ?>" />
+<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>" />
+<INPUT type="hidden" name="category" value="<?php  p($question->category) ?>" />
+<INPUT type="submit"      value="<?php  print_string("savechanges") ?>" />
 </CENTER>
 </FORM>
 
diff --git a/mod/quiz/questiontypes/description/description.html b/mod/quiz/questiontypes/description/description.html
index 2016a142ff..761b606b9f 100644
--- a/mod/quiz/questiontypes/description/description.html
+++ b/mod/quiz/questiontypes/description/description.html
@@ -1,75 +1,150 @@
-<FORM name="theform" method="post" action="question.php">
-<CENTER>
-<TABLE cellpadding=5>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?php   quiz_category_select_menu($course->id, true, true, $question->category); ?>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="name" size=40 value="<?php  p($question->name) ?>">
-        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
-    </TD>
-</TR>
-<tr valign=top>
-    <td align="right"><p><b><?php  print_string("question", "quiz") ?>:</b></p>
-    <br />
-    <br />
-    <br />
-    <p><font SIZE="1">
-    <?php
-           if ($usehtmleditor) {
-               helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
-           } else {
-               helpbutton("text", get_string("helptext"), "moodle", true, true);
-           }
-    ?>
-    </font></p>
-    </td>
-    <td>
-        <?php  if (isset($err["questiontext"])) {
-               formerr($err["questiontext"]); 
-               echo "<br />";
-           }
-
-           print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext);
-
-           if ($usehtmleditor) {
-               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'">';
-           } else {
-               echo "<div align=right>";
-               print_string("formattexttype");
-               echo ":&nbsp;";
-               if (!isset($question->questiontextformat)) {
-                   $question->questiontextformat = FORMAT_MOODLE;
-               }
-               choose_from_menu(format_text_menu(), "questiontextformat", $question->questiontextformat, "");
-               helpbutton("textformat", get_string("helpformatting"));
-               echo "</div>";
-           }
-        ?>
-    </td>
-</tr>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("imagedisplay", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?php   if (empty($images)) {
-            print_string("noimagesyet");
-        } else {
-            choose_from_menu($images, "image", "$question->image", get_string("none"),"","");
-        }
-    ?>
-    </TD>
-</TR>
-</TABLE>
-
-<INPUT type="hidden" name=id value="<?php  p($question->id) ?>">
-<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>">
-<INPUT type="hidden" name=defaultgrade value="0">
-<INPUT type="submit" value="<?php  print_string("savechanges") ?>">
-
-</CENTER>
-</FORM>
+<FORM name="theform" method="post" action="question.php">
+
+<CENTER>
+
+<TABLE cellpadding=5>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?php   quiz_category_select_menu($course->id, true, true, $question->category); ?>
+
+    </TD>
+
+</TR>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+        <INPUT type="text" name="name" size=40 value="<?php  p($question->name) ?>" />
+
+        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
+
+    </TD>
+
+</TR>
+
+<tr valign=top>
+
+    <td align="right"><p><b><?php  print_string("question", "quiz") ?>:</b></p>
+
+    <br />
+
+    <br />
+
+    <br />
+
+    <p><font SIZE="1">
+
+    <?php
+
+           if ($usehtmleditor) {
+
+               helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
+
+           } else {
+
+               helpbutton("text", get_string("helptext"), "moodle", true, true);
+
+           }
+
+    ?>
+
+    </font></p>
+
+    </td>
+
+    <td>
+
+        <?php  if (isset($err["questiontext"])) {
+
+               formerr($err["questiontext"]); 
+
+               echo "<br />";
+
+           }
+
+
+
+           print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext);
+
+
+
+           if ($usehtmleditor) {
+
+               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'" />';
+
+           } else {
+
+               echo "<div align=right>";
+
+               print_string("formattexttype");
+
+               echo ":&nbsp;";
+
+               if (!isset($question->questiontextformat)) {
+
+                   $question->questiontextformat = FORMAT_MOODLE;
+
+               }
+
+               choose_from_menu(format_text_menu(), "questiontextformat", $question->questiontextformat, "");
+
+               helpbutton("textformat", get_string("helpformatting"));
+
+               echo "</div>";
+
+           }
+
+        ?>
+
+    </td>
+
+</tr>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("imagedisplay", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?php   if (empty($images)) {
+
+            print_string("noimagesyet");
+
+        } else {
+
+            choose_from_menu($images, "image", "$question->image", get_string("none"),"","");
+
+        }
+
+    ?>
+
+    </TD>
+
+</TR>
+
+</TABLE>
+
+
+
+<INPUT type="hidden" name=id value="<?php  p($question->id) ?>" />
+
+<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>" />
+
+<INPUT type="hidden" name=defaultgrade value="0" />
+
+<INPUT type="submit" value="<?php  print_string("savechanges") ?>" />
+
+
+
+</CENTER>
+
+</FORM>
+
diff --git a/mod/quiz/questiontypes/match/match.html b/mod/quiz/questiontypes/match/match.html
index 7483951c24..d7ca373c55 100644
--- a/mod/quiz/questiontypes/match/match.html
+++ b/mod/quiz/questiontypes/match/match.html
@@ -1,99 +1,198 @@
-<FORM name="theform" method="post" action="question.php">
-<CENTER>
-<TABLE cellpadding=5>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?php   quiz_category_select_menu($course->id, true, true, $question->category); ?>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="name" size=40 value="<?php  p($question->name) ?>">
-        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
-    </TD>
-</TR>
-<tr valign=top>
-    <td align="right"><p><b><?php  print_string("question", "quiz") ?>:</b></p>
-    <br />
-    <br />
-    <br />
-    <p><font SIZE="1">
-    <?php
-           if ($usehtmleditor) {
-               helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
-           } else {
-               helpbutton("text", get_string("helptext"), "moodle", true, true);
-           }
-    ?>
-    </font></p>
-    </td>
-    <td>
-        <?php  if (isset($err["questiontext"])) {
-               formerr($err["questiontext"]); 
-               echo "<br />";
-           }
-
-           print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext);
-
-           if ($usehtmleditor) { 
-               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'">';
-           } else {
-               echo "<div align=right>";
-               print_string("formattexttype");
-               echo ":&nbsp;";
-               if (!isset($question->questiontextformat)) {
-                   $question->questiontextformat = FORMAT_MOODLE;
-               }
-               choose_from_menu(format_text_menu(), "questiontextformat", $question->questiontextformat, "");
-               helpbutton("textformat", get_string("helpformatting"));
-               echo "</div>";
-           }
-        ?>
-    </td>
-</tr>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("imagedisplay", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?php   if (empty($images)) {
-            print_string("noimagesyet");
-        } else {
-            choose_from_menu($images, "image", "$question->image", get_string("none"),"","");
-        }
-    ?>
-    </TD>
-</TR>
-
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("choices", "quiz") ?></B>:</P></TD>
-    <TD><P><?php  print_string("filloutthreequestions", "quiz") ?></P>
-    </TD>
-</TR>
-
-<?PHP 
-    for ($i=1; $i<=QUIZ_MAX_NUMBER_ANSWERS; $i++) {
-?>
-
-<TR valign=top>
-    <TD align=right><P><B><?php  echo get_string("question", "quiz")." $i";  ?> :</B></P></TD>
-    <TD>
-        <textarea name="subquestions[]" rows=5 cols=50><?php  p($subquestions[$i-1]) ?></textarea>
-        <br />
-        <?php  echo get_string("matchanswer", "quiz")." $i";  ?>&nbsp;&nbsp;
-        <INPUT type="text" name="subanswers[]" size=50 value="<?php  p($subanswers[$i-1]) ?>">
-    </TD>
-</TR>
-
-<?PHP
-    }
-?>
-
-</TABLE>
-
-<INPUT type="hidden" name=id value="<?php  p($question->id) ?>">
-<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>">
-<INPUT type="submit" value="<?php  print_string("savechanges") ?>">
-
-</CENTER>
-</FORM>
+<FORM name="theform" method="post" action="question.php">
+
+<CENTER>
+
+<TABLE cellpadding=5>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?php   quiz_category_select_menu($course->id, true, true, $question->category); ?>
+
+    </TD>
+
+</TR>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+        <INPUT type="text" name="name" size=40 value="<?php  p($question->name) ?>" />
+
+        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
+
+    </TD>
+
+</TR>
+
+<tr valign=top>
+
+    <td align="right"><p><b><?php  print_string("question", "quiz") ?>:</b></p>
+
+    <br />
+
+    <br />
+
+    <br />
+
+    <p><font SIZE="1">
+
+    <?php
+
+           if ($usehtmleditor) {
+
+               helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
+
+           } else {
+
+               helpbutton("text", get_string("helptext"), "moodle", true, true);
+
+           }
+
+    ?>
+
+    </font></p>
+
+    </td>
+
+    <td>
+
+        <?php  if (isset($err["questiontext"])) {
+
+               formerr($err["questiontext"]); 
+
+               echo "<br />";
+
+           }
+
+
+
+           print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext);
+
+
+
+           if ($usehtmleditor) { 
+
+               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'" />';
+
+           } else {
+
+               echo "<div align=right>";
+
+               print_string("formattexttype");
+
+               echo ":&nbsp;";
+
+               if (!isset($question->questiontextformat)) {
+
+                   $question->questiontextformat = FORMAT_MOODLE;
+
+               }
+
+               choose_from_menu(format_text_menu(), "questiontextformat", $question->questiontextformat, "");
+
+               helpbutton("textformat", get_string("helpformatting"));
+
+               echo "</div>";
+
+           }
+
+        ?>
+
+    </td>
+
+</tr>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("imagedisplay", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?php   if (empty($images)) {
+
+            print_string("noimagesyet");
+
+        } else {
+
+            choose_from_menu($images, "image", "$question->image", get_string("none"),"","");
+
+        }
+
+    ?>
+
+    </TD>
+
+</TR>
+
+
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("choices", "quiz") ?></B>:</P></TD>
+
+    <TD><P><?php  print_string("filloutthreequestions", "quiz") ?></P>
+
+    </TD>
+
+</TR>
+
+
+
+<?PHP 
+
+    for ($i=1; $i<=QUIZ_MAX_NUMBER_ANSWERS; $i++) {
+
+?>
+
+
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  echo get_string("question", "quiz")." $i";  ?> :</B></P></TD>
+
+    <TD>
+
+        <textarea name="subquestions[]" rows=5 cols=50><?php  p($subquestions[$i-1]) ?></textarea>
+
+        <br />
+
+        <?php  echo get_string("matchanswer", "quiz")." $i";  ?>&nbsp;&nbsp;
+
+        <INPUT type="text" name="subanswers[]" size=50 value="<?php  p($subanswers[$i-1]) ?>" />
+
+    </TD>
+
+</TR>
+
+
+
+<?PHP
+
+    }
+
+?>
+
+
+
+</TABLE>
+
+
+
+<INPUT type="hidden" name=id value="<?php  p($question->id) ?>" />
+
+<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>" />
+
+<INPUT type="submit" value="<?php  print_string("savechanges") ?>" />
+
+
+
+</CENTER>
+
+</FORM>
+
diff --git a/mod/quiz/questiontypes/multianswer/multianswer.html b/mod/quiz/questiontypes/multianswer/multianswer.html
index b6c348e668..25586f7ef7 100644
--- a/mod/quiz/questiontypes/multianswer/multianswer.html
+++ b/mod/quiz/questiontypes/multianswer/multianswer.html
@@ -22,7 +22,7 @@
 
     <TD>
 
-        <INPUT type="text" name="name" size=40 value="<?php  p($question->name) ?>">
+        <INPUT type="text" name="name" size=40 value="<?php  p($question->name) ?>" />
 
         <?php  if (isset($err["name"])) formerr($err["name"]); ?>
 
@@ -88,13 +88,13 @@
 
 
 
-<INPUT type="hidden" name=id value="<?php  p($question->id) ?>">
+<INPUT type="hidden" name=id value="<?php  p($question->id) ?>" />
 
-<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>">
+<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>" />
 
-<INPUT type="hidden" name=defaultgrade value="<?php  p($question->defaultgrade) ?>">
+<INPUT type="hidden" name=defaultgrade value="<?php  p($question->defaultgrade) ?>" />
 
-<INPUT type="submit" value="<?php  print_string("savechanges") ?>">
+<INPUT type="submit" value="<?php  print_string("savechanges") ?>" />
 
 
 
diff --git a/mod/quiz/questiontypes/multichoice/multichoice.html b/mod/quiz/questiontypes/multichoice/multichoice.html
index de725266d0..a13fbb4b5f 100644
--- a/mod/quiz/questiontypes/multichoice/multichoice.html
+++ b/mod/quiz/questiontypes/multichoice/multichoice.html
@@ -1,124 +1,248 @@
-<FORM name="theform" method="post" action="question.php">
-<CENTER>
-<TABLE cellpadding=5>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?php   quiz_category_select_menu($course->id, true, true, $question->category); ?>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="name" size=40 value="<?php  p($question->name) ?>">
-        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
-    </TD>
-</TR>
-<tr valign=top>
-    <td align="right"><p><b><?php  print_string("question", "quiz") ?>:</b></p>
-    <br />
-    <br />
-    <br />
-    <p><font SIZE="1">
-    <?php
-           if ($usehtmleditor) {
-               helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
-           } else {
-               helpbutton("text", get_string("helptext"), "moodle", true, true);
-           }
-    ?>
-    </font></p>
-    </td>
-    <td>
-        <?php  if (isset($err["questiontext"])) {
-               formerr($err["questiontext"]); 
-               echo "<br />";
-           }
-
-           print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext);
-
-           if ($usehtmleditor) {
-               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'">';
-           } else {
-               echo "<div align=right>";
-               print_string("formattexttype");
-               echo ":&nbsp;";
-               if (!isset($question->questiontextformat)) {
-                   $question->questiontextformat = FORMAT_MOODLE;
-               }
-               choose_from_menu(format_text_menu(), "questiontextformat", $question->questiontextformat, "");
-               helpbutton("textformat", get_string("helpformatting"));
-               echo "</div>";
-           }
-        ?>
-    </td>
-</tr>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("imagedisplay", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?php   if (empty($images)) {
-            print_string("noimagesyet");
-        } else {
-            choose_from_menu($images, "image", "$question->image", get_string("none"),"","");
-        }
-    ?>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("answerhowmany", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?php 
-        $menu[0] = get_string("answersingleno", "quiz");
-        $menu[1] = get_string("answersingleyes", "quiz");
-        choose_from_menu($menu, "single", "$options->single", "");
-        unset($menu);
-     ?>
-    </TD>
-</TR>
-
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("choices", "quiz") ?></B>:</P></TD>
-    <TD><P><?php  print_string("fillouttwochoices", "quiz") ?></P>
-    </TD>
-</TR>
-
-<?PHP 
-    for ($i=1; $i<=QUIZ_MAX_NUMBER_ANSWERS; $i++) {
-       if (!isset($answers[$i-1]->fraction)) {
-           $answers[$i-1]->answer = '';
-           $answers[$i-1]->fraction = 0;
-           $answers[$i-1]->feedback = ''; 
-       }
-?>
-<TR valign=top>
-    <TD align=right><P><B><?php  echo get_string("choice", "quiz")." $i";  ?>:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[$i-1]->answer) ?>">&nbsp;&nbsp;
-        <?php  print_string("grade");
-           echo ":&nbsp;";
-           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[$i-1]->fraction, ""); ?>
-        <BR>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
-    <TD>
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[$i-1]->feedback) ?></textarea>
-    </TD>
-</TR>
-
-<TR valign=top>
-    <TD colspan=2>&nbsp;</TD>
-</TR>
-
-<?php
-    } /// End of loop, printing answers
-?>
-</TABLE>
-
-<INPUT type="hidden" name=id value="<?php  p($question->id) ?>">
-<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>">
-<INPUT type="submit" value="<?php  print_string("savechanges") ?>">
-
-</CENTER>
-</FORM>
+<FORM name="theform" method="post" action="question.php">
+
+<CENTER>
+
+<TABLE cellpadding=5>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?php   quiz_category_select_menu($course->id, true, true, $question->category); ?>
+
+    </TD>
+
+</TR>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+        <INPUT type="text" name="name" size=40 value="<?php  p($question->name) ?>" />
+
+        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
+
+    </TD>
+
+</TR>
+
+<tr valign=top>
+
+    <td align="right"><p><b><?php  print_string("question", "quiz") ?>:</b></p>
+
+    <br />
+
+    <br />
+
+    <br />
+
+    <p><font SIZE="1">
+
+    <?php
+
+           if ($usehtmleditor) {
+
+               helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
+
+           } else {
+
+               helpbutton("text", get_string("helptext"), "moodle", true, true);
+
+           }
+
+    ?>
+
+    </font></p>
+
+    </td>
+
+    <td>
+
+        <?php  if (isset($err["questiontext"])) {
+
+               formerr($err["questiontext"]); 
+
+               echo "<br />";
+
+           }
+
+
+
+           print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext);
+
+
+
+           if ($usehtmleditor) {
+
+               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'" />';
+
+           } else {
+
+               echo "<div align=right>";
+
+               print_string("formattexttype");
+
+               echo ":&nbsp;";
+
+               if (!isset($question->questiontextformat)) {
+
+                   $question->questiontextformat = FORMAT_MOODLE;
+
+               }
+
+               choose_from_menu(format_text_menu(), "questiontextformat", $question->questiontextformat, "");
+
+               helpbutton("textformat", get_string("helpformatting"));
+
+               echo "</div>";
+
+           }
+
+        ?>
+
+    </td>
+
+</tr>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("imagedisplay", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?php   if (empty($images)) {
+
+            print_string("noimagesyet");
+
+        } else {
+
+            choose_from_menu($images, "image", "$question->image", get_string("none"),"","");
+
+        }
+
+    ?>
+
+    </TD>
+
+</TR>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("answerhowmany", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?php 
+
+        $menu[0] = get_string("answersingleno", "quiz");
+
+        $menu[1] = get_string("answersingleyes", "quiz");
+
+        choose_from_menu($menu, "single", "$options->single", "");
+
+        unset($menu);
+
+     ?>
+
+    </TD>
+
+</TR>
+
+
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("choices", "quiz") ?></B>:</P></TD>
+
+    <TD><P><?php  print_string("fillouttwochoices", "quiz") ?></P>
+
+    </TD>
+
+</TR>
+
+
+
+<?PHP 
+
+    for ($i=1; $i<=QUIZ_MAX_NUMBER_ANSWERS; $i++) {
+
+       if (!isset($answers[$i-1]->fraction)) {
+
+           $answers[$i-1]->answer = '';
+
+           $answers[$i-1]->fraction = 0;
+
+           $answers[$i-1]->feedback = ''; 
+
+       }
+
+?>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  echo get_string("choice", "quiz")." $i";  ?>:</B></P></TD>
+
+    <TD>
+
+        <INPUT type="text" name="answer[]" size=50 maxlength=255 value="<?php  p($answers[$i-1]->answer) ?>" />&nbsp;&nbsp;
+
+        <?php  print_string("grade");
+
+           echo ":&nbsp;";
+
+           choose_from_menu($gradeoptionsfull, "fraction[]", $answers[$i-1]->fraction, ""); ?>
+
+        <BR>
+
+    </TD>
+
+</TR>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[$i-1]->feedback) ?></textarea>
+
+    </TD>
+
+</TR>
+
+
+
+<TR valign=top>
+
+    <TD colspan=2>&nbsp;</TD>
+
+</TR>
+
+
+
+<?php
+
+    } /// End of loop, printing answers
+
+?>
+
+</TABLE>
+
+
+
+<INPUT type="hidden" name=id value="<?php  p($question->id) ?>" />
+
+<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>" />
+
+<INPUT type="submit" value="<?php  print_string("savechanges") ?>" />
+
+
+
+</CENTER>
+
+</FORM>
+
diff --git a/mod/quiz/questiontypes/numerical/numerical.html b/mod/quiz/questiontypes/numerical/numerical.html
index f22a15e33c..359fafc4d1 100644
--- a/mod/quiz/questiontypes/numerical/numerical.html
+++ b/mod/quiz/questiontypes/numerical/numerical.html
@@ -10,7 +10,7 @@
 <TR valign=top>
     <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
     <TD>
-        <INPUT type="text" name="name" size=50 value="<?php  p($question->name) ?>">
+        <INPUT type="text" name="name" size=50 value="<?php  p($question->name) ?>" />
         <?php  if (isset($err["name"])) formerr($err["name"]); ?>
     </TD>
 </TR>
@@ -38,7 +38,7 @@
            print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext);
 
            if ($usehtmleditor) {
-               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'">';
+               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'" />';
            } else {
                echo "<div align=right>";
                print_string("formattexttype");
@@ -78,7 +78,7 @@
         }
     ?>
     <TD>
-        <INPUT align="LEFT" type="text" id="correct0" name="answer[]" size="20" value="<?php  p($answers[0]->answer) ?>"/>&nbsp;&nbsp;
+        <INPUT align="LEFT" type="text" id="correct0" name="answer[]" size="20" value="<?php  p($answers[0]->answer) ?>" />&nbsp;&nbsp;
     </TD>
 </TR>
 <TR valign=top>
@@ -86,9 +86,9 @@
     <TD>
         <INPUT align="LEFT" type="text" id="acceptederror0" name="acceptederror[]" size="15" value="<?php  p($acceptederror) ?>" />&plusmn;
         <!-- Values max and min will be determined when the form is submitted -->
-        <INPUT type="HIDDEN" id="min0" name="min[]" value=""/>
-        <INPUT type="HIDDEN" id="max0" name="max[]" value=""/>
-        <INPUT type="HIDDEN" name="fraction[]" value="1"/>
+        <INPUT type="HIDDEN" id="min0" name="min[]" value="" />
+        <INPUT type="HIDDEN" id="max0" name="max[]" value="" />
+        <INPUT type="HIDDEN" name="fraction[]" value="1" />
         <BR/>
     </TD>
 </TR>
@@ -101,9 +101,9 @@
 <TR valign=top>
 <TD align=right><P><B><?php  print_string("unit", "quiz") ?>:</B></P></TD>
     <TD>
-        <P><INPUT type="HIDDEN" name="multiplier[]" value="1.0"/>
+        <P><INPUT type="HIDDEN" name="multiplier[]" value="1.0" />
         <INPUT align="LEFT" type="text" id="defaultunit" name="unit[]"
-                size="5" value="<?php  p($units[0]->unit) ?>"/>
+                size="5" value="<?php  p($units[0]->unit) ?>" />
         <B>(<?php  print_string("optional", "quiz") ?>)</B></P>
     </TD>
 </TR>
@@ -122,11 +122,11 @@ for ($i=1; $i<count($units); $i++) {
         <P><B><?php  print_string("multiplier", "quiz") ?>:</B>
         <INPUT type="text" id="<?php  p("multiplier$i") ?>" size="10"
                 align="RIGHT" name="multiplier[]"
-                value="<?php  p($unit->multiplier) ?>"/>
+                value="<?php  p($unit->multiplier) ?>" />
         <B>&nbsp;&nbsp;&nbsp;<?php  print_string("unit", "quiz") ?>:</B>
         <INPUT align="LEFT" type="text" id="<?php  p("unit$i") ?>"
                 name="unit[]"
-                size="5" value="<?php  p($unit->unit) ?>"/></P>
+                size="5" value="<?php  p($unit->unit) ?>" /></P>
     </TD>
 </TR>
 <?PHP
@@ -134,9 +134,9 @@ for ($i=1; $i<count($units); $i++) {
 ?>
 </TABLE>
 
-<INPUT type="hidden" name=id value="<?php  p($question->id) ?>">
-<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>">
-<INPUT type="submit" onClick="return determineMinAndMax();"  value="<?php  print_string("savechanges") ?>">
+<INPUT type="hidden" name=id value="<?php  p($question->id) ?>" />
+<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>" />
+<INPUT type="submit" onClick="return determineMinAndMax();"  value="<?php  print_string("savechanges") ?>" />
 </CENTER>
 </FORM>
 <SCRIPT language="JAVASCRIPT">
diff --git a/mod/quiz/questiontypes/random/questiontype.php b/mod/quiz/questiontypes/random/questiontype.php
index 6bced4e9b5..f4c5575be0 100644
--- a/mod/quiz/questiontypes/random/questiontype.php
+++ b/mod/quiz/questiontypes/random/questiontype.php
@@ -154,7 +154,7 @@ class quiz_random_qtype extends quiz_default_questiontype {
         if ($actualquestion = $this->get_wrapped_question($question,
                                                           $nameprefix)) {
             echo '<input type="hidden" name="' . $nameprefix
-                    . '" value="' . $actualquestion->id . '"/>';
+                    . '" value="' . $actualquestion->id . '" />';
             return $QUIZ_QTYPES[$actualquestion->qtype]
                     ->print_question_formulation_and_controls($actualquestion,
                     $quiz, $readonly, $answers, $correctanswers,
diff --git a/mod/quiz/questiontypes/random/random.html b/mod/quiz/questiontypes/random/random.html
index b112268b7e..8b9b2e3c08 100644
--- a/mod/quiz/questiontypes/random/random.html
+++ b/mod/quiz/questiontypes/random/random.html
@@ -1,30 +1,60 @@
-<center>
-<form name="theform" method="post" action="question.php">
-
-<table cellpadding=5>
-<tr valign=top>
-    <td align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
-    <td>
-    <?php   quiz_category_select_menu($course->id, true, true, $question->category); ?>
-    </td>
-</tr>
-<tr valign=top>
-    <td align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
-    <td>
-        <?php  if (empty($question->name)) {
-               $question->name = get_string("random", "quiz");
-           } ?>
-        <input type="text" name="name" size=40 value="<?php  p($question->name) ?>">
-        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
-    </td>
-</tr>
-</table>
-
-<input type="hidden" name=questiontext value="---">
-
-<input type="hidden" name=id value="<?php  p($question->id) ?>">
-<input type="hidden" name=qtype value="<?php  p($question->qtype) ?>">
-<input type="submit" value="<?php  print_string("savechanges") ?>">
-</form>
-</center>
-
+<center>
+
+<form name="theform" method="post" action="question.php">
+
+
+
+<table cellpadding=5>
+
+<tr valign=top>
+
+    <td align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
+
+    <td>
+
+    <?php   quiz_category_select_menu($course->id, true, true, $question->category); ?>
+
+    </td>
+
+</tr>
+
+<tr valign=top>
+
+    <td align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
+
+    <td>
+
+        <?php  if (empty($question->name)) {
+
+               $question->name = get_string("random", "quiz");
+
+           } ?>
+
+        <input type="text" name="name" size=40 value="<?php  p($question->name) ?>" />
+
+        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
+
+    </td>
+
+</tr>
+
+</table>
+
+
+
+<input type="hidden" name=questiontext value="---" />
+
+
+
+<input type="hidden" name=id value="<?php  p($question->id) ?>" />
+
+<input type="hidden" name=qtype value="<?php  p($question->qtype) ?>" />
+
+<input type="submit" value="<?php  print_string("savechanges") ?>" />
+
+</form>
+
+</center>
+
+
+
diff --git a/mod/quiz/questiontypes/randomsamatch/randomsamatch.html b/mod/quiz/questiontypes/randomsamatch/randomsamatch.html
index 8601db1ab1..98bc22c76b 100644
--- a/mod/quiz/questiontypes/randomsamatch/randomsamatch.html
+++ b/mod/quiz/questiontypes/randomsamatch/randomsamatch.html
@@ -1,91 +1,182 @@
-<FORM name="theform" method="post" action="question.php">
-<CENTER>
-<TABLE cellpadding=5>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?PHP echo $categories[$question->category]; ?>
-    <input type="hidden" name="category" value="<?PHP echo "$question->category"; ?>">
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
-    <TD>
-        <?PHP
-           if (empty($question->name)) {
-               $question->name =  get_string("randomsamatch", "quiz");
-           }
-        ?>
-        <INPUT type="text" name="name" size=40 value="<?php  p($question->name) ?>">
-        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
-    </TD>
-</TR>
-<tr valign=top>
-    <td align=right><p><b><?php  print_string("introduction", "quiz") ?>:</b></p>
-    <br />
-    <p><font SIZE="1">
-    <?php
-           if ($usehtmleditor) {
-               helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
-           } else {
-               helpbutton("text", get_string("helptext"), "moodle", true, true);
-           }
-    ?>
-    </font></p>
-    </td>
-    <td>
-        <?php  if (isset($err["questiontext"])) {
-               formerr($err["questiontext"]); 
-               echo "<br />";
-           }
-
-           if (empty($question->questiontext)) {
-               $question->questiontext =  get_string("randomsamatchintro", "quiz");
-           }
-           print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext);
-
-           if ($usehtmleditor) {
-               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'">';
-           } else {
-               echo "<div align=right>";
-               print_string("formattexttype");
-               echo ":&nbsp;";
-               if (!$question->questiontextformat) {
-                   $question->questiontextformat = FORMAT_MOODLE;
-               }
-               choose_from_menu(format_text_menu(), "questiontextformat", $question->questiontextformat, "");
-               helpbutton("textformat", get_string("helpformatting"));
-               echo "</div>";
-           }
-        ?>
-    </td>
-</tr>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("randomsamatchnumber", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?php 
-        if ($numberavailable < 2) {
-            echo "ERROR";
-            $maxrandom=2;
-        } else if ($numberavailable < 6) {
-            $maxrandom = $numberavailable;
-        } else {
-            $maxrandom = QUIZ_MAX_NUMBER_ANSWERS;
-        }
-
-        for ($i=2;$i<=$maxrandom;$i++) {
-            $menu[$i] = $i;
-        }
-        choose_from_menu($menu, "choose", "$options->choose", "");
-        unset($menu);
-     ?>
-    </TD>
-</TR>
-</TABLE>
-
-<INPUT type="hidden" name=id value="<?php  p($question->id) ?>">
-<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>">
-<INPUT type="submit" value="<?php  print_string("savechanges") ?>">
-
-</CENTER>
-</FORM>
+<FORM name="theform" method="post" action="question.php">
+
+<CENTER>
+
+<TABLE cellpadding=5>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?PHP echo $categories[$question->category]; ?>
+
+    <input type="hidden" name="category" value="<?PHP echo "$question->category"; ?>" />
+
+    </TD>
+
+</TR>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+        <?PHP
+
+           if (empty($question->name)) {
+
+               $question->name =  get_string("randomsamatch", "quiz");
+
+           }
+
+        ?>
+
+        <INPUT type="text" name="name" size=40 value="<?php  p($question->name) ?>" />
+
+        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
+
+    </TD>
+
+</TR>
+
+<tr valign=top>
+
+    <td align=right><p><b><?php  print_string("introduction", "quiz") ?>:</b></p>
+
+    <br />
+
+    <p><font SIZE="1">
+
+    <?php
+
+           if ($usehtmleditor) {
+
+               helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
+
+           } else {
+
+               helpbutton("text", get_string("helptext"), "moodle", true, true);
+
+           }
+
+    ?>
+
+    </font></p>
+
+    </td>
+
+    <td>
+
+        <?php  if (isset($err["questiontext"])) {
+
+               formerr($err["questiontext"]); 
+
+               echo "<br />";
+
+           }
+
+
+
+           if (empty($question->questiontext)) {
+
+               $question->questiontext =  get_string("randomsamatchintro", "quiz");
+
+           }
+
+           print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext);
+
+
+
+           if ($usehtmleditor) {
+
+               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'" />';
+
+           } else {
+
+               echo "<div align=right>";
+
+               print_string("formattexttype");
+
+               echo ":&nbsp;";
+
+               if (!$question->questiontextformat) {
+
+                   $question->questiontextformat = FORMAT_MOODLE;
+
+               }
+
+               choose_from_menu(format_text_menu(), "questiontextformat", $question->questiontextformat, "");
+
+               helpbutton("textformat", get_string("helpformatting"));
+
+               echo "</div>";
+
+           }
+
+        ?>
+
+    </td>
+
+</tr>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("randomsamatchnumber", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?php 
+
+        if ($numberavailable < 2) {
+
+            echo "ERROR";
+
+            $maxrandom=2;
+
+        } else if ($numberavailable < 6) {
+
+            $maxrandom = $numberavailable;
+
+        } else {
+
+            $maxrandom = QUIZ_MAX_NUMBER_ANSWERS;
+
+        }
+
+
+
+        for ($i=2;$i<=$maxrandom;$i++) {
+
+            $menu[$i] = $i;
+
+        }
+
+        choose_from_menu($menu, "choose", "$options->choose", "");
+
+        unset($menu);
+
+     ?>
+
+    </TD>
+
+</TR>
+
+</TABLE>
+
+
+
+<INPUT type="hidden" name=id value="<?php  p($question->id) ?>" />
+
+<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>" />
+
+<INPUT type="submit" value="<?php  print_string("savechanges") ?>" />
+
+
+
+</CENTER>
+
+</FORM>
+
diff --git a/mod/quiz/questiontypes/shortanswer/shortanswer.html b/mod/quiz/questiontypes/shortanswer/shortanswer.html
index 968df572b2..3fe70b7de9 100644
--- a/mod/quiz/questiontypes/shortanswer/shortanswer.html
+++ b/mod/quiz/questiontypes/shortanswer/shortanswer.html
@@ -1,121 +1,242 @@
-<FORM name="theform" method="post" action="question.php">
-<CENTER>
-<TABLE cellpadding=5>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?php   quiz_category_select_menu($course->id, true, true, $question->category); ?>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="name" size=50 value="<?php  p($question->name) ?>">
-        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
-    </TD>
-</TR>
-<tr valign=top>
-    <td align="right"><p><b><?php  print_string("question", "quiz") ?>:</b></p>
-    <br />
-    <br />
-    <br />
-    <p><font SIZE="1">
-    <?php
-           if ($usehtmleditor) {
-               helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
-           } else {
-               helpbutton("text", get_string("helptext"), "moodle", true, true);
-           }
-    ?>
-    </font></p>
-    </td>
-    <td>
-        <?php  if (isset($err["questiontext"])) {
-               formerr($err["questiontext"]); 
-               echo "<br />";
-           }
-
-           print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext);
-
-           if ($usehtmleditor) {
-               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'">';
-           } else {
-               echo "<div align=right>";
-               print_string("formattexttype");
-               echo ":&nbsp;";
-               if (!isset($question->questiontextformat)) {
-                   $question->questiontextformat = FORMAT_MOODLE;
-               }
-               choose_from_menu(format_text_menu(), "questiontextformat", $question->questiontextformat, "");
-               helpbutton("textformat", get_string("helpformatting"));
-               echo "</div>";
-           }
-        ?>
-    </td>
-</tr>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("imagedisplay", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?php   if (empty($images)) {
-            print_string("noimagesyet");
-        } else {
-            choose_from_menu($images, "image", "$question->image", get_string("none"),"","");
-        }
-    ?>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("casesensitive", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?php 
-        unset($menu);
-        $menu[0] = get_string("caseno", "quiz");
-        $menu[1] = get_string("caseyes", "quiz");
-        choose_from_menu($menu, "usecase", "$options->usecase", "");
-     ?>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("correctanswers", "quiz") ?></B>:</P></TD>
-    <TD>
-        <P><?php  print_string("filloutoneanswer", "quiz") ?></P>
-    </TD>
-
-
-<?PHP 
-    for ($i=1; $i<=QUIZ_MAX_NUMBER_ANSWERS; $i++) {
-?>
-
-<TR valign=top>
-    <TD align=right><P><B><?php  echo get_string("answer", "quiz")." $i";  ?>:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[$i-1]->answer) ?>">&nbsp;&nbsp;
-        <?php  print_string("grade");
-           echo ":&nbsp;";
-           choose_from_menu($gradeoptions, "fraction[]", $answers[$i-1]->fraction,""); ?>
-        <BR>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
-    <TD>
-        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[$i-1]->feedback) ?></textarea>
-    </TD>
-</TR>
-
-<TR valign=top>
-    <TD colspan=2>&nbsp;</TD>
-</TR>
-
-<?PHP
-    }
-?>
-
-</TABLE>
-
-<INPUT type="hidden" name=id value="<?php  p($question->id) ?>">
-<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>">
-<INPUT type="submit" value="<?php  print_string("savechanges") ?>">
-
-</CENTER>
-</FORM>
+<FORM name="theform" method="post" action="question.php">
+
+<CENTER>
+
+<TABLE cellpadding=5>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?php   quiz_category_select_menu($course->id, true, true, $question->category); ?>
+
+    </TD>
+
+</TR>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+        <INPUT type="text" name="name" size=50 value="<?php  p($question->name) ?>" />
+
+        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
+
+    </TD>
+
+</TR>
+
+<tr valign=top>
+
+    <td align="right"><p><b><?php  print_string("question", "quiz") ?>:</b></p>
+
+    <br />
+
+    <br />
+
+    <br />
+
+    <p><font SIZE="1">
+
+    <?php
+
+           if ($usehtmleditor) {
+
+               helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
+
+           } else {
+
+               helpbutton("text", get_string("helptext"), "moodle", true, true);
+
+           }
+
+    ?>
+
+    </font></p>
+
+    </td>
+
+    <td>
+
+        <?php  if (isset($err["questiontext"])) {
+
+               formerr($err["questiontext"]); 
+
+               echo "<br />";
+
+           }
+
+
+
+           print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext);
+
+
+
+           if ($usehtmleditor) {
+
+               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'" />';
+
+           } else {
+
+               echo "<div align=right>";
+
+               print_string("formattexttype");
+
+               echo ":&nbsp;";
+
+               if (!isset($question->questiontextformat)) {
+
+                   $question->questiontextformat = FORMAT_MOODLE;
+
+               }
+
+               choose_from_menu(format_text_menu(), "questiontextformat", $question->questiontextformat, "");
+
+               helpbutton("textformat", get_string("helpformatting"));
+
+               echo "</div>";
+
+           }
+
+        ?>
+
+    </td>
+
+</tr>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("imagedisplay", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?php   if (empty($images)) {
+
+            print_string("noimagesyet");
+
+        } else {
+
+            choose_from_menu($images, "image", "$question->image", get_string("none"),"","");
+
+        }
+
+    ?>
+
+    </TD>
+
+</TR>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("casesensitive", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?php 
+
+        unset($menu);
+
+        $menu[0] = get_string("caseno", "quiz");
+
+        $menu[1] = get_string("caseyes", "quiz");
+
+        choose_from_menu($menu, "usecase", "$options->usecase", "");
+
+     ?>
+
+    </TD>
+
+</TR>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("correctanswers", "quiz") ?></B>:</P></TD>
+
+    <TD>
+
+        <P><?php  print_string("filloutoneanswer", "quiz") ?></P>
+
+    </TD>
+
+
+
+
+
+<?PHP 
+
+    for ($i=1; $i<=QUIZ_MAX_NUMBER_ANSWERS; $i++) {
+
+?>
+
+
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  echo get_string("answer", "quiz")." $i";  ?>:</B></P></TD>
+
+    <TD>
+
+        <INPUT type="text" name="answer[]" size=50 value="<?php  p($answers[$i-1]->answer) ?>" />&nbsp;&nbsp;
+
+        <?php  print_string("grade");
+
+           echo ":&nbsp;";
+
+           choose_from_menu($gradeoptions, "fraction[]", $answers[$i-1]->fraction,""); ?>
+
+        <BR>
+
+    </TD>
+
+</TR>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+        <textarea name="feedback[]" rows=2 cols=50 wrap="virtual"><?php  p($answers[$i-1]->feedback) ?></textarea>
+
+    </TD>
+
+</TR>
+
+
+
+<TR valign=top>
+
+    <TD colspan=2>&nbsp;</TD>
+
+</TR>
+
+
+
+<?PHP
+
+    }
+
+?>
+
+
+
+</TABLE>
+
+
+
+<INPUT type="hidden" name=id value="<?php  p($question->id) ?>" />
+
+<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>" />
+
+<INPUT type="submit" value="<?php  print_string("savechanges") ?>" />
+
+
+
+</CENTER>
+
+</FORM>
+
diff --git a/mod/quiz/questiontypes/truefalse/truefalse.html b/mod/quiz/questiontypes/truefalse/truefalse.html
index 2fffc5e048..a9ec8ff788 100644
--- a/mod/quiz/questiontypes/truefalse/truefalse.html
+++ b/mod/quiz/questiontypes/truefalse/truefalse.html
@@ -1,96 +1,192 @@
-<FORM name="theform" method="post" action="question.php">
-<CENTER>
-<TABLE cellpadding=5>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?php   quiz_category_select_menu($course->id, true, true, $question->category); ?>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
-    <TD>
-        <INPUT type="text" name="name" size=50 value="<?php  p($question->name) ?>">
-        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
-    </TD>
-</TR>
-<tr valign=top>
-    <td align="right"><p><b><?php  print_string("question", "quiz") ?>:</b></p>
-    <br />
-    <br />
-    <br />
-    <p><font SIZE="1">
-    <?php
-           if ($usehtmleditor) {
-               helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
-           } else {
-               helpbutton("text", get_string("helptext"), "moodle", true, true);
-           }
-    ?>
-    </font></p>
-    </td>
-    <td>
-        <?php  if (isset($err["questiontext"])) {
-               formerr($err["questiontext"]); 
-               echo "<br />";
-           }
-
-           print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext);
-
-           if ($usehtmleditor) { 
-               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'">';
-           } else {
-               echo "<div align=right>";
-               print_string("formattexttype");
-               echo ":&nbsp;";
-               if (!isset($question->questiontextformat)) {
-                   $question->questiontextformat = FORMAT_MOODLE;
-               }
-               choose_from_menu(format_text_menu(), "questiontextformat", $question->questiontextformat, "");
-               helpbutton("textformat", get_string("helpformatting"));
-               echo "</div>";
-           }
-        ?>
-    </td>
-</tr>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("imagedisplay", "quiz") ?>:</B></P></TD>
-    <TD>
-    <?php   if (empty($images)) {
-            print_string("noimagesyet");
-        } else {
-            choose_from_menu($images, "image", "$question->image", get_string("none"),"","");
-        }
-    ?>
-    </TD>
-</TR>
-
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("correctanswer", "quiz") ?>:</B></P></TD>
-    <TD>
-        <?php  $menu[0] = get_string("false", "quiz");
-           $menu[1] = get_string("true", "quiz");
-           choose_from_menu($menu, "answer", "$question->answer", ""); ?>
-        <BR>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?> (<?php  print_string("true", "quiz") ?>):</B></P></TD>
-    <TD>
-        <textarea name="feedbacktrue" rows=2 cols=50 wrap="virtual"><?php  p($true->feedback) ?></textarea>
-    </TD>
-</TR>
-<TR valign=top>
-    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?> (<?php  print_string("false", "quiz") ?>):</B></P></TD>
-    <TD>
-        <textarea name="feedbackfalse" rows=2 cols=50 wrap="virtual"><?php  p($false->feedback) ?></textarea>
-    </TD>
-</TR>
-</TABLE>
-
-<INPUT type="hidden" name=id value="<?php  p($question->id) ?>">
-<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>">
-<INPUT type="submit" value="<?php  print_string("savechanges") ?>">
-
-</CENTER>
-</FORM>
+<FORM name="theform" method="post" action="question.php">
+
+<CENTER>
+
+<TABLE cellpadding=5>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("category", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?php   quiz_category_select_menu($course->id, true, true, $question->category); ?>
+
+    </TD>
+
+</TR>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("questionname", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+        <INPUT type="text" name="name" size=50 value="<?php  p($question->name) ?>" />
+
+        <?php  if (isset($err["name"])) formerr($err["name"]); ?>
+
+    </TD>
+
+</TR>
+
+<tr valign=top>
+
+    <td align="right"><p><b><?php  print_string("question", "quiz") ?>:</b></p>
+
+    <br />
+
+    <br />
+
+    <br />
+
+    <p><font SIZE="1">
+
+    <?php
+
+           if ($usehtmleditor) {
+
+               helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
+
+           } else {
+
+               helpbutton("text", get_string("helptext"), "moodle", true, true);
+
+           }
+
+    ?>
+
+    </font></p>
+
+    </td>
+
+    <td>
+
+        <?php  if (isset($err["questiontext"])) {
+
+               formerr($err["questiontext"]); 
+
+               echo "<br />";
+
+           }
+
+
+
+           print_textarea($usehtmleditor, 15, 60, 630, 300, "questiontext", $question->questiontext);
+
+
+
+           if ($usehtmleditor) { 
+
+               echo '<input type="hidden" name="questiontextformat" value="'.FORMAT_HTML.'" />';
+
+           } else {
+
+               echo "<div align=right>";
+
+               print_string("formattexttype");
+
+               echo ":&nbsp;";
+
+               if (!isset($question->questiontextformat)) {
+
+                   $question->questiontextformat = FORMAT_MOODLE;
+
+               }
+
+               choose_from_menu(format_text_menu(), "questiontextformat", $question->questiontextformat, "");
+
+               helpbutton("textformat", get_string("helpformatting"));
+
+               echo "</div>";
+
+           }
+
+        ?>
+
+    </td>
+
+</tr>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("imagedisplay", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+    <?php   if (empty($images)) {
+
+            print_string("noimagesyet");
+
+        } else {
+
+            choose_from_menu($images, "image", "$question->image", get_string("none"),"","");
+
+        }
+
+    ?>
+
+    </TD>
+
+</TR>
+
+
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("correctanswer", "quiz") ?>:</B></P></TD>
+
+    <TD>
+
+        <?php  $menu[0] = get_string("false", "quiz");
+
+           $menu[1] = get_string("true", "quiz");
+
+           choose_from_menu($menu, "answer", "$question->answer", ""); ?>
+
+        <BR>
+
+    </TD>
+
+</TR>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?> (<?php  print_string("true", "quiz") ?>):</B></P></TD>
+
+    <TD>
+
+        <textarea name="feedbacktrue" rows=2 cols=50 wrap="virtual"><?php  p($true->feedback) ?></textarea>
+
+    </TD>
+
+</TR>
+
+<TR valign=top>
+
+    <TD align=right><P><B><?php  print_string("feedback", "quiz") ?> (<?php  print_string("false", "quiz") ?>):</B></P></TD>
+
+    <TD>
+
+        <textarea name="feedbackfalse" rows=2 cols=50 wrap="virtual"><?php  p($false->feedback) ?></textarea>
+
+    </TD>
+
+</TR>
+
+</TABLE>
+
+
+
+<INPUT type="hidden" name=id value="<?php  p($question->id) ?>" />
+
+<INPUT type="hidden" name=qtype value="<?php  p($question->qtype) ?>" />
+
+<INPUT type="submit" value="<?php  print_string("savechanges") ?>" />
+
+
+
+</CENTER>
+
+</FORM>
+
diff --git a/mod/quiz/report/fullstat/report.php b/mod/quiz/report/fullstat/report.php
index 071b7dbb96..6b7a5c7921 100755
--- a/mod/quiz/report/fullstat/report.php
+++ b/mod/quiz/report/fullstat/report.php
@@ -472,7 +472,7 @@ class quiz_report extends quiz_default_report {
             $myxls->write_string($row,0,$label,$formatbrt);
             //display answer tallies
             for ($j = 1; $j <= $table_colcount; $j++){
-                //substitute "<br>" for a "//"
+                //substitute "<br />" for a "//"
                 $nowdata = $analysis[$i][$j];
                 if($slashpos = strpos($nowdata,"//")){
                 $text = substr($nowdata,0,$slashpos);
@@ -644,7 +644,7 @@ class quiz_report extends quiz_default_report {
             echo  "M/C #$i\t";
             //display answer tallies
             for ($j = 1; $j <= $table_colcount; $j++){
-                //substitute "<br>" for a "//"
+                //substitute "<br />" for a "//"
                 $nowdata = $analysis[$i][$j];
                 if (strpos($nowdata,"//")>0) {
                 $nowdata = str_replace("//"," : ",$nowdata);
@@ -682,7 +682,7 @@ class quiz_report extends quiz_default_report {
                     } elseif ($thisitem['qtype'] == 5) {
                         if ($thisitem['score'] == 1) {$thiscolor = "blue";}
                         if(!$thisitem['data'][1]){$thisitem['data'][1]="($strnoresponse)";}
-                        print("<td align=center><font size=-2>{$thisitem['data'][0]}<br><font color='$thiscolor'>{$thisitem['data'][1]}</font></font></td>");
+                        print("<td align=center><font size=-2>{$thisitem['data'][0]}<br /><font color='$thiscolor'>{$thisitem['data'][1]}</font></font></td>");
                     } elseif  ($thisitem['qtype'] == 3) {
                         if ($showtext) {
                             print("<td align=center><font color='$thiscolor' size=-2>&nbsp;&nbsp;{$thisitem['data']}&nbsp;&nbsp;</font></td>");
@@ -726,9 +726,9 @@ class quiz_report extends quiz_default_report {
         print("<tr valign=top><th colspan=2 align=right>&nbsp;M/C #$i</td>");
         //display answer tallies
         for ($j = 1; $j <= $table_colcount; $j++){
-           //substitute "<br>" for a "//"
+           //substitute "<br />" for a "//"
            $nowdata = $analysis[$i][$j];
-           if (strpos($nowdata,"//")>0) {$nowdata = str_replace("//","<br>",$nowdata);}
+           if (strpos($nowdata,"//")>0) {$nowdata = str_replace("//","<br />",$nowdata);}
            print("<td align='center'>&nbsp;$nowdata</td>");
         
         }
diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index d4ff76be65..9c60f5d191 100644
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -117,14 +117,14 @@ class quiz_report extends quiz_default_report {
         $onsub = "return confirm('$strreallydel')";
 
         echo "<form method=\"post\" action=\"report.php\" name=\"delform\" onsubmit=\"$onsub\">\n";
-        echo "<input type=\"hidden\" name=\"del\" value=\"selection\">\n";
-        echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\">\n";
+        echo "<input type=\"hidden\" name=\"del\" value=\"selection\" />\n";
+        echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n";
 
         print_table($table);
     
         //There might be a more elegant way than using the <center> tag for this
         echo "<center><input type=\"submit\" value=\"$strdeleteselected\">&nbsp;";
-        echo "<input type=button value=\"$strdeleteall\" onClick=\"if(delcheck()){document.delform.submit()}\">\n</center>\n";
+        echo "<input type=button value=\"$strdeleteall\" onClick=\"if(delcheck()){document.delform.submit()}\" />\n</center>\n";
         echo "</form>\n";
 
         return true;
@@ -145,7 +145,7 @@ class quiz_report extends quiz_default_report {
             } else {
                 $attemptlapse = "...";
             }
-            $button = "<input type=checkbox name=\"box$attempt->id\" value=\"$attempt->id\">";
+            $button = "<input type=checkbox name=\"box$attempt->id\" value=\"$attempt->id\" />";
             $revurl = "review.php?q=$quiz->id&attempt=$attempt->id";
             if ($attemptgrade == $bestgrade) {
                 $userattempts[] = "$button&nbsp;<span class=\"highlight\">$attemptgrade</span>&nbsp;<a href=\"$revurl\">$attemptdate</a>&nbsp;($attemptlapse)";
diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php
index 2d3542d75d..cc8da679bd 100644
--- a/mod/quiz/restorelib.php
+++ b/mod/quiz/restorelib.php
@@ -269,10 +269,10 @@
 
             //Do some output
             if ($status) {
-                echo "<ul><li>".get_string("category")." \"".$quiz_cat->name."\"<br>";
+                echo "<ul><li>".get_string("category")." \"".$quiz_cat->name."\"<br />";
             } else {
                 //We must never arrive here !!
-                echo "<ul><li>".get_string("category")." \"".$quiz_cat->name."\" Error!<br>";
+                echo "<ul><li>".get_string("category")." \"".$quiz_cat->name."\" Error!<br />";
             }
             backup_flush(300);
 
@@ -355,7 +355,7 @@
             if (($i+1) % 2 == 0) {
                 echo ".";
                 if (($i+1) % 40 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -458,7 +458,7 @@
                 if (($i+1) % 50 == 0) {
                     echo ".";
                     if (($i+1) % 1000 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
@@ -514,7 +514,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -581,7 +581,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -634,7 +634,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -698,7 +698,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -746,7 +746,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -822,7 +822,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -877,7 +877,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -922,7 +922,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -970,7 +970,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -1022,7 +1022,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -1103,7 +1103,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -1344,7 +1344,7 @@
             $newid = insert_record ("quiz",$quiz);
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","quiz")." \"".$quiz->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","quiz")." \"".$quiz->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -1414,7 +1414,7 @@
             if (($i+1) % 10 == 0) {
                 echo ".";
                 if (($i+1) % 200 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -1474,7 +1474,7 @@
             if (($i+1) % 10 == 0) {
                 echo ".";
                 if (($i+1) % 200 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -1700,7 +1700,7 @@
             if (($i+1) % 10 == 0) {
                 echo ".";
                 if (($i+1) % 200 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -1757,7 +1757,7 @@
             if (($i+1) % 10 == 0) {
                 echo ".";
                 if (($i+1) % 200 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -1882,7 +1882,7 @@
             }
             break;
         default:
-            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br>";                 //Debug
+            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br />";                 //Debug
             break;
         }
 
diff --git a/mod/resource/config.html b/mod/resource/config.html
index 0e81fff2d7..cd195544c8 100644
--- a/mod/resource/config.html
+++ b/mod/resource/config.html
@@ -4,7 +4,7 @@
 <tr valign=top>
 	<td align=right><p>resource_framesize:</td>
 	<td>
-    <input name=resource_framesize type=text size=5 value="<?php p($CFG->resource_framesize) ?>">
+    <input name=resource_framesize type=text size=5 value="<?php p($CFG->resource_framesize) ?>" />
     </td>
     <td>
     <?php print_string("configframesize", "resource") ?>
@@ -13,7 +13,7 @@
 <tr valign=top>
 	<td align=right><p>resource_websearch:</td>
 	<td>
-    <input name=resource_websearch type=text size=30 value="<?php p($CFG->resource_websearch) ?>">
+    <input name=resource_websearch type=text size=30 value="<?php p($CFG->resource_websearch) ?>" />
     </td>
     <td>
     <?php print_string("configwebsearch", "resource") ?>
@@ -22,7 +22,7 @@
 <tr valign=top>
 	<td align=right><p>resource_defaulturl:</td>
 	<td>
-    <input name=resource_defaulturl type=text size=30 value="<?php p($CFG->resource_defaulturl) ?>">
+    <input name=resource_defaulturl type=text size=30 value="<?php p($CFG->resource_defaulturl) ?>" />
     </td>
     <td>
     <?php print_string("configdefaulturl", "resource") ?>
@@ -31,7 +31,7 @@
 <tr valign=top>
 	<td align=right><p>resource_secretphrase:</td>
 	<td>
-    <input name=resource_secretphrase type=text size=30 value="<?php p($CFG->resource_secretphrase) ?>">
+    <input name=resource_secretphrase type=text size=30 value="<?php p($CFG->resource_secretphrase) ?>" />
     </td>
     <td>
     <?php print_string("configsecretphrase", "resource") ?>
@@ -71,7 +71,7 @@
 	      echo "<td align=right><p>$defaultvalue:</td>";
 	      echo "<td>";
           if ($optionname == "height" or $optionname == "width") {
-              echo "<input name=$defaultvalue type=text size=5 value=\"".$CFG->$defaultvalue."\">";
+              echo "<input name=$defaultvalue type=text size=5 value=\"".$CFG->$defaultvalue."\" />";
           } else {
               choose_from_menu ($choices, $defaultvalue, $CFG->$defaultvalue, "");
           }
@@ -112,7 +112,7 @@
 </tr>
 <tr>
     <td colspan=3 align=center>
-	<input type="submit" value="<?php print_string("savechanges") ?>"></td>
+	<input type="submit" value="<?php print_string("savechanges") ?>" /></td>
 </tr>
 </table>
 
diff --git a/mod/resource/coursefiles.php b/mod/resource/coursefiles.php
index 2dca6bac28..9317c1c558 100644
--- a/mod/resource/coursefiles.php
+++ b/mod/resource/coursefiles.php
@@ -150,20 +150,20 @@
                 echo "<P>$struploadafile ($strmaxsize) --> <B>$wdir</B>";
                 echo "<TABLE><TR><TD COLSPAN=2>";
                 echo "<FORM ENCTYPE=\"multipart/form-data\" METHOD=\"post\" ACTION=\"".$ME."\">";
-                echo " <INPUT TYPE=hidden NAME=MAX_FILE_SIZE value=\"$upload_max_filesize\">";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=upload>";
-                echo " <INPUT NAME=\"userfile\" TYPE=\"file\" size=\"60\">";
+                echo " <INPUT TYPE=hidden NAME=MAX_FILE_SIZE value=\"$upload_max_filesize\" />";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=upload />";
+                echo " <INPUT NAME=\"userfile\" TYPE=\"file\" size=\"60\" />";
                 echo " </TD><TR><TD WIDTH=10>";
-                echo " <INPUT TYPE=submit NAME=save VALUE=\"$struploadthisfile\">";
+                echo " <INPUT TYPE=submit NAME=save VALUE=\"$struploadthisfile\" />";
                 echo "</FORM>";
                 echo "</TD><TD WIDTH=100%>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=\"get\">";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strcancel\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strcancel\" />";
                 echo "</FORM>";
                 echo "</TD></TR></TABLE>";
             }
@@ -250,19 +250,19 @@
                 echo "<P>$strrenamefileto:";
                 echo "<TABLE><TR><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=\"post\" NAME=\"form\">";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=rename>";
-                echo " <INPUT TYPE=hidden NAME=oldname VALUE=\"$file\">";
-                echo " <INPUT TYPE=text NAME=name SIZE=35 VALUE=\"$file\">";
-                echo " <INPUT TYPE=submit VALUE=\"$strrename\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=rename />";
+                echo " <INPUT TYPE=hidden NAME=oldname VALUE=\"$file\" />";
+                echo " <INPUT TYPE=text NAME=name SIZE=35 VALUE=\"$file\" />";
+                echo " <INPUT TYPE=submit VALUE=\"$strrename\" />";
                 echo "</FORM>";
                 echo "</TD><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strcancel\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strcancel\" />";
                 echo "</FORM>";
                 echo "</TD></TR></TABLE>";
             }
@@ -288,18 +288,18 @@
                 echo "<P>$strcreatefolder:";
                 echo "<TABLE><TR><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=post NAME=form>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=mkdir>";
-                echo " <INPUT TYPE=text NAME=name SIZE=35>";
-                echo " <INPUT TYPE=submit VALUE=\"$strcreate\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=mkdir />";
+                echo " <INPUT TYPE=text NAME=name SIZE=35 />";
+                echo " <INPUT TYPE=submit VALUE=\"$strcreate\" />";
                 echo "</FORM>";
                 echo "</TD><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strcancel\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strcancel\" />";
                 echo "</FORM>";
                 echo "</TD></TR></TABLE>";
             }
@@ -336,20 +336,20 @@
 
                 echo "<TABLE><TR><TD COLSPAN=2>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=\"post\" NAME=\"form\" $onsubmit>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-                echo " <INPUT TYPE=hidden NAME=file VALUE=\"$file\">";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=edit>";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+                echo " <INPUT TYPE=hidden NAME=file VALUE=\"$file\" />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=edit />";
                 print_textarea($usehtmleditor, 25, 80, 680, 400, "text", $contents);
                 echo "</TD></TR><TR><TD>";
-                echo " <INPUT TYPE=submit VALUE=\"".get_string("savechanges")."\">";
+                echo " <INPUT TYPE=submit VALUE=\"".get_string("savechanges")."\" />";
                 echo "</FORM>";
                 echo "</TD><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"".get_string("cancel")."\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"".get_string("cancel")."\" />";
                 echo "</FORM>";
                 echo "</TD></TR></TABLE>";
 
@@ -400,18 +400,18 @@
                     echo "<P ALIGN=CENTER>".get_string("whattocallzip");
                     echo "<TABLE><TR><TD>";
                     echo "<FORM ACTION=\"".$ME."\" METHOD=post NAME=form>";
-                    echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                    echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-                    echo " <INPUT TYPE=hidden NAME=action VALUE=zip>";
-                    echo " <INPUT TYPE=text NAME=name SIZE=35 VALUE=\"new.zip\">";
-                    echo " <INPUT TYPE=submit VALUE=\"".get_string("createziparchive")."\">";
+                    echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                    echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+                    echo " <INPUT TYPE=hidden NAME=action VALUE=zip />";
+                    echo " <INPUT TYPE=text NAME=name SIZE=35 VALUE=\"new.zip\" />";
+                    echo " <INPUT TYPE=submit VALUE=\"".get_string("createziparchive")."\" />";
                     echo "</FORM>";
                     echo "</TD><TD>";
                     echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-                    echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                    echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                    echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                    echo " <INPUT TYPE=submit VALUE=\"".get_string("cancel")."\">";
+                    echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                    echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                    echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                    echo " <INPUT TYPE=submit VALUE=\"".get_string("cancel")."\" />";
                     echo "</FORM>";
                     echo "</TD></TR></TABLE>";
                 } else {
@@ -474,10 +474,10 @@
                 }
 
                 echo "<CENTER><FORM ACTION=\"".$ME."\" METHOD=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strok\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strok\" />";
                 echo "</FORM>";
                 echo "</CENTER>";
             } else {
@@ -520,11 +520,11 @@
                     }
                     echo "</table>";
                 }
-                echo "<br><center><form action=\"".$ME."\" method=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strok\">";
+                echo "<br /><center><form action=\"".$ME."\" method=get>";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strok\" />";
                 echo "</FORM>";
                 echo "</CENTER>";
             } else {
@@ -636,7 +636,7 @@ function printfilelist($filelist) {
 
     foreach ($filelist as $file) {
         if (is_dir($basedir.$file)) {
-            echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=16 width=16> $file<br>";
+            echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=16 width=16> $file<br />";
             $subfilelist = array();
             $currdir = opendir($basedir.$file);
             while ($subfile = readdir($currdir)) {
@@ -648,7 +648,7 @@ function printfilelist($filelist) {
 
         } else {
             $icon = mimeinfo("icon", $file);
-            echo "<img src=\"$CFG->pixpath/f/$icon\"  height=16 width=16> $file<br>";
+            echo "<img src=\"$CFG->pixpath/f/$icon\"  height=16 width=16> $file<br />";
         }
     }
 }
@@ -732,7 +732,7 @@ function displaydir ($wdir) {
 
             echo "<TR>";
 
-            print_cell("center", "<INPUT TYPE=checkbox NAME=\"file$count\" VALUE=\"$fileurl\">");
+            print_cell("center", "<INPUT TYPE=checkbox NAME=\"file$count\" VALUE=\"$fileurl\" />");
             print_cell("left", "<A HREF=\"".basename($ME)."?id=$id&wdir=$fileurl\"><IMG SRC=\"$CFG->pixpath/f/folder.gif\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"Folder\"></A> <A HREF=\"".basename($ME)."?id=$id&wdir=$fileurl\">".htmlspecialchars($dir)."</A>");
             print_cell("right", "-");
             print_cell("right", $filedate);
@@ -769,7 +769,7 @@ function displaydir ($wdir) {
 
             echo "<tr>";
 
-            print_cell("center", "<input type=\"checkbox\" name=\"file$count\" value=\"$fileurl\">");
+            print_cell("center", "<input type=\"checkbox\" name=\"file$count\" value=\"$fileurl\" />");
 
             echo "<td align=left nowrap>";
             link_to_popup_window ($ffurl, "display",
@@ -806,8 +806,8 @@ function displaydir ($wdir) {
 
     echo "<TABLE BORDER=0 cellspacing=2 cellpadding=2 width=640>";
     echo "<TR><TD>";
-    echo "<INPUT TYPE=hidden NAME=id VALUE=\"$id\">";
-    echo "<INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\"> ";
+    echo "<INPUT TYPE=hidden NAME=id VALUE=\"$id\" />";
+    echo "<INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" /> ";
     $options = array (
                    "move" => "$strmovetoanotherfolder",
                    "delete" => "$strdeletecompletely",
@@ -821,26 +821,26 @@ function displaydir ($wdir) {
     echo "<TD ALIGN=center>";
     if (!empty($USER->fileop) and ($USER->fileop == "move") and ($USER->filesource <> $wdir)) {
         echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-        echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-        echo " <INPUT TYPE=hidden NAME=action VALUE=paste>";
-        echo " <INPUT TYPE=submit VALUE=\"$strmovefilestohere\">";
+        echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+        echo " <INPUT TYPE=hidden NAME=action VALUE=paste />";
+        echo " <INPUT TYPE=submit VALUE=\"$strmovefilestohere\" />";
         echo "</FORM>";
     }
     echo "<TD ALIGN=right>";
         echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-        echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-        echo " <INPUT TYPE=hidden NAME=action VALUE=mkdir>";
-        echo " <INPUT TYPE=submit VALUE=\"$strmakeafolder\">";
+        echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+        echo " <INPUT TYPE=hidden NAME=action VALUE=mkdir />";
+        echo " <INPUT TYPE=submit VALUE=\"$strmakeafolder\" />";
         echo "</FORM>";
     echo "</TD>";
     echo "<TD ALIGN=right>";
         echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-        echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-        echo " <INPUT TYPE=hidden NAME=action VALUE=upload>";
-        echo " <INPUT TYPE=submit VALUE=\"$struploadafile\">";
+        echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+        echo " <INPUT TYPE=hidden NAME=action VALUE=upload />";
+        echo " <INPUT TYPE=submit VALUE=\"$struploadafile\" />";
         echo "</FORM>";
     echo "</TD></TR>";
     echo "</TABLE>";
diff --git a/mod/resource/restorelib.php b/mod/resource/restorelib.php
index 15c2d1f5b3..7d51a71659 100644
--- a/mod/resource/restorelib.php
+++ b/mod/resource/restorelib.php
@@ -82,7 +82,7 @@
             $newid = insert_record ("resource",$resource);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","resource")." \"".$resource->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","resource")." \"".$resource->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -203,14 +203,14 @@
                         $post->message = addslashes($result);
                         $status = update_record("forum_posts",$post);
                         if ($CFG->debug>7) {
-                            echo "<br><hr>".$content."<br>changed to</br>".$result."<hr><br>";
+                            echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
                         }
                     }
                     //Do some output
                     if (($i+1) % 5 == 0) {
                         echo ".";
                         if (($i+1) % 100 == 0) {
-                            echo "<br>";
+                            echo "<br />";
                         }
                         backup_flush(300);
                     }
@@ -238,14 +238,14 @@
                         $forum->intro = addslashes($result);
                         $status = update_record("forum",$forum);
                         if ($CFG->debug>7) {
-                            echo "<br><hr>".$content."<br>changed to</br>".$result."<hr><br>";
+                            echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
                         }
                     }
                     //Do some output
                     if (($i+1) % 5 == 0) {
                         echo ".";
                         if (($i+1) % 100 == 0) {
-                            echo "<br>";
+                            echo "<br />";
                         }
                         backup_flush(300);
                     }
@@ -274,14 +274,14 @@
                         $resource->alltext = addslashes($result);
                         $status = update_record("resource",$resource);
                         if ($CFG->debug>7) {
-                            echo "<br><hr>".$content."<br>changed to</br>".$result."<hr><br>";
+                            echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
                         }
                     }
                     //Do some output
                     if (($i+1) % 5 == 0) {
                         echo ".";
                         if (($i+1) % 100 == 0) {
-                            echo "<br>";
+                            echo "<br />";
                         }
                         backup_flush(300);
                     }
@@ -309,14 +309,14 @@
                         $resource->summary = addslashes($result);
                         $status = update_record("resource",$resource);
                         if ($CFG->debug>7) {
-                            echo "<br><hr>".$content."<br>changed to</br>".$result."<hr><br>";
+                            echo "<br /><hr />".$content."<br />changed to</br>".$result."<hr /><br />";
                         }
                     }
                     //Do some output
                     if (($i+1) % 5 == 0) {
                         echo ".";
                         if (($i+1) % 100 == 0) {
-                            echo "<br>";
+                            echo "<br />";
                         }
                         backup_flush(300);
                     }
@@ -375,7 +375,7 @@
             $status = true;
             break;
         default:
-            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br>";                 //Debug
+            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br />";                 //Debug
             break;
         }
 
diff --git a/mod/resource/type/common.html b/mod/resource/type/common.html
index 8b676924d3..c155fa99b3 100644
--- a/mod/resource/type/common.html
+++ b/mod/resource/type/common.html
@@ -1,19 +1,19 @@
 <form name="form" method="post" action="<?php echo "$CFG->wwwroot/course/mod.php" ?>">
 
-<input type="hidden" name="type"         value="<?php p($form->type) ?>">
-<input type="hidden" name="course"       value="<?php p($form->course) ?>">
-<input type="hidden" name="coursemodule" value="<?php p($form->coursemodule) ?>">
-<input type="hidden" name="section"      value="<?php p($form->section) ?>">
-<input type="hidden" name="module"       value="<?php p($form->module) ?>">
-<input type="hidden" name="modulename"   value="<?php p($form->modulename) ?>">
-<input type="hidden" name="instance"     value="<?php p($form->instance) ?>">
-<input type="hidden" name="mode"         value="<?php p($form->mode) ?>">
+<input type="hidden" name="type"         value="<?php p($form->type) ?>" />
+<input type="hidden" name="course"       value="<?php p($form->course) ?>" />
+<input type="hidden" name="coursemodule" value="<?php p($form->coursemodule) ?>" />
+<input type="hidden" name="section"      value="<?php p($form->section) ?>" />
+<input type="hidden" name="module"       value="<?php p($form->module) ?>" />
+<input type="hidden" name="modulename"   value="<?php p($form->modulename) ?>" />
+<input type="hidden" name="instance"     value="<?php p($form->instance) ?>" />
+<input type="hidden" name="mode"         value="<?php p($form->mode) ?>" />
 
 <table cellpadding=5>
 <tr valign=top>
     <td align=right><p><b><?php print_string("name") ?>:</b></p></td>
     <td>
-        <input type="text" name="name" size=65 value="<?php p($form->name) ?>">
+        <input type="text" name="name" size=65 value="<?php p($form->name) ?>" />
     </td>
 </tr>
 <tr valign=top>
diff --git a/mod/resource/type/common_end.html b/mod/resource/type/common_end.html
index d0ad1131de..7c21d5d104 100644
--- a/mod/resource/type/common_end.html
+++ b/mod/resource/type/common_end.html
@@ -1,5 +1,5 @@
 </table>
 <div align="center">
-<input type="submit" value="<?php print_string("savechanges") ?>">
+<input type="submit" value="<?php print_string("savechanges") ?>" />
 </div>
 </form>
diff --git a/mod/resource/type/file/file.html b/mod/resource/type/file/file.html
index 0459e74923..f6db2da459 100644
--- a/mod/resource/type/file/file.html
+++ b/mod/resource/type/file/file.html
@@ -34,10 +34,10 @@
     </td>
     <td>
     <?php
-        echo "<input name=\"reference\" size=\"90\" value=\"$form->reference\"><br />";
+        echo "<input name=\"reference\" size=\"90\" value=\"$form->reference\" /><br />";
         button_to_popup_window ("/mod/resource/coursefiles.php?id=$form->course", "coursefiles", $strchooseafile, 500, 750, $strchooseafile);
         echo "<input type=\"button\" name=\"searchbutton\" value=\"$strsearch ...\" ".
-             "onClick=\"return window.open('$CFG->resource_websearch', 'websearch', 'menubar=1,location=1,directories=1,toolbar=1,scrollbars,resizable,width=800,height=600');\">\n";
+             "onClick=\"return window.open('$CFG->resource_websearch', 'websearch', 'menubar=1,location=1,directories=1,toolbar=1,scrollbars,resizable,width=800,height=600');\" />\n";
     ?>
     </td>
 </tr>
@@ -70,11 +70,11 @@
         </script>
         <input type="radio" name="windowpopup" value=0 <?php echo ($windowtype != "popup") ? "checked" : "" ?> 
         onClick="lockoptions('form', 'windowpopup[0]', frameitem); 
-        return lockoptions('form', 'windowpopup[1]', popupitems);">
+        return lockoptions('form', 'windowpopup[1]', popupitems);" />
         <b title="<?php print_string("pagedisplay", "resource") ?>"><?php print_string("pagewindow", "resource") ?></b>
         <ul>
-            <input type="hidden" name="hframepage" value=0>
-            <input type="checkbox" name="framepage" value=1 <?php echo ($form->options == "frame") ? "checked" : "" ?> >
+            <input type="hidden" name="hframepage" value=0 />
+            <input type="checkbox" name="framepage" value=1 <?php echo ($form->options == "frame") ? "checked" : "" ?> />
             <?php print_string("frameifpossible", "resource") ?>
         </ul>
     </td>
@@ -85,7 +85,7 @@
     <td colspan="2">
         <input name="windowpopup" type=radio value=1 <?php echo ($windowtype == "popup") ? "checked" : "" ?>
         onclick="lockoptions('form', 'windowpopup[0]', frameitem); 
-        return lockoptions('form', 'windowpopup[1]', popupitems);">
+        return lockoptions('form', 'windowpopup[1]', popupitems);" />
         <b title="<?php p($strnewwindowopen) ?>"><?php p($strnewwindow) ?></b>
         <ul>
         <?php
@@ -93,19 +93,19 @@
                 if ($name == "height" or $name == "width") {
                     continue;
                 }
-                echo "<input name=\"h$name\" type=hidden value=0>";
-                echo "<input name=\"$name\" type=checkbox value=1 ".$window->$name.">";
+                echo "<input name=\"h$name\" type=hidden value=0 />";
+                echo "<input name=\"$name\" type=checkbox value=1 ".$window->$name." />";
                 $stringname = "str$name";
                 echo $$stringname."<br />";
             }
         ?>
 
-        <input name="hwidth" type=hidden value=0>
-        <input name="width" type=text size=4 value="<?php p($window->width) ?>">
+        <input name="hwidth" type=hidden value=0 />
+        <input name="width" type=text size=4 value="<?php p($window->width) ?>" />
         <?php p($strwidth) ?><br />
 
-        <input name="hheight" type=hidden value=0>
-        <input name="height" type=text size=4 value="<?php p($window->height) ?>">
+        <input name="hheight" type=hidden value=0 />
+        <input name="height" type=text size=4 value="<?php p($window->height) ?>" />
         <?php p($strheight) ?><br />
         <?php
             if ($windowtype == "page") {
@@ -170,7 +170,7 @@ for ($i=0; $i < $this->maxparameters; $i++) {
     }
     echo "</td>\n";
     echo "<td valign=\"top\">\n";
-    echo "<input type=\"text\" name=\"parse$i\" value=\"{$alltextfield[$i]['parse']}\">\n";
+    echo "<input type=\"text\" name=\"parse$i\" value=\"{$alltextfield[$i]['parse']}\" />\n";
     echo "</td>\n";
     echo "</tr>\n";
 }
diff --git a/mod/resource/type/html/html.html b/mod/resource/type/html/html.html
index 3a3b2aa921..18a5598dfb 100644
--- a/mod/resource/type/html/html.html
+++ b/mod/resource/type/html/html.html
@@ -66,7 +66,7 @@
             var allitems = [<?php echo $alloptions; ?>];
         </script>
         <input type="radio" name="windowpopup" value=0 <?php echo ($windowtype != "popup") ? "checked" : "" ?> 
-        onClick="return lockoptions('form', 'windowpopup[1]', popupitems);">
+        onClick="return lockoptions('form', 'windowpopup[1]', popupitems);" />
         <b title="<?php print_string("pagedisplay", "resource") ?>"><?php print_string("pagewindow", "resource") ?></b>
     </td>
 </tr>
@@ -75,7 +75,7 @@
     
     <td colspan="2">
         <input name="windowpopup" type=radio value=1 <?php echo ($windowtype == "popup") ? "checked" : "" ?>
-        onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);">
+        onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);" />
         <b title="<?php p($strnewwindowopen) ?>"><?php p($strnewwindow) ?></b>
         <ul>
         <?php
@@ -83,19 +83,19 @@
                 if ($name == "height" or $name == "width") {
                     continue;
                 }
-                echo "<input name=\"h$name\" type=hidden value=0>";
-                echo "<input name=\"$name\" type=checkbox value=1 ".$window->$name.">";
+                echo "<input name=\"h$name\" type=hidden value=0 />";
+                echo "<input name=\"$name\" type=checkbox value=1 ".$window->$name." />";
                 $stringname = "str$name";
                 echo $$stringname."<br />";
             }
         ?>
 
-        <input name="hwidth" type=hidden value=0>
-        <input name="width" type=text size=4 value="<?php p($window->width) ?>">
+        <input name="hwidth" type=hidden value=0 />
+        <input name="width" type=text size=4 value="<?php p($window->width) ?>" />
         <?php p($strwidth) ?><br />
 
-        <input name="hheight" type=hidden value=0>
-        <input name="height" type=text size=4 value="<?php p($window->height) ?>">
+        <input name="hheight" type=hidden value=0 />
+        <input name="height" type=text size=4 value="<?php p($window->height) ?>" />
         <?php p($strheight) ?><br />
         <?php
             if ($windowtype == "page") {
diff --git a/mod/resource/type/text/text.html b/mod/resource/type/text/text.html
index fbcb687325..f0e036b8dd 100644
--- a/mod/resource/type/text/text.html
+++ b/mod/resource/type/text/text.html
@@ -78,7 +78,7 @@
             var allitems = [<?php echo $alloptions; ?>];
         </script>
         <input type="radio" name="windowpopup" value=0 <?php echo ($windowtype != "popup") ? "checked" : "" ?> 
-        onClick="return lockoptions('form', 'windowpopup[1]', popupitems);">
+        onClick="return lockoptions('form', 'windowpopup[1]', popupitems);" />
         <b title="<?php print_string("pagedisplay", "resource") ?>"><?php print_string("pagewindow", "resource") ?></b>
         <?php print_string("pagedisplay", "resource") ?>
     </td>
@@ -88,7 +88,7 @@
     
     <td colspan="2">
         <input name="windowpopup" type=radio value=1 <?php echo ($windowtype == "popup") ? "checked" : "" ?>
-        onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);">
+        onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);" />
         <b title="<?php p($strnewwindowopen) ?>"><?php p($strnewwindow) ?></b>
         <?php p($strnewwindowopen) ?>
         <ul>
@@ -97,19 +97,19 @@
                 if ($name == "height" or $name == "width") {
                     continue;
                 }
-                echo "<input name=\"h$name\" type=hidden value=0>";
-                echo "<input name=\"$name\" type=checkbox value=1 ".$window->$name.">";
+                echo "<input name=\"h$name\" type=hidden value=0 />";
+                echo "<input name=\"$name\" type=checkbox value=1 ".$window->$name." />";
                 $stringname = "str$name";
                 echo $$stringname."<br />";
             }
         ?>
 
-        <input name="hwidth" type=hidden value=0>
-        <input name="width" type=text size=4 value="<?php p($window->width) ?>">
+        <input name="hwidth" type=hidden value=0 />
+        <input name="width" type=text size=4 value="<?php p($window->width) ?>" />
         <?php p($strwidth) ?><br />
 
-        <input name="hheight" type=hidden value=0>
-        <input name="height" type=text size=4 value="<?php p($window->height) ?>">
+        <input name="hheight" type=hidden value=0 />
+        <input name="height" type=text size=4 value="<?php p($window->height) ?>" />
         <?php p($strheight) ?><br />
         <?php
             if ($windowtype == "page") {
diff --git a/mod/scorm/config.html b/mod/scorm/config.html
index cc56c38d39..ea0f464a01 100755
--- a/mod/scorm/config.html
+++ b/mod/scorm/config.html
@@ -23,7 +23,7 @@
 <tr valign=top>
     <td align=right><p>scorm_framesize:</td>
     <td>
-    	<input name=scorm_framesize type=text size=5 value="<?php p($CFG->scorm_framesize) ?>">
+    	<input name=scorm_framesize type=text size=5 value="<?php p($CFG->scorm_framesize) ?>" />
     </td>
     <td>
     <?php print_string("configframesize", "scorm") ?>
@@ -49,7 +49,7 @@
 	      echo "<td align=right><p>$defaultvalue:</td>";
 	      echo "<td>";
           if ($optionname == "height" or $optionname == "width") {
-              echo "<input name=$defaultvalue type=text size=5 value=\"".$CFG->$defaultvalue."\">";
+              echo "<input name=$defaultvalue type=text size=5 value=\"".$CFG->$defaultvalue."\" />";
           } else {
               choose_from_menu ($choices, $defaultvalue, $CFG->$defaultvalue, "");
           }
@@ -62,7 +62,7 @@
 ?>
 <tr>
     <td colspan=3 align=center>
-	<input type="submit" value="<?php print_string("savechanges") ?>">
+	<input type="submit" value="<?php print_string("savechanges") ?>" />
     </td>
 </tr>
 </table>
diff --git a/mod/scorm/coursefiles.php b/mod/scorm/coursefiles.php
index e6860403d7..ede9fce8a7 100755
--- a/mod/scorm/coursefiles.php
+++ b/mod/scorm/coursefiles.php
@@ -150,20 +150,20 @@
                 echo "<P>$struploadafile ($strmaxsize) --> <B>$wdir</B>";
                 echo "<TABLE><TR><TD COLSPAN=2>";
                 echo "<FORM ENCTYPE=\"multipart/form-data\" METHOD=\"post\" ACTION=\"".$ME."\">";
-                echo " <INPUT TYPE=hidden NAME=MAX_FILE_SIZE value=\"$upload_max_filesize\">";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=upload>";
-                echo " <INPUT NAME=\"userfile\" TYPE=\"file\" size=\"60\">";
+                echo " <INPUT TYPE=hidden NAME=MAX_FILE_SIZE value=\"$upload_max_filesize\" />";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=upload />";
+                echo " <INPUT NAME=\"userfile\" TYPE=\"file\" size=\"60\" />";
                 echo " </TD><TR><TD WIDTH=10>";
-                echo " <INPUT TYPE=submit NAME=save VALUE=\"$struploadthisfile\">";
+                echo " <INPUT TYPE=submit NAME=save VALUE=\"$struploadthisfile\" />";
                 echo "</FORM>";
                 echo "</TD><TD WIDTH=100%>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=\"get\">";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strcancel\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strcancel\" />";
                 echo "</FORM>";
                 echo "</TD></TR></TABLE>";
             }
@@ -250,19 +250,19 @@
                 echo "<P>$strrenamefileto:";
                 echo "<TABLE><TR><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=\"post\" NAME=\"form\">";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=rename>";
-                echo " <INPUT TYPE=hidden NAME=oldname VALUE=\"$file\">";
-                echo " <INPUT TYPE=text NAME=name SIZE=35 VALUE=\"$file\">";
-                echo " <INPUT TYPE=submit VALUE=\"$strrename\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=rename />";
+                echo " <INPUT TYPE=hidden NAME=oldname VALUE=\"$file\" />";
+                echo " <INPUT TYPE=text NAME=name SIZE=35 VALUE=\"$file\" />";
+                echo " <INPUT TYPE=submit VALUE=\"$strrename\" />";
                 echo "</FORM>";
                 echo "</TD><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strcancel\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strcancel\" />";
                 echo "</FORM>";
                 echo "</TD></TR></TABLE>";
             }
@@ -288,18 +288,18 @@
                 echo "<P>$strcreatefolder:";
                 echo "<TABLE><TR><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=post NAME=form>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=mkdir>";
-                echo " <INPUT TYPE=text NAME=name SIZE=35>";
-                echo " <INPUT TYPE=submit VALUE=\"$strcreate\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=mkdir />";
+                echo " <INPUT TYPE=text NAME=name SIZE=35 />";
+                echo " <INPUT TYPE=submit VALUE=\"$strcreate\" />";
                 echo "</FORM>";
                 echo "</TD><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strcancel\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strcancel\" />";
                 echo "</FORM>";
                 echo "</TD></TR></TABLE>";
             }
@@ -336,20 +336,20 @@
 
                 echo "<TABLE><TR><TD COLSPAN=2>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=\"post\" NAME=\"form\" $onsubmit>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-                echo " <INPUT TYPE=hidden NAME=file VALUE=\"$file\">";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=edit>";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+                echo " <INPUT TYPE=hidden NAME=file VALUE=\"$file\" />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=edit />";
                 print_textarea($usehtmleditor, 25, 80, 680, 400, "text", $contents);
                 echo "</TD></TR><TR><TD>";
-                echo " <INPUT TYPE=submit VALUE=\"".get_string("savechanges")."\">";
+                echo " <INPUT TYPE=submit VALUE=\"".get_string("savechanges")."\" />";
                 echo "</FORM>";
                 echo "</TD><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"".get_string("cancel")."\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"".get_string("cancel")."\" />";
                 echo "</FORM>";
                 echo "</TD></TR></TABLE>";
 
@@ -400,18 +400,18 @@
                     echo "<P ALIGN=CENTER>".get_string("whattocallzip");
                     echo "<TABLE><TR><TD>";
                     echo "<FORM ACTION=\"".$ME."\" METHOD=post NAME=form>";
-                    echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                    echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-                    echo " <INPUT TYPE=hidden NAME=action VALUE=zip>";
-                    echo " <INPUT TYPE=text NAME=name SIZE=35 VALUE=\"new.zip\">";
-                    echo " <INPUT TYPE=submit VALUE=\"".get_string("createziparchive")."\">";
+                    echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                    echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+                    echo " <INPUT TYPE=hidden NAME=action VALUE=zip />";
+                    echo " <INPUT TYPE=text NAME=name SIZE=35 VALUE=\"new.zip\" />";
+                    echo " <INPUT TYPE=submit VALUE=\"".get_string("createziparchive")."\" />";
                     echo "</FORM>";
                     echo "</TD><TD>";
                     echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-                    echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                    echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                    echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                    echo " <INPUT TYPE=submit VALUE=\"".get_string("cancel")."\">";
+                    echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                    echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                    echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                    echo " <INPUT TYPE=submit VALUE=\"".get_string("cancel")."\" />";
                     echo "</FORM>";
                     echo "</TD></TR></TABLE>";
                 } else {
@@ -474,10 +474,10 @@
                 }
 
                 echo "<CENTER><FORM ACTION=\"".$ME."\" METHOD=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strok\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strok\" />";
                 echo "</FORM>";
                 echo "</CENTER>";
             } else {
@@ -520,11 +520,11 @@
                     }
                     echo "</table>";
                 }
-                echo "<br><center><form action=\"".$ME."\" method=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strok\">";
+                echo "<br /><center><form action=\"".$ME."\" method=get>";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strok\" />";
                 echo "</FORM>";
                 echo "</CENTER>";
             } else {
@@ -636,7 +636,7 @@ function printfilelist($filelist) {
 
     foreach ($filelist as $file) {
         if (is_dir($basedir.$file)) {
-            echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=16 width=16> $file<br>";
+            echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=16 width=16> $file<br />";
             $subfilelist = array();
             $currdir = opendir($basedir.$file);
             while ($subfile = readdir($currdir)) { 
@@ -648,7 +648,7 @@ function printfilelist($filelist) {
 
         } else { 
             $icon = mimeinfo("icon", $file);
-            echo "<img src=\"$CFG->pixpath/f/$icon\"  height=16 width=16> $file<br>";
+            echo "<img src=\"$CFG->pixpath/f/$icon\"  height=16 width=16> $file<br />";
         }
     }
 }
@@ -733,7 +733,7 @@ function displaydir ($wdir) {
     
             echo "<TR>";
 
-            print_cell("center", "<INPUT TYPE=checkbox NAME=\"file$count\" VALUE=\"$fileurl\">");
+            print_cell("center", "<INPUT TYPE=checkbox NAME=\"file$count\" VALUE=\"$fileurl\" />");
             print_cell("left", "<A HREF=\"".basename($ME)."?id=$id&wdir=$fileurl\"><IMG SRC=\"$CFG->pixpath/f/folder.gif\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"Folder\"></A> <A HREF=\"".basename($ME)."?id=$id&wdir=$fileurl\">".htmlspecialchars($dir)."</A>");
             print_cell("right", "-");
             print_cell("right", $filedate);
@@ -770,7 +770,7 @@ function displaydir ($wdir) {
 
             echo "<tr>";
 
-            print_cell("center", "<input type=\"checkbox\" name=\"file$count\" value=\"$fileurl\">");
+            print_cell("center", "<input type=\"checkbox\" name=\"file$count\" value=\"$fileurl\" />");
 
             echo "<td align=left nowrap>";
             link_to_popup_window ($ffurl, "display", 
@@ -807,8 +807,8 @@ function displaydir ($wdir) {
 
     echo "<TABLE BORDER=0 cellspacing=2 cellpadding=2 width=640>";    
     echo "<TR><TD>";
-    echo "<INPUT TYPE=hidden NAME=id VALUE=\"$id\">";
-    echo "<INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\"> ";
+    echo "<INPUT TYPE=hidden NAME=id VALUE=\"$id\" />";
+    echo "<INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" /> ";
     $options = array (
                    "move" => "$strmovetoanotherfolder",
                    "delete" => "$strdeletecompletely",
@@ -822,26 +822,26 @@ function displaydir ($wdir) {
     echo "<TD ALIGN=center>";
     if (!empty($USER->fileop) and ($USER->fileop == "move") and ($USER->filesource <> $wdir)) {
         echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-        echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-        echo " <INPUT TYPE=hidden NAME=action VALUE=paste>";
-        echo " <INPUT TYPE=submit VALUE=\"$strmovefilestohere\">";
+        echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+        echo " <INPUT TYPE=hidden NAME=action VALUE=paste />";
+        echo " <INPUT TYPE=submit VALUE=\"$strmovefilestohere\" />";
         echo "</FORM>";
     }
     echo "<TD ALIGN=right>";
         echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-        echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-        echo " <INPUT TYPE=hidden NAME=action VALUE=mkdir>";
-        echo " <INPUT TYPE=submit VALUE=\"$strmakeafolder\">";
+        echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+        echo " <INPUT TYPE=hidden NAME=action VALUE=mkdir />";
+        echo " <INPUT TYPE=submit VALUE=\"$strmakeafolder\" />";
         echo "</FORM>";
     echo "</TD>";
     echo "<TD ALIGN=right>";
         echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-        echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-        echo " <INPUT TYPE=hidden NAME=action VALUE=upload>";
-        echo " <INPUT TYPE=submit VALUE=\"$struploadafile\">";
+        echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+        echo " <INPUT TYPE=hidden NAME=action VALUE=upload />";
+        echo " <INPUT TYPE=submit VALUE=\"$struploadafile\" />";
         echo "</FORM>";
     echo "</TD></TR>";
     echo "</TABLE>";
diff --git a/mod/scorm/details.php b/mod/scorm/details.php
index bbea86e5d2..cf30fcacac 100755
--- a/mod/scorm/details.php
+++ b/mod/scorm/details.php
@@ -260,7 +260,7 @@
         } else {
 ?>
     <center>
-           <input type="button" value="<?php print_string("continue") ?>" onClick="document.location='<?php echo $CFG->wwwroot ?>/course/view.php?id=<?php echo $course->id ?>';">
+           <input type="button" value="<?php print_string("continue") ?>" onClick="document.location='<?php echo $CFG->wwwroot ?>/course/view.php?id=<?php echo $course->id ?>';" />
         </center>
 <?php
     }
diff --git a/mod/scorm/mod.html b/mod/scorm/mod.html
index 8ad4671845..9148540b95 100755
--- a/mod/scorm/mod.html
+++ b/mod/scorm/mod.html
@@ -19,7 +19,7 @@
 	<tr valign=top>
 	    <td align=right><p><b><?php print_string("name") ?>:</b></p></td>
 	    <td>
-	        <input type="text" name="name" size=50 value="<?php p($form->name) ?>">
+	        <input type="text" name="name" size=50 value="<?php p($form->name) ?>" />
 	    </td>
 	</tr>
 <?php 
@@ -32,7 +32,7 @@
 	    </td>
 	    <td>
 	 	<?php
-	 	    echo "<input name=\"reference\" size=\"50\" value=\"$form->reference\">&nbsp;";
+	 	    echo "<input name=\"reference\" size=\"50\" value=\"$form->reference\" />&nbsp;";
 	 	    button_to_popup_window ("/mod/scorm/coursefiles.php?id=$course->id", 
 	 				    "coursefiles", $strchooseafile, 500, 750, $strchooseafile);
 	 	?>
@@ -55,21 +55,21 @@
 	    </td>
 	</tr>
     </table>
-    <input type="hidden" name=course	value="<?php p($form->course) ?>">
-    <input type="hidden" name=coursemodule	value="<?php p($form->coursemodule) ?>">
-    <input type="hidden" name=datadir	value="<?php p($form->datadir) ?>">
-    <input type="hidden" name=launch	value="<?php p($form->launch) ?>">
-    <input type="hidden" name=popup	value="<?php p($form->popup) ?>">
-    <input type="hidden" name=auto	value="<?php p($form->auto) ?>">
+    <input type="hidden" name=course	value="<?php p($form->course) ?>" />
+    <input type="hidden" name=coursemodule	value="<?php p($form->coursemodule) ?>" />
+    <input type="hidden" name=datadir	value="<?php p($form->datadir) ?>" />
+    <input type="hidden" name=launch	value="<?php p($form->launch) ?>" />
+    <input type="hidden" name=popup	value="<?php p($form->popup) ?>" />
+    <input type="hidden" name=auto	value="<?php p($form->auto) ?>" />
     <input type="hidden" name="maxgrade"	value="<?php p($form->maxgrade) ?>" />
     <input type="hidden" name="grademethod"	value="<?php p($form->grademethod) ?>" />
-    <input type="hidden" name=section	value="<?php p($form->section) ?>">
-    <input type="hidden" name=module	value="<?php p($form->module) ?>">
-    <input type="hidden" name=modulename	value="<?php p($form->modulename) ?>">
-    <input type="hidden" name=instance	value="<?php p($form->instance) ?>">
-    <input type="hidden" name=mode		value="<?php p($form->mode) ?>">
-    <input type="hidden" name=destination	value="<?php echo $ME ?>">
+    <input type="hidden" name=section	value="<?php p($form->section) ?>" />
+    <input type="hidden" name=module	value="<?php p($form->module) ?>" />
+    <input type="hidden" name=modulename	value="<?php p($form->modulename) ?>" />
+    <input type="hidden" name=instance	value="<?php p($form->instance) ?>" />
+    <input type="hidden" name=mode		value="<?php p($form->mode) ?>" />
+    <input type="hidden" name=destination	value="<?php echo $ME ?>" />
     <center>
-	<input type="submit" value="<?php print_string("continue") ?>">
+	<input type="submit" value="<?php print_string("continue") ?>" />
     </center>
 </form>
diff --git a/mod/scorm/restorelib.php b/mod/scorm/restorelib.php
index f3e20f6187..7518b2bf4b 100755
--- a/mod/scorm/restorelib.php
+++ b/mod/scorm/restorelib.php
@@ -59,7 +59,7 @@
             //The structure is equal to the db, so insert the scorm
             $newid = insert_record ("scorm",$scorm);
             //Do some output     
-            echo "<ul><li>".get_string("modulename","scorm")." \"".$scorm->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","scorm")." \"".$scorm->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -130,7 +130,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -198,7 +198,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
diff --git a/mod/scorm/validatordomxml.php b/mod/scorm/validatordomxml.php
index 54c4ad21ad..f9f075866f 100755
--- a/mod/scorm/validatordomxml.php
+++ b/mod/scorm/validatordomxml.php
@@ -264,8 +264,8 @@ function testNode($DomNode)
                                   $error->data->tag = "metadata";
                                   array_push($errors, $error);
                                   //echo "WARNING, se il tag metadata non e' figlio di manifest non deve avere schema
-                                  //      come figlio <br>";
-			         //echo "Probabilmente la versione e' antecedente alla 1.3 <br>";
+                                  //      come figlio <br />";
+			         //echo "Probabilmente la versione e' antecedente alla 1.3 <br />";
 			        }
 			        if($new_t_scv < $t_scv)
                                 {
@@ -273,8 +273,8 @@ function testNode($DomNode)
                                   $error->data->tag = "metadata";
                                   array_push($errors, $error);
                                   //echo "WARNING, se il tag metadata non e' figlio di manifest, non deve avere schemaversion
-                                  //      come figlio <br>";
-			          //echo "Probabilmente la versione e' antecedente alla 1.3 <br>";
+                                  //      come figlio <br />";
+			          //echo "Probabilmente la versione e' antecedente alla 1.3 <br />";
                                 }
                             }
 			  }	
@@ -376,7 +376,7 @@ function testNode($DomNode)
 				$cont_err++;
                             } 
 			  }          
-			  //echo "<br> SCANSIONE DI LOCATION TERMINATA, OK \n";
+			  //echo "<br /> SCANSIONE DI LOCATION TERMINATA, OK \n";
 			}
 
 			if($nome_figlio == "organizations")
diff --git a/mod/survey/details.php b/mod/survey/details.php
index 31846cf2af..75e3577bd1 100644
--- a/mod/survey/details.php
+++ b/mod/survey/details.php
@@ -34,7 +34,7 @@
 
         <tr valign=top>
             <td align=right nowrap>
-                <p><b><?php print_string("introtext", "survey") ?>:</b></p><br>
+                <p><b><?php print_string("introtext", "survey") ?>:</b></p><br />
                 <font size="1">
                 <?php helpbutton("writing", get_string("helpwriting"), "moodle", true, true) ?> <br />
                 <?php helpbutton("text", get_string("helptext"), "moodle", true, true) ?> <br />
@@ -54,18 +54,18 @@
             </td>
         </tr>
         </table>
-        <input type="hidden" name=name       value="<?php p($form->name) ?>">
-        <input type="hidden" name=template   value="<?php p($form->template) ?>">
+        <input type="hidden" name=name       value="<?php p($form->name) ?>" />
+        <input type="hidden" name=template   value="<?php p($form->template) ?>" />
 
-        <input type="hidden" name=course     value="<?php p($form->course) ?>">
-        <input type="hidden" name=coursemodule     value="<?php p($form->coursemodule) ?>">
-        <input type="hidden" name=section       value="<?php p($form->section) ?>">
-        <input type="hidden" name=module     value="<?php p($form->module) ?>">
-        <input type="hidden" name=modulename value="<?php p($form->modulename) ?>">
-        <input type="hidden" name=instance   value="<?php p($form->instance) ?>">
-        <input type="hidden" name=mode       value="<?php p($form->mode) ?>">
+        <input type="hidden" name=course     value="<?php p($form->course) ?>" />
+        <input type="hidden" name=coursemodule     value="<?php p($form->coursemodule) ?>" />
+        <input type="hidden" name=section       value="<?php p($form->section) ?>" />
+        <input type="hidden" name=module     value="<?php p($form->module) ?>" />
+        <input type="hidden" name=modulename value="<?php p($form->modulename) ?>" />
+        <input type="hidden" name=instance   value="<?php p($form->instance) ?>" />
+        <input type="hidden" name=mode       value="<?php p($form->mode) ?>" />
         <center>
-        <input type="submit" value="<?php print_string("savechanges") ?>">
+        <input type="submit" value="<?php print_string("savechanges") ?>" />
         </center>
         </form>
         <?php
diff --git a/mod/survey/lib.php b/mod/survey/lib.php
index ee96418a70..c3a8a6238d 100644
--- a/mod/survey/lib.php
+++ b/mod/survey/lib.php
@@ -399,9 +399,9 @@ function survey_print_multi($question) {
             echo "<TD WIDTH=10 VALIGN=top><P><B>$qnum</B></P></TD>";
             echo "<TD VALIGN=top><P>$q->text</P></TD>";
             for ($i=1;$i<=$numoptions;$i++) {
-                echo "<TD WIDTH=10% ALIGN=CENTER><INPUT TYPE=radio NAME=q$P$q->id VALUE=$i></TD>";
+                echo "<TD WIDTH=10% ALIGN=CENTER><INPUT TYPE=radio NAME=q$P$q->id VALUE=$i /></TD>";
             }
-            echo "<TD BGCOLOR=white><INPUT TYPE=radio NAME=q$P$q->id VALUE=0 checked></TD>";
+            echo "<TD BGCOLOR=white><INPUT TYPE=radio NAME=q$P$q->id VALUE=0 checked=\"checked\" /></TD>";
             $checklist["q$P$q->id"] = $numoptions;
         
         } else {
@@ -409,17 +409,17 @@ function survey_print_multi($question) {
             echo "<TD WIDTH=10% NOWRAP><P><FONT SIZE=1>$stripreferthat&nbsp;</FONT></P></TD>";
             echo "<TD WIDTH=40% VALIGN=middle rowspan=2><P>$q->text</P></TD>";
             for ($i=1;$i<=$numoptions;$i++) {
-                echo "<TD WIDTH=10% ALIGN=CENTER><INPUT TYPE=radio NAME=qP$q->id VALUE=$i></TD>";
+                echo "<TD WIDTH=10% ALIGN=CENTER><INPUT TYPE=radio NAME=qP$q->id VALUE=$i /></TD>";
             }
-            echo "<TD BGCOLOR=\"$THEME->body\"><INPUT TYPE=radio NAME=qP$q->id VALUE=0 checked></TD>";
+            echo "<TD BGCOLOR=\"$THEME->body\"><INPUT TYPE=radio NAME=qP$q->id VALUE=0 checked=\"checked\" /></TD>";
             echo "</TR>";
 
             echo "<TR BGCOLOR=$bgcolor>";
             echo "<TD WIDTH=10% NOWRAP><P><FONT SIZE=1>$strifoundthat&nbsp;</P></TD>";
             for ($i=1;$i<=$numoptions;$i++) {
-                echo "<TD WIDTH=10% ALIGN=CENTER><INPUT TYPE=radio NAME=q$q->id VALUE=$i></TD>";
+                echo "<TD WIDTH=10% ALIGN=CENTER><INPUT TYPE=radio NAME=q$q->id VALUE=$i /></TD>";
             }
-            echo "<TD WIDTH=5% BGCOLOR=\"$THEME->body\"><INPUT TYPE=radio NAME=q$q->id VALUE=0 checked></TD>";
+            echo "<TD WIDTH=5% BGCOLOR=\"$THEME->body\"><INPUT TYPE=radio NAME=q$q->id VALUE=0 checked=\"checked\" /></TD>";
             $checklist["qP$q->id"] = $numoptions;
             $checklist["q$q->id"] = $numoptions;
         }
diff --git a/mod/survey/mod.html b/mod/survey/mod.html
index 06e8e9143d..001db3702d 100644
--- a/mod/survey/mod.html
+++ b/mod/survey/mod.html
@@ -16,7 +16,7 @@
 <tr valign=top>
     <td align=right><P><B><?php  print_string("surveyname", "survey") ?>:</B></P></TD>
     <td>
-        <input type="text" name="name" size=30 value="<?php p($form->name) ?>">
+        <input type="text" name="name" size=30 value="<?php p($form->name) ?>" />
     </td>
 </tr>
 <tr>
@@ -37,17 +37,17 @@
 </tr>
 </table>
 <CENTER>
-<input type="hidden" name=intro   value="<?php p($form->intro) ?>">
-<input type="hidden" name=destination   value="<?php echo "$CFG->wwwroot/course/mod.php" ?>">
+<input type="hidden" name=intro   value="<?php p($form->intro) ?>" />
+<input type="hidden" name=destination   value="<?php echo "$CFG->wwwroot/course/mod.php" ?>" />
 
-<input type="hidden" name=course     value="<?php p($form->course) ?>">
-<input type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>">
-<input type="hidden" name=section       value="<?php p($form->section) ?>">
-<input type="hidden" name=module     value="<?php p($form->module) ?>">
-<input type="hidden" name=modulename value="<?php p($form->modulename) ?>">
-<input type="hidden" name=instance   value="<?php p($form->instance) ?>">
-<input type="hidden" name=mode       value="<?php p($form->mode) ?>">
-<input type="submit" value="<?php print_string("savechanges") ?>">
-<input type="submit" name=cancel value="<?php print_string("cancel") ?>">
+<input type="hidden" name=course     value="<?php p($form->course) ?>" />
+<input type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>" />
+<input type="hidden" name=section       value="<?php p($form->section) ?>" />
+<input type="hidden" name=module     value="<?php p($form->module) ?>" />
+<input type="hidden" name=modulename value="<?php p($form->modulename) ?>" />
+<input type="hidden" name=instance   value="<?php p($form->instance) ?>" />
+<input type="hidden" name=mode       value="<?php p($form->mode) ?>" />
+<input type="submit" value="<?php print_string("savechanges") ?>" />
+<input type="submit" name=cancel value="<?php print_string("cancel") ?>" />
 </CENTER>
 </FORM>
diff --git a/mod/survey/report.php b/mod/survey/report.php
index fbdf83dd88..53e93fd01f 100644
--- a/mod/survey/report.php
+++ b/mod/survey/report.php
@@ -144,7 +144,7 @@
                     }
                     echo "<p align=center><a title=\"$strseemoredetail\" href=report.php?action=questions&id=$id&qid=$question->multi>";
                     survey_print_graph("id=$id&qid=$question->id&group=$currentgroup&type=multiquestion.png");
-                    echo "</a></p><br>";
+                    echo "</a></p><br />";
                 } 
             }
         }
@@ -354,7 +354,7 @@
                      echo "<p align=center>";
                      echo "<a title=\"$strseemoredetail\" href=report.php?action=questions&id=$id&qid=$question->multi>";
                      survey_print_graph("id=$id&qid=$question->id&sid=$student&type=studentmultiquestion.png");
-                     echo "</a></p><br>";
+                     echo "</a></p><br />";
                  } 
              }
          }        
@@ -387,11 +387,11 @@
          echo "<blockquote>";
          echo "<textarea name=notes rows=10 cols=60>";
          p($notes);
-         echo "</textarea><br>";
-         echo "<input type=hidden name=action value=student>";
-         echo "<input type=hidden name=student value=$student>";
-         echo "<input type=hidden name=id value=$cm->id>";
-         echo "<input type=submit value=\"".get_string("savechanges")."\">";
+         echo "</textarea><br />";
+         echo "<input type=hidden name=action value=student />";
+         echo "<input type=hidden name=student value=\"$student\" />";
+         echo "<input type=hidden name=id value=\"$cm->id\" />";
+         echo "<input type=submit value=\"".get_string("savechanges")."\" />";
          echo "</blockquote>";
          echo "</form>";
          echo "</center>";
diff --git a/mod/survey/restorelib.php b/mod/survey/restorelib.php
index d8eeda7c0f..aa54474eb8 100644
--- a/mod/survey/restorelib.php
+++ b/mod/survey/restorelib.php
@@ -53,7 +53,7 @@
             $newid = insert_record ("survey",$survey);
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","survey")." \"".$survey->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","survey")." \"".$survey->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -125,7 +125,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -181,7 +181,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";       
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -277,7 +277,7 @@
             $status = true;
             break;
         default:
-            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br>";                 //Debug
+            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br />";                 //Debug
             break;
         }
 
diff --git a/mod/survey/view.php b/mod/survey/view.php
index 2054db176c..621021dcfd 100644
--- a/mod/survey/view.php
+++ b/mod/survey/view.php
@@ -100,7 +100,7 @@
     add_to_log($course->id, "survey", "view form", "view.php?id=$cm->id", $survey->id, $cm->id);
 
     echo "<form name=form method=post action=save.php>";
-    echo "<input type=hidden name=id value=$id>";
+    echo "<input type=hidden name=id value=\"$id\" />";
 
     print_simple_box(format_text($survey->intro), "center", "80%");
 
@@ -176,14 +176,14 @@ function checkform() {
     }
 }
 
-<?php echo "document.write('<INPUT TYPE=button VALUE=\"".get_string("clicktocontinuecheck", "survey")."\" onClick=\"checkform()\">');";  ?>
+<?php echo "document.write('<INPUT TYPE=button VALUE=\"".get_string("clicktocontinuecheck", "survey")."\" onClick=\"checkform()\" />');";  ?>
 
 // END -->
 </SCRIPT>
 
 <noscript>
     <!-- Without Javascript, no checking is done -->
-    <input type="submit" value="<?php  get_string("clicktocontinue", "survey") ?>">
+    <input type="submit" value="<?php  get_string("clicktocontinue", "survey") ?>" />
 </noscript>
 
 </center>
diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php
index e5d615fa6e..91c1d56d87 100644
--- a/mod/wiki/admin.php
+++ b/mod/wiki/admin.php
@@ -153,7 +153,7 @@
         case "removepages": 
             if($form->proceed) {            
               if(!$confirm && $form->pagestodelete) {
-                notice_yesno(get_string("removepagecheck", "wiki")."<br>".join(", ", $form->pagestodelete),
+                notice_yesno(get_string("removepagecheck", "wiki")."<br />".join(", ", $form->pagestodelete),
                   $link."&confirm=".urlencode(join(" ",$form->pagestodelete)), $link);       
                 print_footer($course);
                 exit;
@@ -171,7 +171,7 @@
                   $confirm.="&confirm[$cnfid]=".urlencode(join(" ",$cnfver));
                 }
                 if(count($err)==0) {
-                  notice_yesno(get_string("strippagecheck", "wiki")."<br>".join(", ", $form->pagestostrip),
+                  notice_yesno(get_string("strippagecheck", "wiki")."<br />".join(", ", $form->pagestostrip),
                       $link.$confirm, $link);       
                   print_footer($course);
                   exit;
@@ -203,7 +203,7 @@
                            "&confirm[deleteversions]=".urlencode($form->deleteversions);
                   $revertedpages=wiki_admin_revert("", $form->authorfieldpattern, $form->changesfield, $form->howtooperate, $form->deleteversions);
                   if($revertedpages) {
-                    notice_yesno(get_string("revertpagescheck", "wiki")."<br>".$revertedpages,
+                    notice_yesno(get_string("revertpagescheck", "wiki")."<br />".$revertedpages,
                       $link.$confirm, $link);       
                     print_footer($course);
                     exit;                
@@ -244,7 +244,7 @@
            exit;        
         case "checklinks":
            $ret=wiki_admin_checklinks($confirm);
-           redirect($redirect, get_string("linkschecked","wiki")."<br>".$ret, 5);
+           redirect($redirect, get_string("linkschecked","wiki")."<br />".$ret, 5);
            exit;        
         case "revertpages":
            $revertedpages=wiki_admin_revert(1, $confirm["authorfieldpattern"], $confirm["changesfield"], $confirm["howtooperate"], $confirm["deleteversions"]);
diff --git a/mod/wiki/checklinks.html b/mod/wiki/checklinks.html
index 6b08ac4ac9..6891caa706 100644
--- a/mod/wiki/checklinks.html
+++ b/mod/wiki/checklinks.html
@@ -3,14 +3,14 @@
 
 ?>
 <FORM ACTION="admin.php" METHOD="POST" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="userid" VALUE="<? print $userid; ?>">
-<INPUT TYPE="HIDDEN" NAME="groupid" VALUE="<? print $groupid ?>">
-<INPUT TYPE="HIDDEN" NAME="action" VALUE="<? print $action; ?>">
-<INPUT TYPE="HIDDEN" NAME="id" VALUE="<? print $cm->id ?>">
-<INPUT TYPE="HIDDEN" NAME="wikipage" VALUE="<? print $wikipage?>">
+<INPUT TYPE="HIDDEN" NAME="userid" VALUE="<? print $userid; ?>" />
+<INPUT TYPE="HIDDEN" NAME="groupid" VALUE="<? print $groupid ?>" />
+<INPUT TYPE="HIDDEN" NAME="action" VALUE="<? print $action; ?>" />
+<INPUT TYPE="HIDDEN" NAME="id" VALUE="<? print $cm->id ?>" />
+<INPUT TYPE="HIDDEN" NAME="wikipage" VALUE="<? print $wikipage?>" />
 <? 
   $pagelist=wiki_admin_checklinks_list();
   choose_from_menu($pagelist, "pagetocheck", $wikipage, "");
 ?>
-  <input type="submit" name="proceed" value="<? print get_string("checklinks","wiki"); ?>">
+  <input type="submit" name="proceed" value="<? print get_string("checklinks","wiki"); ?>" />
 </center>
\ No newline at end of file
diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php
index 8d2dec24ec..656364780b 100644
--- a/mod/wiki/ewiki/ewiki.php
+++ b/mod/wiki/ewiki/ewiki.php
@@ -235,7 +235,7 @@
 		"<" => "&lt;",
            ),
            "wm_source" => array(
-		"%%%" => "<br>",
+		"%%%" => "<br />",
 		"\t" => "        ",
 		"\n;:" => "\n      ",   # workaround, replaces the old ;:
            ),
@@ -341,8 +341,8 @@
 	   "EDIT_FORM_1" => "<a href=\"".EWIKI_SCRIPT."GoodStyle\">GoodStyle</a> is to
 		write what comes to your mind. Don't care about how it
 		looks too much now. You can add <a href=\"".EWIKI_SCRIPT."WikiMarkup\">WikiMarkup</a>
-		also later if you think it is necessary.<br>",
-	   "EDIT_FORM_2" => "<br>Please do not write things, which may make other
+		also later if you think it is necessary.<br />",
+	   "EDIT_FORM_2" => "<br />Please do not write things, which may make other
 		people angry. And please keep in mind that you are not all that
 		anonymous in the internet (find out more about your computers
 		'<a href=\"http://google.com/search?q=my+computers+IP+address\">IP address</a>' at Google).",
@@ -378,8 +378,8 @@
            "EDIT_FORM_1" => "<a href=\"".EWIKI_SCRIPT."BuenEstilo\">BuenEstilo</a> es
 		escribir lo que viene a su mente. No se preocupe mucho
 		por la apariencia. También puede agregar <a href=\"".EWIKI_SCRIPT."ReglasDeMarcadoWiki\">ReglasDeMarcadoWiki</a>
-		más adelante si piensa que es necesario.<br>",
-           "EDIT_FORM_2" => "<br>Por favor no escriba cosas, que puedan
+		más adelante si piensa que es necesario.<br />",
+           "EDIT_FORM_2" => "<br />Por favor no escriba cosas, que puedan
 		enfadar a otras personas. Y por favor tenga en mente que
 		usted no es del todo anónimo en Internet 
 		(encuentre más sobre 
@@ -406,7 +406,7 @@
 		zurück und speichere Deine Änderungen in der Zwischenablage
 		(Bearbeiten->Kopieren) um sie dann wieder an der richtigen
 		Stelle einzufügen, nachdem du die EditBoxSeite nocheinmal
-		geladen hast.<br>
+		geladen hast.<br />
 		Vielen Dank für Deine Mühe.",
 	   "ERRORSAVING" => "Beim Abspeichern ist ein Fehler aufgetreten. Bitte versuche es erneut.",
 	   "THANKSFORCONTRIBUTION" => "Vielen Dank für Deinen Beitrag!",
@@ -421,8 +421,8 @@
 		Sinn kommt. Du solltest dich jetzt noch nicht so sehr
 		darum kümmern, wie die Seite aussieht. Du kannst später
 		immernoch zurückkommen und den Text mit <a href=\"".EWIKI_SCRIPT."FormatierungsRegeln\">WikiTextFormatierungsRegeln</a>
-		aufputschen.<br>",
-	   "EDIT_FORM_2" => "<br>Bitte schreib keine Dinge, die andere Leute
+		aufputschen.<br />",
+	   "EDIT_FORM_2" => "<br />Bitte schreib keine Dinge, die andere Leute
 		verärgern könnten. Und bedenke auch, daß es schnell auf
 		dich zurückfallen kann wenn du verschiedene andere Dinge sagst (mehr Informationen zur
 		'<a href=\"http://google.de/search?q=computer+IP+adresse\">IP Adresse</a>'
@@ -734,7 +734,7 @@ function ewiki_page_view($id, &$data, $action, $all=1) {
    /// Add Moodle filters to text porion of wiki.
    global $moodle_format;   // from wiki/view.php
    $o = format_text($o, $moodle_format);
-   $o.= "<br><br>";
+   $o.= "<br /><br />";
 
    #-- control line + other per-page info stuff
    if ($pf_a = $ewiki_plugins["view_append"]) {
@@ -1006,7 +1006,7 @@ function ewiki_list_pages($pages=array(), $limit=EWIKI_LIST_LIMIT,
       $o = $pf_list($lines);
    }
    elseif($lines) {
-      $o = "&middot; " . implode("<br>\n&middot; ", $lines) . "<br>\n";
+      $o = "&middot; " . implode("<br />\n&middot; ", $lines) . "<br />\n";
    }
 
    return($o);
@@ -1087,8 +1087,8 @@ function ewiki_page_search($id, &$data, $action) {
    if (! ($q = @$_REQUEST["q"])) {
 
       $o .= '<form action="' . ewiki_script("", $id) . '" method="POST">';
-      $o .= '<input name="q" size="30"><br><br>';
-      $o .= '<input type="submit" value="'.$id.'">';
+      $o .= '<input name="q" size="30" /><br /><br />';
+      $o .= '<input type="submit" value="'.$id.'" />';
       $o .= '</form>';
    }
    else {
@@ -1189,7 +1189,7 @@ function ewiki_page_info($id, &$data, $action) {
             continue;  // MOODLE DOESN'T USE IT
             $str = "";
             if ($first && $value) { foreach ($value as $n=>$d) {
-               $str .= htmlentities("$n: $d") . "<br>\n";
+               $str .= htmlentities("$n: $d") . "<br />\n";
             } }
             $value = $str;
          }
@@ -1269,7 +1269,7 @@ function ewiki_page_info($id, &$data, $action) {
 
    #-- page result split
    if ($v >= 1) {
-      $o .= "<br>\n show " . ewiki_chunked_page($this, $id, -1, $v+1, 1) . "\n <br>";
+      $o .= "<br />\n show " . ewiki_chunked_page($this, $id, -1, $v+1, 1) . "\n <br />";
    }
 
    return($o);
@@ -1399,7 +1399,7 @@ function ewiki_page_edit($id, $data, $action) {
 
             if (!$pf || !$pf($id, $data)) {
                $error = 1;
-               $o .= ewiki_t("ERRVERSIONSAVE") . "<br><br>";
+               $o .= ewiki_t("ERRVERSIONSAVE") . "<br /><br />";
             }
 
          }
@@ -1442,7 +1442,7 @@ function ewiki_page_edit($id, $data, $action) {
                #-- prevent double saving, when ewiki_page() is re-called
                $_REQUEST = $_GET = $_POST = array();
 
-               $o = ewiki_t("THANKSFORCONTRIBUTION") . "<br><br>";
+               $o = ewiki_t("THANKSFORCONTRIBUTION") . "<br /><br />";
                $o .= ewiki_page($id);
 
                if (EWIKI_EDIT_REDIRECT) {
@@ -1529,7 +1529,7 @@ function ewiki_page_edit_form(&$id, &$data, &$hidden_postdata) {
 
    #-- additional POST vars
    foreach ($hidden_postdata as $name => $value) {
-       $o .= '<input type="hidden" name="'.$name.'" value="'.$value.'">'."\n";
+       $o .= '<input type="hidden" name="'.$name.'" value="'.$value.'" />'."\n";
    }
 
    if (EWIKI_CHARSET=="UTF-8") {
@@ -1564,10 +1564,10 @@ function ewiki_page_edit_form(&$id, &$data, &$hidden_postdata) {
    }
 
    ##### BEGIN MOODLE ADDITION (Cancel Editing into Button) #####
-   $o .= "\n<br>\n"
-      . '<input type="submit" name="save" value="'. ewiki_t("SAVE") . '">'."\n"
-      . '<input type="submit" name="preview" value="'. ewiki_t("PREVIEW") . '">' . "\n"
-      . '<input type="submit" name="canceledit" value="'. ewiki_t("CANCEL_EDIT") . '">' . "\n";
+   $o .= "\n<br />\n"
+      . '<input type="submit" name="save" value="'. ewiki_t("SAVE") . '" />'."\n"
+      . '<input type="submit" name="preview" value="'. ewiki_t("PREVIEW") . '" />' . "\n"
+      . '<input type="submit" name="canceledit" value="'. ewiki_t("CANCEL_EDIT") . '" />' . "\n";
 #      . ' &nbsp; <a href="'. ewiki_script("", $id) . '">' . ewiki_t("CANCEL_EDIT") . '</a>';
    ##### END MOODLE ADDITION #####
 
@@ -1587,15 +1587,15 @@ function ewiki_page_edit_form(&$id, &$data, &$hidden_postdata) {
 #-- pic upload form
 function ewiki_page_edit_form_final_imgupload(&$o, &$id, &$data, &$action) {
    if (EWIKI_SCRIPT_BINARY && EWIKI_UP_UPLOAD && EWIKI_IMAGE_MAXSIZE) {
-      $o .= "\n<br>\n". '<div class="image-upload">'
+      $o .= "\n<br />\n". '<div class="image-upload">'
       . '<form action='
       . '"'. ewiki_script_binary("", EWIKI_IDF_INTERNAL, "", "_UPLOAD=1") .'"'
       . ' method="POST" enctype="multipart/form-data" target="_upload">'
       . '<input type="file" name="'.EWIKI_UP_UPLOAD.'"'
-      . (defined("EWIKI_IMAGE_ACCEPT") ? ' accept="'.EWIKI_IMAGE_ACCEPT.'">' : "")
-      . '<input type="hidden" name="'.EWIKI_UP_BINARY.'" value="'.EWIKI_IDF_INTERNAL.'">'
+      . (defined("EWIKI_IMAGE_ACCEPT") ? ' accept="'.EWIKI_IMAGE_ACCEPT.'" />' : "")
+      . '<input type="hidden" name="'.EWIKI_UP_BINARY.'" value="'.EWIKI_IDF_INTERNAL.'" />'
       . '&nbsp;&nbsp;&nbsp;'
-      . '<input type="submit" value="'.ewiki_t("UPLOAD_PICTURE_BUTTON").'">'
+      . '<input type="submit" value="'.ewiki_t("UPLOAD_PICTURE_BUTTON").'" />'
       . '</form></div>'. "\n";
   }
 }
@@ -1607,9 +1607,9 @@ function ewiki_page_edit_preview(&$data) {
    $preview_text=$GLOBALS["ewiki_plugins"]["render"][0]($_REQUEST["content"], 1, EWIKI_ALLOW_HTML || (@$data["flags"]&EWIKI_DB_F_HTML));
    return( '<div class="preview">'
            . "<hr noshade>"
-           . "<div align=\"right\">" . ewiki_t("PREVIEW") . "</div><hr noshade><br>\n"
+           . "<div align=\"right\">" . ewiki_t("PREVIEW") . "</div><hr noshade><br />\n"
            . format_text($preview_text, $moodle_format)
-           . "<br><br><hr noshade><br>"
+           . "<br /><br /><hr noshade><br />"
            . "</div>"
    );
 #### END MOODLE CHANGES   
@@ -1628,15 +1628,15 @@ function ewiki_control_links($id, &$data, $action) {
 
    $o = "\n"
       . '<div align="right" class="action-links control-links">'
-      . "\n<br>\n"
+      . "\n<br />\n"
       . "<hr noshade>" . "\n";
 
    if (@$data["forced_version"]) {
 
       $o .= '<form action="' . ewiki_script("edit", $id) . '" method="POST">' .
-            '<input type="hidden" name="edit" value="old">' .
-            '<input type="hidden" name="version" value="'.$data["forced_version"].'">' .
-            '<input type="submit" value="' . ewiki_t("OLDVERCOMEBACK") . '"></form> ';
+            '<input type="hidden" name="edit" value="old" />' .
+            '<input type="hidden" name="version" value="'.$data["forced_version"].'" />' .
+            '<input type="submit" value="' . ewiki_t("OLDVERCOMEBACK") . '" /></form> ';
    }
    else {
       foreach ($action_links as $action => $title)
@@ -2540,9 +2540,9 @@ function ewiki_binary($break=0) {
 <html><head><title>File/Picture Upload</title><script language="JavaScript" type="text/javascript"><!--
  opener.document.forms["ewiki"].elements["content"].value += "\\nUPLOADED PICTURE: [$id$title]\\n";
  window.setTimeout("self.close()", 5000);
-//--></script></head><body bgcolor="#440707" text="#FFFFFF">Your uploaded file was saved as<br><big><b>
+//--></script></head><body bgcolor="#440707" text="#FFFFFF">Your uploaded file was saved as<br /><big><b>
 [$id]
-</b></big>.<br><br><noscript>Please copy this &uarr; into the text input box:<br>select/mark it with your mouse, press [Ctrl]+[Insert], go back<br>to the previous screen and paste it into the textbox by pressing<br>[Shift]+[Insert] inside there.</noscript></body></html>
+</b></big>.<br /><br /><noscript>Please copy this &uarr; into the text input box:<br />select/mark it with your mouse, press [Ctrl]+[Insert], go back<br />to the previous screen and paste it into the textbox by pressing<br />[Shift]+[Insert] inside there.</noscript></body></html>
 EOF;
       }
    }
@@ -3018,7 +3018,7 @@ function ewiki_auth($id, &$data, $action, $ring=false, $request_auth=0) {
    $ok = true;
    $ewiki_errmsg="";
 
-#echo "_a($id,dat,$action,$ring,$request_auth)<br>\n";
+#echo "_a($id,dat,$action,$ring,$request_auth)<br />\n";
 
    if (EWIKI_PROTECTED_MODE) {
  
@@ -3169,7 +3169,7 @@ function ewiki_eventually_initialize(&$id, &$data, &$action) {
          closedir($dh);
         }
         else {
-         echo "<b>ewiki error</b>: could not read from directory ". realpath($path) ."<br>\n";
+         echo "<b>ewiki error</b>: could not read from directory ". realpath($path) ."<br />\n";
         }
       }
 #### END MOODLE CHANGE
diff --git a/mod/wiki/ewiki/plugins/aview/backlinks.php b/mod/wiki/ewiki/plugins/aview/backlinks.php
index 9977548f1b..110dbaf477 100755
--- a/mod/wiki/ewiki/plugins/aview/backlinks.php
+++ b/mod/wiki/ewiki/plugins/aview/backlinks.php
@@ -15,7 +15,7 @@ function ewiki_view_append_backlinks($id, $data, $action) {
     foreach ($pages as $id) {
         $o .= ' <a href="'.ewiki_script("",$id).'">'.$id.'</a>';
     }
-    ($o) && ($o = "<div class=\"wiki_backlinks\"><small>".get_string('backlinks', 'wiki').":</small><br>$o</div>\n");
+    ($o) && ($o = "<div class=\"wiki_backlinks\"><small>".get_string('backlinks', 'wiki').":</small><br />$o</div>\n");
     
     return($o);
 }
diff --git a/mod/wiki/ewiki/plugins/aview/downloads.php b/mod/wiki/ewiki/plugins/aview/downloads.php
index c74e72ffdc..efb744ae19 100644
--- a/mod/wiki/ewiki/plugins/aview/downloads.php
+++ b/mod/wiki/ewiki/plugins/aview/downloads.php
@@ -19,7 +19,7 @@ $ewiki_t["de"]["ATTACHMENTS"] = "Anh
 
 function ewiki_view_append_attachments($id, $data, $action) {
 
-   $o = '<hr><h4><a href="' . ewiki_script(EWIKI_ACTION_ATTACHMENTS, $id) .
+   $o = '<hr /><h4><a href="' . ewiki_script(EWIKI_ACTION_ATTACHMENTS, $id) .
         '">' . ewiki_t("ATTACHMENTS") . '</a></h4>';
 
    $scan = 's:7:"section";' . serialize($id);
diff --git a/mod/wiki/ewiki/plugins/email_protect.php b/mod/wiki/ewiki/plugins/email_protect.php
index 55cfc15afe..e7673079a1 100644
--- a/mod/wiki/ewiki/plugins/email_protect.php
+++ b/mod/wiki/ewiki/plugins/email_protect.php
@@ -118,21 +118,21 @@
 
              (empty($url)) and ($url = ewiki_script("", EWIKI_PAGE_EMAIL));
 
-             $html .= ewiki_t($text) . "<br><br><br>\n";
+             $html .= ewiki_t($text) . "<br /><br /><br />\n";
 
              $html .= '<form action="' . $url .
                       '" method="POST" enctype="multipart/form-data" encoding="iso-8859-1">';
-             $html .= '<input type="hidden" name="'.EWIKI_UP_ENCEMAIL.'" value="' . $email . '">';
+             $html .= '<input type="hidden" name="'.EWIKI_UP_ENCEMAIL.'" value="' . $email . '" />';
              foreach (array_merge($_GET, $_POST) as $var=>$value) {
                 if (($var != "id") && ($var != EWIKI_UP_ENCEMAIL) && ($var != EWIKI_UP_NOSPAMBOT)) {
-                   $html .= '<input type="hidden" name="' . htmlentities($var) . '" value="' . htmlentities($value) . '">';
+                   $html .= '<input type="hidden" name="' . htmlentities($var) . '" value="' . htmlentities($value) . '" />';
                 }
              }
-             $html .= '<input type="checkbox" name="'.EWIKI_UP_NOSPAMBOT.'" value="true"> ' . ewiki_t("PROTE4") . '<br><br>';
-             $html .= '<input type="submit" name="go"></form><br><br>';
+             $html .= '<input type="checkbox" name="'.EWIKI_UP_NOSPAMBOT.'" value="true" /> ' . ewiki_t("PROTE4") . '<br /><br />';
+             $html .= '<input type="submit" name="go" /></form><br /><br />';
 
              if (EWIKI_FAKE_EMAIL_LOOP) {
-                $html .= "\n" . ewiki_t("PROTE7") . "<br>\n";
+                $html .= "\n" . ewiki_t("PROTE7") . "<br />\n";
                 $html .= ewiki_email_protect_feedbots();
              }
 
@@ -141,7 +141,7 @@
 
              $email = ewiki_email_protect_encode($email, -1);
 
-             $html .= ewiki_t("PROTE6") . "<br>";
+             $html .= ewiki_t("PROTE6") . "<br />";
              $html .= '<a href="mailto:' . $email . '">' . $email . '</a>';
 
              if (EWIKI_HTTP_HEADERS && empty($_COOKIE[EWIKI_UP_NOSPAMBOT])) {
@@ -276,13 +276,13 @@
     $html .= '<a href="mailto:'.$traps[rand(0, $n_trp)].'">'.$traps[rand(0, $n_trp)].'</a>';
 
     if (($rl = 1 + @$_REQUEST[EWIKI_UP_REQUESTLV]) < EWIKI_FAKE_EMAIL_LOOP) {
-       $html .= ",\n" . '<br><a href="' .
+       $html .= ",\n" . '<br /><a href="' .
              ewiki_script("", EWIKI_PAGE_EMAIL,
                array(
                   EWIKI_UP_ENCEMAIL=>ewiki_email_protect_encode($m, 1),
                   EWIKI_UP_REQUESTLV=>"$rl"
                )
-             ) . '">' . ewiki_t("PROTE5") . '</a><br>' . "\n";
+             ) . '">' . ewiki_t("PROTE5") . '</a><br />' . "\n";
        ($rl > 1) && sleep(3);
     }
 
diff --git a/mod/wiki/ewiki/plugins/init.php b/mod/wiki/ewiki/plugins/init.php
index 1f5ac26dbc..2359c5a9d0 100644
--- a/mod/wiki/ewiki/plugins/init.php
+++ b/mod/wiki/ewiki/plugins/init.php
@@ -36,23 +36,23 @@ function ewiki_initialization_wizard($id, &$data, &$action) {
       elseif (empty($_REQUEST["init"])) {
 
          $o = "<h2>WikiSetupWizard</h2>\n";
-         $o .= "You don't have any pages in your Wiki yet, so we should try to read-in the default ones from <tt>init-pages/</tt> now.<br><br>";
+         $o .= "You don't have any pages in your Wiki yet, so we should try to read-in the default ones from <tt>init-pages/</tt> now.<br /><br />";
 
          $o .= '<a href="'.ewiki_script("",$id,array("init"=>"now")).'">[InitializeWikiDatabase]</a>';
          $o .= " &nbsp; ";
          $o .= '<a href="'.ewiki_script("",$id,array("abort"=>"this")).'">[NoThanks]</a>';
-         $o .= "<br><br>";
+         $o .= "<br /><br />";
 
          #-- analyze and print settings and misconfigurations
          $pf_db = $ewiki_plugins["database"][0];
          $db = substr($pf_db, strrpos($pf_db, "_") + 1);
          $o .= '<table border="0" width="90%" class="diagnosis">';
          $o .= '<tr><td>DatabaseBackend</td><td>';
-         $o .= "<b>" . $db . "</b><br>";
+         $o .= "<b>" . $db . "</b><br />";
          if ($db == "files") {
             $o .= "<small>_DBFILES_DIR='</small><tt>" . EWIKI_DBFILES_DIRECTORY . "'</tt>";
             if (strpos(EWIKI_DBFILES_DIRECTORY, "tmp")) {
-               $o .= "<br><b>Warning</b>: Storing your pages into a temporary directory is not what you want (there they would get deleted randomly), except for testing purposes of course. See the README.";
+               $o .= "<br /><b>Warning</b>: Storing your pages into a temporary directory is not what you want (there they would get deleted randomly), except for testing purposes of course. See the README.";
             }
          }
          else {
@@ -65,10 +65,10 @@ function ewiki_initialization_wizard($id, &$data, &$action) {
 
          #-- more diagnosis 
          if (ini_get("magic_quotes")) {
-            $o.= "<b>Warning</b>: Your PHP interpreter has enabled the ugly and outdated '<i>magic_quotes</i>'. This will lead to problems, so please ask your provider to correct it; or fix it yourself with .htaccess settings as documented in the README. Otherwise don't forget to include() the <tt>fragments/strip_wonderful_slashes.php</tt> (it's ok to proceed for the moment).<br><br>";
+            $o.= "<b>Warning</b>: Your PHP interpreter has enabled the ugly and outdated '<i>magic_quotes</i>'. This will lead to problems, so please ask your provider to correct it; or fix it yourself with .htaccess settings as documented in the README. Otherwise don't forget to include() the <tt>fragments/strip_wonderful_slashes.php</tt> (it's ok to proceed for the moment).<br /><br />";
          }
          if (ini_get("register_globals")) {
-            $o.= "<b>Security warning</b>: The horrible '<i>register_globals</i>' setting is enabled. Without always using <tt>fragments/strike_register_globals.php</tt> or letting your provider fix that, you could get into trouble some day.<br><br>";
+            $o.= "<b>Security warning</b>: The horrible '<i>register_globals</i>' setting is enabled. Without always using <tt>fragments/strike_register_globals.php</tt> or letting your provider fix that, you could get into trouble some day.<br /><br />";
          }
 
          return('<div class="wiki view WikiSetupWizard">' . $o . '</div>');
@@ -103,7 +103,7 @@ function ewiki_initialization_wizard($id, &$data, &$action) {
             closedir($dh);
          }
          else {
-            return("<b>ewiki error</b>: could not read from directory ". realpath($path) ."<br>\n");
+            return("<b>ewiki error</b>: could not read from directory ". realpath($path) ."<br />\n");
          }
 
          #-- try to view/ that newly inserted page
diff --git a/mod/wiki/ewiki/plugins/markup/footnotes.php b/mod/wiki/ewiki/plugins/markup/footnotes.php
index 6f9021d893..8c853d04cd 100755
--- a/mod/wiki/ewiki/plugins/markup/footnotes.php
+++ b/mod/wiki/ewiki/plugins/markup/footnotes.php
@@ -52,7 +52,7 @@ function ewiki_format_source_footnotes (&$source) {
          $source .= "\n----";
       }
       $source .= "\n" .
-                 "<a name=\"fn$notenum\">·$notenum</a> ". $footnote . "\n<br>";
+                 "<a name=\"fn$notenum\">·$notenum</a> ". $footnote . "\n<br />";
       
    }
 }
diff --git a/mod/wiki/ewiki/plugins/moodle/diff.php b/mod/wiki/ewiki/plugins/moodle/diff.php
index 5e234167a2..9e444bd5d4 100755
--- a/mod/wiki/ewiki/plugins/moodle/diff.php
+++ b/mod/wiki/ewiki/plugins/moodle/diff.php
@@ -81,32 +81,32 @@
        $i2 = $i;
        while ($rm = $diff0[$i2++]) {          
           if($wiki->htmlmode == 2) {
-            $o .= "<b>-</b><font color=\"#990000\">$rm</font><br>\n";
+            $o .= "<b>-</b><font color=\"#990000\">$rm</font><br />\n";
           } else {
-            $o .= "<b>-</b><font color=\"#990000\"><tt>$rm</tt></font><br>\n";
+            $o .= "<b>-</b><font color=\"#990000\"><tt>$rm</tt></font><br />\n";
           }
           unset($diff0[$i2-1]);
        }
 
        if (in_array($line, $diff2)) {
           if($wiki->htmlmode == 2) {
-            $o .= "<b>+</b><font color=\"#009900\">$line</font><br>\n";
+            $o .= "<b>+</b><font color=\"#009900\">$line</font><br />\n";
           } else {
-            $o .= "<b>+</b><font color=\"#009900\"><tt>$line</tt></font><br>\n";
+            $o .= "<b>+</b><font color=\"#009900\"><tt>$line</tt></font><br />\n";
           }
        }
        else {
           if($wiki->htmlmode == 2) {
             $o .= "$line\n";
           } else {
-            $o .= "&nbsp; $line<br>\n";
+            $o .= "&nbsp; $line<br />\n";
           }
        }
 
     }
 
     foreach ($diff0 as $rm) {
-       $o .= "<b>-</b><font color=\"#990000\"> <tt>$rm</tt></font><br>\n";
+       $o .= "<b>-</b><font color=\"#990000\"> <tt>$rm</tt></font><br />\n";
     }
 
     return($o);
diff --git a/mod/wiki/ewiki/plugins/moodle/downloads.php b/mod/wiki/ewiki/plugins/moodle/downloads.php
index 628a12df09..d472b4adbc 100644
--- a/mod/wiki/ewiki/plugins/moodle/downloads.php
+++ b/mod/wiki/ewiki/plugins/moodle/downloads.php
@@ -47,45 +47,45 @@ $ewiki_upload_sections = array(
 
 
 #-- text, translations
-$ewiki_t["en"]["UPLOAD0"] = "Use this form to upload an arbitrary binary file into the wiki:<br>";
+$ewiki_t["en"]["UPLOAD0"] = "Use this form to upload an arbitrary binary file into the wiki:<br />";
 $ewiki_t["en"]["UPL_NEWNAM"] = "Save with different filename";
 $ewiki_t["en"]["UPL_INSECT"] = "Upload into section";
 $ewiki_t["en"]["UPL_TOOLARGE"] = "Your upload has been rejected, because that file was too large!";
-$ewiki_t["en"]["UPL_REJSECT"] = 'The given download section "$sect" has been rejected. Please only use the default ones, or tell the WikiAdmin to reenable per-page uploads; else others can\'t find your uploaded files easily.<br><br>';
-$ewiki_t["en"]["UPL_OK"] = "Your file was uploaded correctly, please see <a href=\"\$script".EWIKI_PAGE_DOWNLOAD."\">".EWIKI_PAGE_DOWNLOAD."</a>.<br><br>";
-$ewiki_t["en"]["UPL_ERROR"] = "We're sorry, but something went wrong during the file upload.<br><br>";
-$ewiki_t["en"]["DWNL_SEEUPL"] = 'See also <a href="$script'.EWIKI_PAGE_UPLOAD.'">FileUpload</a>, this page is only about downloading.<br><br>';
-$ewiki_t["en"]["DWNL_NOFILES"] = "No files uploaded yet.<br>\n";
+$ewiki_t["en"]["UPL_REJSECT"] = 'The given download section "$sect" has been rejected. Please only use the default ones, or tell the WikiAdmin to reenable per-page uploads; else others can\'t find your uploaded files easily.<br /><br />';
+$ewiki_t["en"]["UPL_OK"] = "Your file was uploaded correctly, please see <a href=\"\$script".EWIKI_PAGE_DOWNLOAD."\">".EWIKI_PAGE_DOWNLOAD."</a>.<br /><br />";
+$ewiki_t["en"]["UPL_ERROR"] = "We're sorry, but something went wrong during the file upload.<br /><br />";
+$ewiki_t["en"]["DWNL_SEEUPL"] = 'See also <a href="$script'.EWIKI_PAGE_UPLOAD.'">FileUpload</a>, this page is only about downloading.<br /><br />';
+$ewiki_t["en"]["DWNL_NOFILES"] = "No files uploaded yet.<br />\n";
 $ewiki_t["en"]["file"] = "File";
 $ewiki_t["en"]["of"] = "of";
 $ewiki_t["en"]["comment"] = "Comment";
 $ewiki_t["en"]["dwnl_section"] = "download section";
 $ewiki_t["en"]["DWNL_ENTRY_FORMAT"] =
-	'<div class="download"><a href="$url">$icon$title</a><small>$size<br>'.
-        'uploaded on <b>$time</b>, downloaded <tt>$hits</tt> times<br>'.
-        '(<a href="$url">$id</a>)<br>'.
+	'<div class="download"><a href="$url">$icon$title</a><small>$size<br />'.
+        'uploaded on <b>$time</b>, downloaded <tt>$hits</tt> times<br />'.
+        '(<a href="$url">$id</a>)<br />'.
         '$section'.'file is of type <tt>$type</tt>'.
-        '$comment'."</small></div><br>\n";
+        '$comment'."</small></div><br />\n";
 
-$ewiki_t["de"]["UPLOAD0"] = "Mit diesem Formular kannst du beliebige Dateien in das Wiki abspeichern:<br>";
+$ewiki_t["de"]["UPLOAD0"] = "Mit diesem Formular kannst du beliebige Dateien in das Wiki abspeichern:<br />";
 $ewiki_t["de"]["UPL_NEWNAM"] = "Mit unterschiedlichem Dateinamen speichern";
 $ewiki_t["de"]["UPL_INSECT"] = "Hochladen in Bereich:";
 $ewiki_t["de"]["UPL_TOOLARGE"] = "Deine Datei wurde nicht aufgenommen, weil sie zu groß war!";
-$ewiki_t["de"]["UPL_REJSECT"] = 'Der angegebene Download-Bereich "$sect" wird nicht verwendet. Bitte verwende einen von den voreingestellten Bereichen, damit Andere die Datei später auch finden können, oder frag den Administrator das Hochladen für beliebige Seiten zu aktivieren.<br><br>';
-$ewiki_t["de"]["UPL_OK"] = "Deine Datei wurde korrekt hochgeladen, sehe einfach auf der <a href=\"\$script".EWIKI_PAGE_DOWNLOAD."\">".EWIKI_PAGE_DOWNLOAD."</a> nach.<br><br>";
-$ewiki_t["de"]["UPL_ERROR"] = "'Tschuldige, aber irgend etwas ist während des Hochladens gründlich schief gelaufen.<br><br>";
-$ewiki_t["de"]["DWNL_SEEUPL"] = 'Siehe auch <a href="$script'.EWIKI_PAGE_UPLOAD.'">DateiHochladen</a>, auf dieser Seite stehen nur die Downloads.<br><br>';
-$ewiki_t["de"]["DWNL_NOFILES"] = "Noch keine Dateien hochgeladen.<br>\n";
+$ewiki_t["de"]["UPL_REJSECT"] = 'Der angegebene Download-Bereich "$sect" wird nicht verwendet. Bitte verwende einen von den voreingestellten Bereichen, damit Andere die Datei später auch finden können, oder frag den Administrator das Hochladen für beliebige Seiten zu aktivieren.<br /><br />';
+$ewiki_t["de"]["UPL_OK"] = "Deine Datei wurde korrekt hochgeladen, sehe einfach auf der <a href=\"\$script".EWIKI_PAGE_DOWNLOAD."\">".EWIKI_PAGE_DOWNLOAD."</a> nach.<br /><br />";
+$ewiki_t["de"]["UPL_ERROR"] = "'Tschuldige, aber irgend etwas ist während des Hochladens gründlich schief gelaufen.<br /><br />";
+$ewiki_t["de"]["DWNL_SEEUPL"] = 'Siehe auch <a href="$script'.EWIKI_PAGE_UPLOAD.'">DateiHochladen</a>, auf dieser Seite stehen nur die Downloads.<br /><br />';
+$ewiki_t["de"]["DWNL_NOFILES"] = "Noch keine Dateien hochgeladen.<br />\n";
 $ewiki_t["de"]["file"] = "Datei";
 $ewiki_t["de"]["of"] = "von";
 $ewiki_t["de"]["comment"] = "Kommentar";
 $ewiki_t["de"]["dwnl_section"] = "Download Bereich";
 $ewiki_t["de"]["DWNL_ENTRY_FORMAT"] =
-	'<div class="download"><a href="$url">$icon$title</a><small>$size<br>'.
-        'am <b>$time</b> hochgeladen, <tt>$hits</tt> mal abgerufen<br>'.
-        '(<a href="$url">$id</a>)<br>'.
+	'<div class="download"><a href="$url">$icon$title</a><small>$size<br />'.
+        'am <b>$time</b> hochgeladen, <tt>$hits</tt> mal abgerufen<br />'.
+        '(<a href="$url">$id</a>)<br />'.
         '$section'.'Datei ist vom Typ <tt>$type</tt>'.
-        '$comment'."</small></div><br>\n";
+        '$comment'."</small></div><br />\n";
 
 
 
@@ -105,10 +105,10 @@ function ewiki_page_fileupload($id, $data, $action, $def_sec="") {
             '<form action="' .
             ewiki_script( ($action!="view" ? $action : ""), $id).
             '" method="POST" enctype="multipart/form-data">' .
-            '<b>'.ewiki_t("file").'</b><br><input type="file" name="'.EWIKI_UP_UPLOAD.'"><br><br>' .
-            '<input type="submit" value="' . EWIKI_PAGE_UPLOAD . '"><br><br>';
+            '<b>'.ewiki_t("file").'</b><br /><input type="file" name="'.EWIKI_UP_UPLOAD.'" /><br /><br />' .
+            '<input type="submit" value="' . EWIKI_PAGE_UPLOAD . '" /><br /><br />';
 
-      $o .= '<b>' . ewiki_t("comment") . '</b><br><textarea name="comment" cols="35" rows="3"></textarea><br><br>';
+      $o .= '<b>' . ewiki_t("comment") . '</b><br /><textarea name="comment" cols="35" rows="3"></textarea><br /><br />';
 
       if (empty($ewiki_upload_sections[$def_sec])) {
          $ewiki_upload_sections[$def_sec] = $def_sec;
@@ -117,14 +117,14 @@ function ewiki_page_fileupload($id, $data, $action, $def_sec="") {
          if (empty($def_sec)) {
             $def_sec = $_REQUEST["section"];
          }
-         $o .= '<b>'.ewiki_t("UPL_INSECT").'</b><br><select name="section">';
+         $o .= '<b>'.ewiki_t("UPL_INSECT").'</b><br /><select name="section">';
          foreach ($ewiki_upload_sections as $id => $title) {
             $o .= '<option value="'.$id.'"' .($id==$def_sec?' selected':''). '>'.$title.'</option>';
          }
-         $o .= '</select><br><br>';
+         $o .= '</select><br /><br />';
       }
 
-      $o .= '<b>'.ewiki_t("UPL_NEWNAM").'</b><br><input type="text" name="new_filename" size="20"><br><br>';
+      $o .= '<b>'.ewiki_t("UPL_NEWNAM").'</b><br /><input type="text" name="new_filename" size="20" /><br /><br />';
 
       $o .= '</form></div>';
 
@@ -215,7 +215,7 @@ function ewiki_page_filedownload($id, $data, $action, $def_sec="") {
                "orderby"=>$orderby, "section" => $sec)) .
                '">' . $title . "</a>";
          }
-         $o .= '<div align="center" class="darker">'.implode(" &middot; ", $oa).'</div><br>';
+         $o .= '<div align="center" class="darker">'.implode(" &middot; ", $oa).'</div><br />';
       }
    }
 
@@ -263,7 +263,7 @@ function ewiki_page_filedownload($id, $data, $action, $def_sec="") {
            "orderby"=>$orderby, "section"=>$section, EWIKI_UP_PAGENUM=>$n)) .
             '">[' . $n . "]</a>  ";
       }
-      $o_nl .= '</div><br>';
+      $o_nl .= '</div><br />';
       $o .= $o_nl;
    }
    $sorted = array_slice($sorted, $pnum * EWIKI_LIST_LIMIT, EWIKI_LIST_LIMIT);
@@ -316,7 +316,7 @@ function ewiki_entry_downloads($row, $show_section=0, $fullinfo=false) {
    $p_section = $p_section ? $p_section : $meta["section"];
    $p_comment = strlen($meta["comment"]) ? '<table border="1" cellpadding="2" cellspacing="0"><tr><td class="lighter">'.
                 str_replace('</p>', '', str_replace('<p>', '',
-                ewiki_format($meta["comment"]))) . '</td></tr></table>' : "<br>";
+                ewiki_format($meta["comment"]))) . '</td></tr></table>' : "<br />";
 
    $p_icon = "";
    /*foreach ($ewiki_binary_icons as $str => $i) {
@@ -337,7 +337,7 @@ function ewiki_entry_downloads($row, $show_section=0, $fullinfo=false) {
    $info->icon = ($p_icon ? '<img src="'.$p_icon.'" alt="['.$p_icon_t.']" align="left" width="14" height="14" border="0"> ' : '');
    $info->time = $p_time;
    $info->hits = $p_hits;
-   $info->section = ($show_section ? ewiki_t('dwnl_section') . ": $p_section<br>" : '');
+   $info->section = ($show_section ? ewiki_t('dwnl_section') . ": $p_section<br />" : '');
    $info->type = $p_ct;
    $info->url =  ewiki_script_binary("", $row["id"]);
    $info->title = $p_title;
@@ -353,19 +353,19 @@ function ewiki_entry_downloads($row, $show_section=0, $fullinfo=false) {
                      fullname($user)."</a>";
         }
 
-        $o .= '<a href="'.$info->url.'">'.$info->icon.$info->title.'</a>'.$info->size.'<br>'.
+        $o .= '<a href="'.$info->url.'">'.$info->icon.$info->title.'</a>'.$info->size.'<br />'.
             $info->comment.
-            $info->section." ".get_string("fileisoftype","wiki").": ".$info->type.'<br>'.
+            $info->section." ".get_string("fileisoftype","wiki").": ".$info->type.'<br />'.
             get_string("uploadedon","wiki").": ".$info->time.", ".
-            ' by '.$value.'<br>'.
-            get_string("downloadtimes","wiki",$info->hits)."<br>".
-//            '(<a href="'.$info->url.'">'.$info->id."</a>)<br>".
-            '<br><br>';
+            ' by '.$value.'<br />'.
+            get_string("downloadtimes","wiki",$info->hits)."<br />".
+//            '(<a href="'.$info->url.'">'.$info->id."</a>)<br />".
+            '<br /><br />';
    }
    else {
 //       global $moodle_format;   // from wiki/view.php
-        $o .= '<a href="'.$info->url.'">'.$info->icon.$info->title.'</a>'.$info->size.'<br>'.
-              $info->comment.'<br><br>';
+        $o .= '<a href="'.$info->url.'">'.$info->icon.$info->title.'</a>'.$info->size.'<br />'.
+              $info->comment.'<br /><br />';
 //        $o = format_text($o, $moodle_format);
    }
 
diff --git a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
index 4127c33a4d..59c9e57334 100644
--- a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
+++ b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
@@ -62,35 +62,35 @@ function moodle_ewiki_page_wiki_dump($id=0, $data=0, $action=0) {
     
   $url = ewiki_script("", "WikiExport");
   $ret  = ewiki_make_title($id, $id, 2);
-  $ret .= ($cont&&$cont!==true)?$cont."<br><br>\n":"";
+  $ret .= ($cont&&$cont!==true)?$cont."<br /><br />\n":"";
   $ret .= get_string("wikiexportcomment","wiki");
-  $ret .= "<br><br>\n".
+  $ret .= "<br /><br />\n".
     '<FORM name="form" method="post" action="'.$url.'">'."\n".
-    '<INPUT TYPE="HIDDEN" NAME="userid" VALUE="'.$userid.'">'."\n".
-    '<INPUT TYPE="HIDDEN" NAME="groupid" VALUE="'.$groupid.'">'."\n".
-    '<INPUT TYPE="HIDDEN" NAME="id" VALUE="'.$cm->id.'">'."\n".
-    '<INPUT TYPE="HIDDEN" NAME="wikipage" VALUE="'.$wikipage.'">'."\n".
+    '<INPUT TYPE="HIDDEN" NAME="userid" VALUE="'.$userid.'" />'."\n".
+    '<INPUT TYPE="HIDDEN" NAME="groupid" VALUE="'.$groupid.'" />'."\n".
+    '<INPUT TYPE="HIDDEN" NAME="id" VALUE="'.$cm->id.'" />'."\n".
+    '<INPUT TYPE="HIDDEN" NAME="wikipage" VALUE="'.$wikipage.'" />'."\n".
     "<CENTER>\n";
   
   // Export binaries too ?
   if(!$wiki->ewikiacceptbinary) {
-    $ret.='<INPUT TYPE="HIDDEN" NAME="exportbinaries" VALUE="0">'.$exportdestinations[0]."\n";
+    $ret.='<INPUT TYPE="HIDDEN" NAME="exportbinaries" VALUE="0" />'.$exportdestinations[0]."\n";
   } else {
-    $ret.='<INPUT TYPE="HIDDEN" NAME="exportbinaries" VALUE="0">'."\n";
+    $ret.='<INPUT TYPE="HIDDEN" NAME="exportbinaries" VALUE="0" />'."\n";
   }
   $ret.="<TABLE cellpadding=5>\n";
   if($wiki->ewikiacceptbinary) {
     $ret.="  <TR valign=top>\n".
         '    <TD align=right>'.get_string("withbinaries","wiki").":</TD>\n".
         "    <TD>\n".
-        '      <input type="checkbox" name="exportbinaries" value="1"'.($_REQUEST["exportbinaries"]==1?" checked":"").">\n".
+        '      <input type="checkbox" name="exportbinaries" value="1"'.($_REQUEST["exportbinaries"]==1?" checked":"")." />\n".
         "    </TD>\n".
         "  </TR>\n";
   }
   $ret.="  <TR valign=top>\n".
       '    <TD align=right>'.get_string("withvirtualpages","wiki").":</TD>\n".
       "    <TD>\n".
-      '      <input type="checkbox" name="withvirtualpages" value="1"'.($_REQUEST["withvirtualpages"]==1?" checked":"").">\n".
+      '      <input type="checkbox" name="withvirtualpages" value="1"'.($_REQUEST["withvirtualpages"]==1?" checked":"")." />\n".
       "    </TD>\n".
       "  </TR>\n";
   $exportformats=array( "0" => get_string("plaintext","wiki") , "1" => get_string("html","wiki"));
@@ -101,7 +101,7 @@ function moodle_ewiki_page_wiki_dump($id=0, $data=0, $action=0) {
   if($wiki->htmlmode!=2) {
     $ret.= choose_from_menu($exportformats, "exportformats", $_REQUEST["exportformats"], "", "", "", true)."\n";
   } else {
-    $ret.= '<INPUT TYPE="HIDDEN" NAME="exportformats" VALUE="1">'.
+    $ret.= '<INPUT TYPE="HIDDEN" NAME="exportformats" VALUE="1" />'.
            get_string("html","wiki");
   }
   $ret.="    </TD>\n".
@@ -121,14 +121,14 @@ function moodle_ewiki_page_wiki_dump($id=0, $data=0, $action=0) {
         '    <TD align=right>'.get_string("exportto","wiki").":</TD>\n".
         "    <TD>\n";
   if(count($exportdestinations)==1) {
-    $ret.='<INPUT TYPE="HIDDEN" NAME="exportdestinations" VALUE="0">'.$exportdestinations[0]."\n";
+    $ret.='<INPUT TYPE="HIDDEN" NAME="exportdestinations" VALUE="0" />'.$exportdestinations[0]."\n";
   } else {
     $ret.=choose_from_menu($exportdestinations, "exportdestinations", $_REQUEST["exportdestinations"], "", "", "", true)."\n";
   }
   $ret.="    </TD>\n".
       "  </TR>\n".      
       "</TABLE>\n".
-      '  <input type="submit" name="wikiexport" value= "'.get_string("export","wiki").'">'."\n".
+      '  <input type="submit" name="wikiexport" value= "'.get_string("export","wiki").'" />'."\n".
       "</CENTER>\n";
       "</FORM>\n";
   return $ret;
@@ -211,7 +211,7 @@ function ewiki_page_wiki_dump_send($exportbinaries=0, $exportformats=0, $withvir
   }  
   
   #print "<pre>"; print_r($a_validpages); print "</pre>";
-  #print "<hr><pre>"; print_r($a_pagelist); print "</pre>";
+  #print "<hr /><pre>"; print_r($a_pagelist); print "</pre>";
 
   $a_sitemap = ewiki_sitemap_create($wiki_entry->pagename, $a_validpages, 99, 0);
   if ($a_pagelist) {
@@ -296,7 +296,7 @@ function ewiki_page_wiki_dump_send($exportbinaries=0, $exportformats=0, $withvir
             }
             break;
           case (EWIKI_DB_F_BINARY):            
-            #print "Binary: $row[id]<br>";
+            #print "Binary: $row[id]<br />";
             if (($row["meta"]["class"]=="image" || $row["meta"]["class"]=="file") && ($exportbinaries)) {
               # Copy files to the appropriate directory              
               $fn= moodle_binary_get_path($id, $row["meta"], $course, $wiki, $userid, $groupid);
@@ -434,7 +434,7 @@ function ewiki_page_wiki_dump_send($exportbinaries=0, $exportformats=0, $withvir
       #exit();
       return false;
     } else {
-       return get_string("exportsuccessful","wiki")."<br>";      
+       return get_string("exportsuccessful","wiki")."<br />";      
     }
   }
 }
diff --git a/mod/wiki/ewikimoodlelib.php b/mod/wiki/ewikimoodlelib.php
index 4d5e54dff9..11ee901f27 100644
--- a/mod/wiki/ewikimoodlelib.php
+++ b/mod/wiki/ewikimoodlelib.php
@@ -265,7 +265,7 @@ function ewiki_database_moodle($action, &$args, $sw1, $sw2) {
 
          #mysql_query("DELETE FROM " . EWIKI_DB_TABLE_NAME ."
          #   WHERE pagename='$id' AND version=$version");
-         # print "DELETING wiki:".$wiki_entry->id."Pagename: $id Version: $version <br>\n";
+         # print "DELETING wiki:".$wiki_entry->id."Pagename: $id Version: $version <br />\n";
          delete_records(EWIKI_DB_TABLE_NAME,"wiki", $wiki_entry->id,"pagename",$id,"version",$version);
 
          break;
diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index c496c33d4a..c747fa1c4f 100644
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -918,13 +918,13 @@ function wiki_print_search_form($cmid, $search="", $userid, $groupid, $return=fa
     # TODO: Add Group and User !!!
     $output = "<form name=\"search\" action=\"$CFG->wwwroot/mod/wiki/view.php\">";
     $output .= "<font size=\"-1\">";
-    $output .= "<input value=\"".get_string("searchwiki", "wiki").":\" type=\"submit\">";
-    $output .= "<input name=\"id\" type=\"hidden\" value=\"$cmid\">";
-    $output = $output.($groupid?"<input name=\"groupid\" type=\"hidden\" value=\"$groupid\">":"");
-    $output = $output.($userid?"<input name=\"userid\" type=\"hidden\" value=\"$userid\">":"");
-    $output .= "<input name=\"q\" type=\"text\" size=\"20\" value=\"$search\">".' ';
+    $output .= "<input value=\"".get_string("searchwiki", "wiki").":\" type=\"submit\" />";
+    $output .= "<input name=\"id\" type=\"hidden\" value=\"$cmid\" />";
+    $output = $output.($groupid?"<input name=\"groupid\" type=\"hidden\" value=\"$groupid\" />":"");
+    $output = $output.($userid?"<input name=\"userid\" type=\"hidden\" value=\"$userid\" />":"");
+    $output .= "<input name=\"q\" type=\"text\" size=\"20\" value=\"$search\" />".' ';
     $output .= "</font>";
-    $output .= "<input name=\"page\" type=\"hidden\" value=\"SearchPages\">";
+    $output .= "<input name=\"page\" type=\"hidden\" value=\"SearchPages\" />";
     $output .= "</form>";
 
     if ($return) {
@@ -1053,8 +1053,8 @@ function wiki_admin_setpageflags_list($pageflagstatus) {
     foreach ($FD as $n=>$str) {
         $cell_flags .='<INPUT TYPE="checkbox" NAME="flags['. rawurlencode($id)
             . '][' . $n . ']" VALUE="1" '
-            . (($data["flags"] & $n) ? "CHECKED" : "")
-            . '>'.$str. ' ';
+            . (($data["flags"] & $n) ? "CHECKED=\"checked\"" : "")
+            . ' />'.$str. ' ';
     }
     if($pageflagstatus) {
       $table->data[]=array($cell_pagename, $cell_flags, $pageflagstatus[$id]);
@@ -1111,17 +1111,17 @@ function wiki_admin_remove_list($listall="") {
   /// User wants to see all pages
   if ($listall) {
     while ($row = $result->get()) {
-      $selected[$row["id"]] = get_string("listall","wiki")."<br>";
+      $selected[$row["id"]] = get_string("listall","wiki")."<br />";
     }
   }
   while ($page = $result->get()) {            
     $id = $page["id"];
     $page = ewiki_database("GET", array("id"=>$id));
     $flags = $page["flags"];
-    #print "$id ".strlen(trim(($page["content"])))."<br>";           
+    #print "$id ".strlen(trim(($page["content"])))."<br />";           
 
     if (!strlen(trim(($page["content"]))) && !($flags & EWIKI_DB_F_BINARY)) {
-        @$selected[$id] .= get_string("emptypage","wiki")."<br>";
+        @$selected[$id] .= get_string("emptypage","wiki")."<br />";
     }
     
     // Check for orphaned pages
@@ -1136,50 +1136,50 @@ function wiki_admin_remove_list($listall="") {
             $orphanedpage=false;
           }
 
-          #echo "rc({$row['id']})==>($id): $check2 <br>";
+          #echo "rc({$row['id']})==>($id): $check2 <br />";
         }
     }
 
     /// Some more reasons for Deletion...    
     if ($orphanedpage && $id!=EWIKI_PAGE_INDEX &&!($flags & EWIKI_DB_F_BINARY)) {
-        @$selected[$id] .= get_string("orphanedpage","wiki")."<br>";
+        @$selected[$id] .= get_string("orphanedpage","wiki")."<br />";
     }
 
     if ($flags & EWIKI_DB_F_DISABLED) {
-        @$selected[$id] .= get_string("disabledpage","wiki")."<br>";
+        @$selected[$id] .= get_string("disabledpage","wiki")."<br />";
     }
 
     if (($flags & 3) == 3) {
-        @$selected[$id] .= get_string("errorbinandtxt","wiki")."<br>";
+        @$selected[$id] .= get_string("errorbinandtxt","wiki")."<br />";
     }
 
     if (!($flags & 3)) {
-        @$selected[$id] .= get_string("errornotype","wiki")."<br>";
+        @$selected[$id] .= get_string("errornotype","wiki")."<br />";
     }
 
     if ($flags & EWIKI_DB_F_HTML) {
-        @$selected[$id] .= get_string("errorhtml","wiki")."<br>";
+        @$selected[$id] .= get_string("errorhtml","wiki")."<br />";
     }
 
     if (($flags & EWIKI_DB_F_READONLY) && !($flags & EWIKI_DB_F_BINARY)) {
-        @$selected[$id] .= get_string("readonly","wiki")."<br>";
+        @$selected[$id] .= get_string("readonly","wiki")."<br />";
     }
 
     if (($flags & EWIKI_DB_F_READONLY) && ($flags & EWIKI_DB_F_WRITEABLE)) {
-        @$selected[$id] .= get_string("errorroandwr","wiki")."<br>";
+        @$selected[$id] .= get_string("errorroandwr","wiki")."<br />";
     }
 
     if (strlen($page["content"]) >= 65536) {
-        @$selected[$id] .= get_string("errorsize","wiki")."<br>";
+        @$selected[$id] .= get_string("errorsize","wiki")."<br />";
     }
 
     if (strpos($page["refs"], "\n".get_string("deletemewikiword","wiki")."\n")!==false) {
-        @$selected[$id] .= get_string("deletemewikiwordfound","wiki",get_string("deletemewikiword","wiki"))."<br>";
+        @$selected[$id] .= get_string("deletemewikiwordfound","wiki",get_string("deletemewikiword","wiki"))."<br />";
     }
   }
   
   foreach ($selected as $id => $reason) {    
-    $table_checkbox='<INPUT TYPE="checkbox" VALUE="'.rawurlencode($id).'" NAME="pagestodelete[]">';
+    $table_checkbox='<INPUT TYPE="checkbox" VALUE="'.rawurlencode($id).'" NAME="pagestodelete[]" />';
 
     #-- link & id
     if (strpos($id, EWIKI_IDF_INTERNAL) === false) {
@@ -1241,9 +1241,9 @@ function wiki_admin_strip_list($pagestostrip="",$version="",$err="") {
         } else {
           $versiondefault=$version[$i];
         }
-        $table->data[]=array('<input type="checkbox" value="'.rawurlencode($id).'" name="pagestostrip['.$i.']" '.$checked.'>', 
+        $table->data[]=array('<input type="checkbox" value="'.rawurlencode($id).'" name="pagestostrip['.$i.']" '.$checked.' />', 
                         '<A HREF="'.EWIKI_SCRIPT.$id.'">'.htmlentities($id).'</A> / '.get_string("version","wiki").": ".$row["version"],
-                        '<input name="version['.$i.']" value="'.$versiondefault.'" size="7">'.$error);
+                        '<input name="version['.$i.']" value="'.$versiondefault.'" size="7" />'.$error);
         
       }
       $i++;
@@ -1312,7 +1312,7 @@ function wiki_admin_checklinks($pagetocheck) {
      preg_match_all('_(http.?://[^\s"\'<>#,;]+[^\s"\'<>#,;.])_', $content, $links);
      $badlinks = array();
      if(!$links[1]) {
-       $ret = get_string("nolinksfound","wiki")."<br><br>";
+       $ret = get_string("nolinksfound","wiki")."<br /><br />";
      } else {
        foreach ($links[1] as $href) {
           #print "[ $href ]";
@@ -1323,10 +1323,10 @@ function wiki_admin_checklinks($pagetocheck) {
             $d="OK";
           }
           if (empty($d) || !strlen(trim($d)) || stristr("not found", $d) || stristr("error 404", $d)) {
-             $ret.="[".get_string("linkdead","wiki")."] $href <br>\n";
+             $ret.="[".get_string("linkdead","wiki")."] $href <br />\n";
              $badlinks[] = $href;
           } else {
-             $ret.="[".get_string("linkok","wiki")."] $href <br>\n";
+             $ret.="[".get_string("linkok","wiki")."] $href <br />\n";
           }
        }     
      }
@@ -1401,7 +1401,7 @@ function wiki_admin_revert($proceed, $authorfieldpattern, $changesfield, $howtoo
             ewiki_database("DELETE", $row);
           }
         }
-        $ret .= ")<br>";
+        $ret .= ")<br />";
         break;
       }
     } #-- for($ver)
diff --git a/mod/wiki/mod.html b/mod/wiki/mod.html
index cdd42908fa..93db236aa5 100644
--- a/mod/wiki/mod.html
+++ b/mod/wiki/mod.html
@@ -71,7 +71,7 @@
 <TR valign=top>
     <TD align=right><P><B><?php  print_string('name') ?>:</B></P></TD>
     <TD>
-        <INPUT type="text" name="name" size=30 value="<?php  p($form->name) ?>">
+        <INPUT type="text" name="name" size=30 value="<?php  p($form->name) ?>" />
     </TD>
 </TR>
 <TR valign=top>
@@ -176,7 +176,7 @@
             }
             else {
         ?>
-        <INPUT type="text" name="pagename" size=30 value="<?php  p($form->pagename) ?>"><b>
+        <INPUT type="text" name="pagename" size=30 value="<?php  p($form->pagename) ?>" /><b>
         <?php print_string('pagenamechoice', 'wiki'); ?></b>
         <?php
             }
@@ -196,7 +196,7 @@
             }
             else {
                 $strchooseafile = get_string("chooseafile", "wiki");
-                echo "<input name=\"initialcontent\" size=\"50\" value=\"$form->initialcontent\">&nbsp;";
+                echo "<input name=\"initialcontent\" size=\"50\" value=\"$form->initialcontent\" />&nbsp;";
                 button_to_popup_window ("/mod/wiki/wikifiles.php?id=$course->id", 
                                         "wikifiles", $strchooseafile, 500, 750, $strchooseafile);
             }
@@ -206,14 +206,14 @@
 
 </TABLE>
 <!-- These hidden variables are always the same -->
-<INPUT type="hidden" name=course        value="<?php  p($form->course) ?>">
-<INPUT type="hidden" name=coursemodule  value="<?php  p($form->coursemodule) ?>">
-<INPUT type="hidden" name=section       value="<?php  p($form->section) ?>">
-<INPUT type="hidden" name=module        value="<?php  p($form->module) ?>">
-<INPUT type="hidden" name=modulename    value="<?php  p($form->modulename) ?>">
-<INPUT type="hidden" name=instance      value="<?php  p($form->instance) ?>">
-<INPUT type="hidden" name=id            value="<?php  p($form->instance) ?>">
-<INPUT type="hidden" name=mode          value="<?php  p($form->mode) ?>">
-<INPUT type="submit" value="<?php  print_string('savechanges') ?>">
+<INPUT type="hidden" name=course        value="<?php  p($form->course) ?>" />
+<INPUT type="hidden" name=coursemodule  value="<?php  p($form->coursemodule) ?>" />
+<INPUT type="hidden" name=section       value="<?php  p($form->section) ?>" />
+<INPUT type="hidden" name=module        value="<?php  p($form->module) ?>" />
+<INPUT type="hidden" name=modulename    value="<?php  p($form->modulename) ?>" />
+<INPUT type="hidden" name=instance      value="<?php  p($form->instance) ?>" />
+<INPUT type="hidden" name=id            value="<?php  p($form->instance) ?>" />
+<INPUT type="hidden" name=mode          value="<?php  p($form->mode) ?>" />
+<INPUT type="submit" value="<?php  print_string('savechanges') ?>" />
 </CENTER>
 </FORM>
diff --git a/mod/wiki/removepages.html b/mod/wiki/removepages.html
index 2a74fc304a..ead02997b4 100644
--- a/mod/wiki/removepages.html
+++ b/mod/wiki/removepages.html
@@ -1,16 +1,16 @@
 <?PHP
     // Make sure all variables are defined
 
-    print get_string("removenotice","wiki")."<br><br>";
+    print get_string("removenotice","wiki")."<br /><br />";
 
 
 ?>
 <FORM ACTION="admin.php" METHOD="POST" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="userid" VALUE="<? print $userid; ?>">
-<INPUT TYPE="HIDDEN" NAME="groupid" VALUE="<? print $groupid ?>">
-<INPUT TYPE="HIDDEN" NAME="action" VALUE="<? print $action; ?>">
-<INPUT TYPE="HIDDEN" NAME="id" VALUE="<? print $cm->id ?>">
-<INPUT TYPE="HIDDEN" NAME="wikipage" VALUE="<? print $wikipage?>">
+<INPUT TYPE="HIDDEN" NAME="userid" VALUE="<? print $userid; ?>" />
+<INPUT TYPE="HIDDEN" NAME="groupid" VALUE="<? print $groupid ?>" />
+<INPUT TYPE="HIDDEN" NAME="action" VALUE="<? print $action; ?>" />
+<INPUT TYPE="HIDDEN" NAME="id" VALUE="<? print $cm->id ?>" />
+<INPUT TYPE="HIDDEN" NAME="wikipage" VALUE="<? print $wikipage?>" />
 <? 
   $remove_table=wiki_admin_remove_list($form->listall); 
   print_table($remove_table);
@@ -18,15 +18,15 @@
 <center>
 <?  
   if(!count($remove_table->data)) {
-    print get_string("nocandidatestoremove","wiki",get_string("listall","wiki"))."<br><br>";
+    print get_string("nocandidatestoremove","wiki",get_string("listall","wiki"))."<br /><br />";
   }
 ?>
 <? 
   if($form->listall) {
-      print '  <input type="submit" name="listcandidates" value="'.get_string("listcandidates","wiki").'">'."\n";      
+      print '  <input type="submit" name="listcandidates" value="'.get_string("listcandidates","wiki").'" />'."\n";      
   } else {
-      print '  <input type="submit" name="listall" value="'.get_string("listall","wiki").'">'."\n";      
+      print '  <input type="submit" name="listall" value="'.get_string("listall","wiki").'" />'."\n";      
   }
 ?>      
-  <input type="submit" name="proceed" value="<? print get_string("removeselectedpages","wiki"); ?>">
+  <input type="submit" name="proceed" value="<? print get_string("removeselectedpages","wiki"); ?>" />
 </center>
\ No newline at end of file
diff --git a/mod/wiki/restorelib.php b/mod/wiki/restorelib.php
index d2a683f397..85e3c1eb7e 100644
--- a/mod/wiki/restorelib.php
+++ b/mod/wiki/restorelib.php
@@ -55,7 +55,7 @@
             $newid = insert_record ("wiki",$wiki);
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","wiki")." \"".$wiki->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","wiki")." \"".$wiki->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -124,7 +124,7 @@
 	        if (($i+1) % 50 == 0) {
       	            echo ".";
             	    if (($i+1) % 1000 == 0) {
-                        echo "<br>";
+                        echo "<br />";
 	            }
       	            backup_flush(300);
                 }
@@ -190,7 +190,7 @@
             //The structure is equal to the db, so insert the wiki_comments
             insert_record ("wiki_pages",$page, false,"pagename");
 #print "<pre>"; print_r($page); print "</pre>";            
-            print ($r?"TRUE":"FALSE")."<br>\n";
+            print ($r?"TRUE":"FALSE")."<br />\n";
             #$newid = insert_record ("wiki_pages",$page);
             #if($newid) {
             #  $newid = backup_todb($pag_info['#']['PAGENAME']['0']['#']."_".$pag_info['#']['VERSION']['0']['#']."_".$new_entry_id);
@@ -199,7 +199,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
diff --git a/mod/wiki/revertpages.html b/mod/wiki/revertpages.html
index 734178fd1b..66785fbc9e 100644
--- a/mod/wiki/revertpages.html
+++ b/mod/wiki/revertpages.html
@@ -9,11 +9,11 @@ if (!isset($form->changesfield)) {
 
 ?>
 <FORM ACTION="admin.php" METHOD="POST" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="userid" VALUE="<? print $userid; ?>">
-<INPUT TYPE="HIDDEN" NAME="groupid" VALUE="<? print $groupid ?>">
-<INPUT TYPE="HIDDEN" NAME="action" VALUE="<? print $action; ?>">
-<INPUT TYPE="HIDDEN" NAME="id" VALUE="<? print $cm->id ?>">
-<INPUT TYPE="HIDDEN" NAME="wikipage" VALUE="<? print $wikipage?>">
+<INPUT TYPE="HIDDEN" NAME="userid" VALUE="<? print $userid; ?>" />
+<INPUT TYPE="HIDDEN" NAME="groupid" VALUE="<? print $groupid ?>" />
+<INPUT TYPE="HIDDEN" NAME="action" VALUE="<? print $action; ?>" />
+<INPUT TYPE="HIDDEN" NAME="id" VALUE="<? print $cm->id ?>" />
+<INPUT TYPE="HIDDEN" NAME="wikipage" VALUE="<? print $wikipage?>" />
 
 <CENTER>
 <?
@@ -25,7 +25,7 @@ if($err->remark) {
 <TR valign=top>
     <TD align=right><P><B><?php print_string('authorfieldpattern','wiki') ?>:</B></P></TD>
     <TD>
-        <INPUT type="text" name="authorfieldpattern" size=30 value="<?php p($form->authorfieldpattern) ?>">
+        <INPUT type="text" name="authorfieldpattern" size=30 value="<?php p($form->authorfieldpattern) ?>" />
 <?php
         helpbutton('revertauthorfieldpattern', get_string('authorfieldpattern', 'wiki'), 'wiki');
         if (!empty($err->authorfieldpattern)) { formerr($err->authorfieldpattern); }
@@ -35,7 +35,7 @@ if($err->remark) {
 <TR valign=top>
     <TD align=right><P><B><?php print_string('changesfield','wiki') ?>:</B></P></TD>
     <TD>
-        <INPUT type="text" name="changesfield" size=30 value="<?php p($form->changesfield) ?>">
+        <INPUT type="text" name="changesfield" size=30 value="<?php p($form->changesfield) ?>" />
         <? if (!empty($err->changesfield)) { formerr($err->changesfield); } ?>
     </TD>
 </TR>
@@ -53,10 +53,10 @@ if($err->remark) {
 <TR valign=top>
     <TD align=right><P><B><?php print_string('deleteversions','wiki') ?>:</B></P></TD>
     <TD>
-        <INPUT type="text" name="deleteversions" size=2 value="<?php p($form->deleteversions) ?>">
+        <INPUT type="text" name="deleteversions" size=2 value="<?php p($form->deleteversions) ?>" />
         <? if (!empty($err->deleteversions)) { formerr($err->deleteversions); } ?>
     </TD>
 </TR>
 </TABLE>
-  <input type="submit" name="proceed" value="<? print get_string("revertchanges","wiki"); ?>">
+  <input type="submit" name="proceed" value="<? print get_string("revertchanges","wiki"); ?>" />
 </center>
\ No newline at end of file
diff --git a/mod/wiki/setpageflags.html b/mod/wiki/setpageflags.html
index 5dae71542e..0ed652d97d 100644
--- a/mod/wiki/setpageflags.html
+++ b/mod/wiki/setpageflags.html
@@ -3,16 +3,16 @@
 
 ?>
 <FORM ACTION="admin.php" METHOD="POST" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="userid" VALUE="<? print $userid; ?>">
-<INPUT TYPE="HIDDEN" NAME="groupid" VALUE="<? print $groupid ?>">
-<INPUT TYPE="HIDDEN" NAME="action" VALUE="<? print $action; ?>">
-<INPUT TYPE="HIDDEN" NAME="id" VALUE="<? print $cm->id ?>">
-<INPUT TYPE="HIDDEN" NAME="wikipage" VALUE="<? print $wikipage?>">
+<INPUT TYPE="HIDDEN" NAME="userid" VALUE="<? print $userid; ?>" />
+<INPUT TYPE="HIDDEN" NAME="groupid" VALUE="<? print $groupid ?>" />
+<INPUT TYPE="HIDDEN" NAME="action" VALUE="<? print $action; ?>" />
+<INPUT TYPE="HIDDEN" NAME="id" VALUE="<? print $cm->id ?>" />
+<INPUT TYPE="HIDDEN" NAME="wikipage" VALUE="<? print $wikipage?>" />
 <? 
   $pageflags_table=wiki_admin_setpageflags_list($pageflagstatus); 
   print_table($pageflags_table);
 ?>
-<br>
+<br />
 <center>
-  <input type="submit" name="proceed" value="<? print get_string("setpageflags","wiki"); ?>">
+  <input type="submit" name="proceed" value="<? print get_string("setpageflags","wiki"); ?>" />
 </center>
\ No newline at end of file
diff --git a/mod/wiki/strippages.html b/mod/wiki/strippages.html
index 7a13cd7056..a6b7e06932 100644
--- a/mod/wiki/strippages.html
+++ b/mod/wiki/strippages.html
@@ -3,11 +3,11 @@
 
 ?>
 <FORM ACTION="admin.php" METHOD="POST" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="userid" VALUE="<? print $userid; ?>">
-<INPUT TYPE="HIDDEN" NAME="groupid" VALUE="<? print $groupid ?>">
-<INPUT TYPE="HIDDEN" NAME="action" VALUE="<? print $action; ?>">
-<INPUT TYPE="HIDDEN" NAME="id" VALUE="<? print $cm->id ?>">
-<INPUT TYPE="HIDDEN" NAME="wikipage" VALUE="<? print $wikipage?>">
+<INPUT TYPE="HIDDEN" NAME="userid" VALUE="<? print $userid; ?>" />
+<INPUT TYPE="HIDDEN" NAME="groupid" VALUE="<? print $groupid ?>" />
+<INPUT TYPE="HIDDEN" NAME="action" VALUE="<? print $action; ?>" />
+<INPUT TYPE="HIDDEN" NAME="id" VALUE="<? print $cm->id ?>" />
+<INPUT TYPE="HIDDEN" NAME="wikipage" VALUE="<? print $wikipage?>" />
 <? 
   $strip_table=wiki_admin_strip_list($form->pagestostrip, $form->version, $err); 
   print_table($strip_table);
@@ -15,8 +15,8 @@
 <center>
 <?
   if(!count($strip_table->data)) {
-    print get_string("nothingtostrip","wiki")."<br><br>";
+    print get_string("nothingtostrip","wiki")."<br /><br />";
   }
 ?>    
-  <input type="submit" name="proceed" value="<? print get_string("strippages","wiki"); ?>">
+  <input type="submit" name="proceed" value="<? print get_string("strippages","wiki"); ?>" />
 </center>
\ No newline at end of file
diff --git a/mod/wiki/test.php b/mod/wiki/test.php
index 0560d66d14..6dc9c0432a 100644
--- a/mod/wiki/test.php
+++ b/mod/wiki/test.php
@@ -3,7 +3,7 @@
     require_once("$CFG->dirroot/course/lib.php"); // For side-blocks
     require_once('wiki.class.php');
 
-    echo "Test Harness<br>";
+    echo "Test Harness<br />";
     
     $wiki = new cWiki(9);
     
diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index d1e9e0351e..5890f138aa 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -294,9 +294,9 @@
 
     if($ewiki_title==$wiki_entry->pagename && !empty($wiki->summary)) {
       if (trim(strip_tags($wiki->summary))) {
-          print "<br>";
+          print "<br />";
           print_simple_box(format_text($wiki->summary, FORMAT_MOODLE), "center");
-          print "<br>";
+          print "<br />";
       }
     }
     
diff --git a/mod/wiki/wikifiles.php b/mod/wiki/wikifiles.php
index 5fd2582cfe..fe45d214fc 100755
--- a/mod/wiki/wikifiles.php
+++ b/mod/wiki/wikifiles.php
@@ -150,20 +150,20 @@
                 echo "<P>$struploadafile ($strmaxsize) --> <B>$wdir</B>";
                 echo "<TABLE><TR><TD COLSPAN=2>";
                 echo "<FORM ENCTYPE=\"multipart/form-data\" METHOD=\"post\" ACTION=\"".$ME."\">";
-                echo " <INPUT TYPE=hidden NAME=MAX_FILE_SIZE value=\"$upload_max_filesize\">";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=upload>";
-                echo " <INPUT NAME=\"userfile\" TYPE=\"file\" size=\"60\">";
+                echo " <INPUT TYPE=hidden NAME=MAX_FILE_SIZE value=\"$upload_max_filesize\" />";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=upload />";
+                echo " <INPUT NAME=\"userfile\" TYPE=\"file\" size=\"60\" />";
                 echo " </TD><TR><TD WIDTH=10>";
-                echo " <INPUT TYPE=submit NAME=save VALUE=\"$struploadthisfile\">";
+                echo " <INPUT TYPE=submit NAME=save VALUE=\"$struploadthisfile\" />";
                 echo "</FORM>";
                 echo "</TD><TD WIDTH=100%>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=\"get\">";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strcancel\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strcancel\" />";
                 echo "</FORM>";
                 echo "</TD></TR></TABLE>";
             }
@@ -250,19 +250,19 @@
                 echo "<P>$strrenamefileto:";
                 echo "<TABLE><TR><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=\"post\" NAME=\"form\">";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=rename>";
-                echo " <INPUT TYPE=hidden NAME=oldname VALUE=\"$file\">";
-                echo " <INPUT TYPE=text NAME=name SIZE=35 VALUE=\"$file\">";
-                echo " <INPUT TYPE=submit VALUE=\"$strrename\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=rename />";
+                echo " <INPUT TYPE=hidden NAME=oldname VALUE=\"$file\" />";
+                echo " <INPUT TYPE=text NAME=name SIZE=35 VALUE=\"$file\" />";
+                echo " <INPUT TYPE=submit VALUE=\"$strrename\" />";
                 echo "</FORM>";
                 echo "</TD><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strcancel\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strcancel\" />";
                 echo "</FORM>";
                 echo "</TD></TR></TABLE>";
             }
@@ -288,18 +288,18 @@
                 echo "<P>$strcreatefolder:";
                 echo "<TABLE><TR><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=post NAME=form>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=mkdir>";
-                echo " <INPUT TYPE=text NAME=name SIZE=35>";
-                echo " <INPUT TYPE=submit VALUE=\"$strcreate\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=mkdir />";
+                echo " <INPUT TYPE=text NAME=name SIZE=35 />";
+                echo " <INPUT TYPE=submit VALUE=\"$strcreate\" />";
                 echo "</FORM>";
                 echo "</TD><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strcancel\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strcancel\" />";
                 echo "</FORM>";
                 echo "</TD></TR></TABLE>";
             }
@@ -330,20 +330,20 @@
 
                 echo "<TABLE><TR><TD COLSPAN=2>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=\"post\" NAME=\"form\">";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-                echo " <INPUT TYPE=hidden NAME=file VALUE=\"$file\">";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=edit>";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+                echo " <INPUT TYPE=hidden NAME=file VALUE=\"$file\" />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=edit />";
                 print_textarea($usehtmleditor, 25, 80, 680, 400, "text", $contents);
                 echo "</TD></TR><TR><TD>";
-                echo " <INPUT TYPE=submit VALUE=\"".get_string("savechanges")."\">";
+                echo " <INPUT TYPE=submit VALUE=\"".get_string("savechanges")."\" />";
                 echo "</FORM>";
                 echo "</TD><TD>";
                 echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"".get_string("cancel")."\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"".get_string("cancel")."\" />";
                 echo "</FORM>";
                 echo "</TD></TR></TABLE>";
 
@@ -393,18 +393,18 @@
                     echo "<P ALIGN=CENTER>".get_string("whattocallzip");
                     echo "<TABLE><TR><TD>";
                     echo "<FORM ACTION=\"".$ME."\" METHOD=post NAME=form>";
-                    echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                    echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-                    echo " <INPUT TYPE=hidden NAME=action VALUE=zip>";
-                    echo " <INPUT TYPE=text NAME=name SIZE=35 VALUE=\"new.zip\">";
-                    echo " <INPUT TYPE=submit VALUE=\"".get_string("createziparchive")."\">";
+                    echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                    echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+                    echo " <INPUT TYPE=hidden NAME=action VALUE=zip />";
+                    echo " <INPUT TYPE=text NAME=name SIZE=35 VALUE=\"new.zip\" />";
+                    echo " <INPUT TYPE=submit VALUE=\"".get_string("createziparchive")."\" />";
                     echo "</FORM>";
                     echo "</TD><TD>";
                     echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-                    echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                    echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                    echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                    echo " <INPUT TYPE=submit VALUE=\"".get_string("cancel")."\">";
+                    echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                    echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                    echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                    echo " <INPUT TYPE=submit VALUE=\"".get_string("cancel")."\" />";
                     echo "</FORM>";
                     echo "</TD></TR></TABLE>";
                 } else {
@@ -467,10 +467,10 @@
                 }
 
                 echo "<CENTER><FORM ACTION=\"".$ME."\" METHOD=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strok\">";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strok\" />";
                 echo "</FORM>";
                 echo "</CENTER>";
             } else {
@@ -513,11 +513,11 @@
                     }
                     echo "</table>";
                 }
-                echo "<br><center><form action=\"".$ME."\" method=get>";
-                echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir>";
-                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel>";
-                echo " <INPUT TYPE=submit VALUE=\"$strok\">";
+                echo "<br /><center><form action=\"".$ME."\" method=get>";
+                echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+                echo " <INPUT TYPE=hidden NAME=wdir VALUE=$wdir />";
+                echo " <INPUT TYPE=hidden NAME=action VALUE=cancel />";
+                echo " <INPUT TYPE=submit VALUE=\"$strok\" />";
                 echo "</FORM>";
                 echo "</CENTER>";
             } else {
@@ -629,7 +629,7 @@ function printfilelist($filelist) {
 
     foreach ($filelist as $file) {
         if (is_dir($basedir.$file)) {
-            echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=16 width=16> $file<br>";
+            echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=16 width=16> $file<br />";
             $subfilelist = array();
             $currdir = opendir($basedir.$file);
             while ($subfile = readdir($currdir)) { 
@@ -641,7 +641,7 @@ function printfilelist($filelist) {
 
         } else { 
             $icon = mimeinfo("icon", $file);
-            echo "<img src=\"$CFG->pixpath/f/$icon\"  height=16 width=16> $file<br>";
+            echo "<img src=\"$CFG->pixpath/f/$icon\"  height=16 width=16> $file<br />";
         }
     }
 }
@@ -725,7 +725,7 @@ function displaydir ($wdir) {
     
             echo "<TR>";
 
-            print_cell("center", "<INPUT TYPE=checkbox NAME=\"file$count\" VALUE=\"$fileurl\">");
+            print_cell("center", "<INPUT TYPE=checkbox NAME=\"file$count\" VALUE=\"$fileurl\" />");
             print_cell("left", "<A HREF=\"".basename($ME)."?id=$id&wdir=$fileurl\"><IMG SRC=\"$CFG->pixpath/f/folder.gif\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"Folder\"></A> <A HREF=\"".basename($ME)."?id=$id&wdir=$fileurl\">".htmlspecialchars($dir)."</A>");
             print_cell("right", "-");
             print_cell("right", $filedate);
@@ -762,7 +762,7 @@ function displaydir ($wdir) {
 
             echo "<tr>";
 
-            print_cell("center", "<input type=\"checkbox\" name=\"file$count\" value=\"$fileurl\">");
+            print_cell("center", "<input type=\"checkbox\" name=\"file$count\" value=\"$fileurl\" />");
 
             echo "<td align=left nowrap>";
             link_to_popup_window ($ffurl, "display", 
@@ -799,8 +799,8 @@ function displaydir ($wdir) {
 
     echo "<TABLE BORDER=0 cellspacing=2 cellpadding=2 width=640>";    
     echo "<TR><TD>";
-    echo "<INPUT TYPE=hidden NAME=id VALUE=\"$id\">";
-    echo "<INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\"> ";
+    echo "<INPUT TYPE=hidden NAME=id VALUE=\"$id\" />";
+    echo "<INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" /> ";
     $options = array (
                    "move" => "$strmovetoanotherfolder",
                    "delete" => "$strdeletecompletely",
@@ -814,26 +814,26 @@ function displaydir ($wdir) {
     echo "<TD ALIGN=center>";
     if (!empty($USER->fileop) and ($USER->fileop == "move") and ($USER->filesource <> $wdir)) {
         echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-        echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-        echo " <INPUT TYPE=hidden NAME=action VALUE=paste>";
-        echo " <INPUT TYPE=submit VALUE=\"$strmovefilestohere\">";
+        echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+        echo " <INPUT TYPE=hidden NAME=action VALUE=paste />";
+        echo " <INPUT TYPE=submit VALUE=\"$strmovefilestohere\" />";
         echo "</FORM>";
     }
     echo "<TD ALIGN=right>";
         echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-        echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-        echo " <INPUT TYPE=hidden NAME=action VALUE=mkdir>";
-        echo " <INPUT TYPE=submit VALUE=\"$strmakeafolder\">";
+        echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+        echo " <INPUT TYPE=hidden NAME=action VALUE=mkdir />";
+        echo " <INPUT TYPE=submit VALUE=\"$strmakeafolder\" />";
         echo "</FORM>";
     echo "</TD>";
     echo "<TD ALIGN=right>";
         echo "<FORM ACTION=\"".$ME."\" METHOD=get>";
-        echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
-        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";
-        echo " <INPUT TYPE=hidden NAME=action VALUE=upload>";
-        echo " <INPUT TYPE=submit VALUE=\"$struploadafile\">";
+        echo " <INPUT TYPE=hidden NAME=id VALUE=$id />";
+        echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\" />";
+        echo " <INPUT TYPE=hidden NAME=action VALUE=upload />";
+        echo " <INPUT TYPE=submit VALUE=\"$struploadafile\" />";
         echo "</FORM>";
     echo "</TD></TR>";
     echo "</TABLE>";
diff --git a/mod/workshop/Overview.html b/mod/workshop/Overview.html
index 2835609af6..488d2771c4 100644
--- a/mod/workshop/Overview.html
+++ b/mod/workshop/Overview.html
@@ -7,25 +7,25 @@
 </head>
 <body>
 <h2> Another Assignment Module</h2>
-<br>
+<br />
 <div style="margin-left: 40px;"> "Assessment is the most powerful lever
 teachers have to influence the way students respond to courses and
-behave as learners"<br>
+behave as learners"<br />
 </div>
-<br>
+<br />
 <div style="text-align: right; margin-left: 80px;"><small> from Graham
 Gibbs, "Using Assessment Strategically to Change the Way Students Learn"
 in "Asessment Matter in Higher Education, edited by Sally Brown and
-Angela Glasner, OU Press, 1999</small><br>
+Angela Glasner, OU Press, 1999</small><br />
 </div>
-<br>
+<br />
 <h3>Overview</h3>
 This new module enables the teacher to set up a controlled assignment
 which encourages students to become more critical of both their own work
 and that of others. In its standard form, the module usually begins with
 a preparatory phase where the teacher sets up the assessment criteria.
 These will depend on which assessment strategy the teacher decides to
-use for the assignment. There are four separate strategies:<br>
+use for the assignment. There are four separate strategies:<br />
 <ol>
   <li><b>No grading:</b> In this type of assignment the teacher is not
 	interested in quantative assessment from the students at all. The
@@ -59,12 +59,12 @@ for each criterion. </li>
 Next the teacher submits a small number (probably between 5 and 10)
 example pieces of work. These most likely have been gleaned from
 previous cohorts and should probably include both good and poor attempts
-at the assignment.<br>
-<br>
+at the assignment.<br />
+<br />
 Lastly the teacher assesses these examples using the "grading form" set
 up for the asssignment. The teacher's assessments are there to guide the
-students when they start the assignment.<br>
-<br>
+students when they start the assignment.<br />
+<br />
 With these three sets of items in place, the assessment elements (and
 possibly the associated grade table), the example assignments and the
 specimen assessments, the assignment can be opened up to the students.
@@ -76,15 +76,15 @@ re-assess one or more of the example assessments. This should be easy to
 do as once an example assignment is assessed the student is able to view
 the teacher's "specimen" assessments. This loop is basically there to
 check that the weaker students are aware of the specimen assessments and
-have looked at them.<br>
-<br>
+have looked at them.<br />
+<br />
 At the end of this initial stage the students should have a fair idea
 of what the assignment is about and how it is being assessed. They are
 now allowed to submit their own work. This is not a fixed milestone,
 each student will reach this second stage independently. With all the
 inital assessments graded the teacher can sit back and let the module
-run until the deadline date.<br>
-<br>
+run until the deadline date.<br />
+<br />
 The module can be set up to allow single submission or multiple
 submissions. Depending on this setting, the student' first submission is
 either their first draft or their only attempt.When the students have
@@ -94,11 +94,11 @@ students. However, they must do at least one assessment before they are
 shown the peer assessments. When the assignment allows resubmission the
 student may, in the light of the feedback, revise their work and submit
 a new copy for peer assessment. The peer assessment of student
-submissions continues until the deadline date is reached.<br>
-<br>
+submissions continues until the deadline date is reached.<br />
+<br />
 The teacher now has several choices. The module allows a flexible
 approach to calculating the final grade for the students. In fact, the
-final grade can be a teacher-defined combination of:<br>
+final grade can be a teacher-defined combination of:<br />
 <ol>
   <li>The teacher's grade of the (final) submission</li>
   <li>The average peer grade of the (final) submission</li>
@@ -111,9 +111,9 @@ graded by the teacher. The module can assess the quality of these
 assignments by internal comparison. This is probably just as well as the
 number of assessments generated at that phase could be quite large even
 for reasonably sized classes. The final phase of the module is the
-release of the final grades to the students.<br>
-<br>
-Thus the module normally runs through four phases:<br>
+release of the final grades to the students.<br />
+<br />
+Thus the module normally runs through four phases:<br />
 <ol>
   <li>Set up</li>
   <li>Student assessment of the example assignments, submission of work
@@ -121,22 +121,22 @@ and peer assessment</li>
   <li>Calculation of final grades</li>
   <li>Release of final grades</li>
 </ol>
-And there's a single deadline occurring between phases 2 and 3.<br>
-<br>
+And there's a single deadline occurring between phases 2 and 3.<br />
+<br />
 <h3>Variants</h3>
 That describes the "standard" assignment which this module supports.
 The module also lends itself to a few other types of assignment. For
 example, a "case study" assignment  can be handled where the teacher
 sets up a number of scenarios for the students to comment on. Here there
 are no student submissions the teacher simply grades the students
-responses to each scenario and uses those to calculate the final grades.<br>
-<br>
+responses to each scenario and uses those to calculate the final grades.<br />
+<br />
 A second example using the module in an abbrieviated way is as a simple
 peer assessment assignment. Here the teacher sets up the assessment
 elements but does not submit any example assignments and the students go
 straight in to the peer assessment phase, possibly going where no class
-has boldly gone before!<br>
-<br>
+has boldly gone before!<br />
+<br />
 For certain assignments the teacher may decide that the example
 assignments would simply lead the students into doing a cut-and-paste
 exercise to produce their assignments. Here the initial assessment phase
@@ -146,14 +146,14 @@ this way the students are shown what is expected of them and how it is
 being assessed but "the cat is still in the bag" so to speak. Careful
 monitoring of the assignment would be necessary else many students, not
 reading the instructions, would reproduce the examples rather then the
-required assignment.<br>
-<br>
+required assignment.<br />
+<br />
 The module can also be set up to ask the students to asssess their own
 work. That is instead of peer assessment the assignment becomes one
 involving self assessment. Here it is likely that the teacher would
 grade the (self) assessments make in the second half of phase 2 and
-include these grades in the final grades.<br>
-<br>
+include these grades in the final grades.<br />
+<br />
 <h3>Conclusion</h3>
 Thus the module is quite flexible while still being relatively easy to
 set up and run. The module has been keep purposely simple. For example
@@ -164,10 +164,10 @@ be used. Other technical restrictions are that the submitted assignments
 are limited to a single file, that is although multiple submissions are
 allowed each submission can only be just one file. The files themselves
 are limited to a prediefined size and the module does not support links
-to external pieces of work.<br>
-&nbsp;<br>
-Ray Kingdon <br>
-April 2003<br>
-<br>
+to external pieces of work.<br />
+&nbsp;<br />
+Ray Kingdon <br />
+April 2003<br />
+<br />
 </body>
 </html>
diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php
index 7caff6ef31..0f60d47d50 100644
--- a/mod/workshop/assessments.php
+++ b/mod/workshop/assessments.php
@@ -80,25 +80,30 @@
 			}
 		?>
 		<FORM NAME="commentform" ACTION="assessments.php" METHOD="post">
-		<INPUT TYPE="HIDDEN" NAME="action" VALUE="insertcomment">
-		<INPUT TYPE="HIDDEN" NAME="id" VALUE="<?PHP echo $cm->id ?>">
-		<INPUT TYPE="HIDDEN" NAME="aid" VALUE="<?PHP echo $_REQUEST['aid'] ?>">
+		<INPUT TYPE="HIDDEN" NAME="action" VALUE="insertcomment" />
+		<INPUT TYPE="HIDDEN" NAME="id" VALUE="<?PHP echo $cm->id ?>" />
+		<INPUT TYPE="HIDDEN" NAME="aid" VALUE="<?PHP echo $_REQUEST['aid'] ?>" />
 		<CENTER>
 		<TABLE CELLPADDING=5 BORDER=1>
 		<?PHP
 
 		// now get the comment
-		echo "<TR valign=top>\n";
-		echo "	<TD align=right><P><B>". get_string("comment", "workshop").":</B></P></TD>\n";
-		echo "	<TD>\n";
+		echo "<TR valign=top>\n";
+
+		echo "	<TD align=right><P><B>". get_string("comment", "workshop").":</B></P></TD>\n";
+
+		echo "	<TD>\n";
+
 		echo "		<textarea name=\"comments\" rows=5 cols=75 wrap=\"virtual\">\n";
-		echo "</textarea>\n";
+		echo "</textarea>\n";
+
 		echo "	</TD></TR></TABLE>\n";
-		echo "<INPUT TYPE=submit VALUE=\"".get_string("savemycomment", "workshop")."\">\n";
+		echo "<INPUT TYPE=submit VALUE=\"".get_string("savemycomment", "workshop")."\" />\n";
 		echo "</CENTER></FORM>\n";
 		echo "<P><CENTER><B>".get_string("assessment", "workshop"). "</B></CENTER>\n";
 		workshop_print_assessment($workshop, $assessment);
-		}
+		}
+
 
 
 	/******************* admin confirm delete ************************************/
@@ -182,7 +187,8 @@
 			
 		add_to_log($course->id, "workshop", "agree", "assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id", "$assessment->id");
 		print_continue("view.php?id=$cm->id");
-		}
+		}
+
 
 
 	/*************** Assess submission (by teacher or student) ***************************/
@@ -250,9 +256,9 @@
 			}
 		?>
 		<FORM NAME="gradingform" ACTION="assessments.php" METHOD="post">
-		<INPUT TYPE="HIDDEN" NAME="action" VALUE="updatecomment">
-		<INPUT TYPE="HIDDEN" NAME="id" VALUE="<?PHP echo $cm->id ?>">
-		<INPUT TYPE="HIDDEN" NAME="cid" VALUE="<?PHP echo $_GET['cid'] ?>">
+		<INPUT TYPE="HIDDEN" NAME="action" VALUE="updatecomment" />
+		<INPUT TYPE="HIDDEN" NAME="id" VALUE="<?PHP echo $cm->id ?>" />
+		<INPUT TYPE="HIDDEN" NAME="cid" VALUE="<?PHP echo $_GET['cid'] ?>" />
 		<CENTER>
 		<TABLE CELLPADDING=5 BORDER=1>
 		<?PHP
@@ -267,7 +273,7 @@
 			}
 		echo "	    </textarea>\n";
 		echo "	</TD></TR></TABLE>\n";
-		echo "<INPUT TYPE=submit VALUE=\"".get_string("savemycomment", "workshop")."\">\n";
+		echo "<INPUT TYPE=submit VALUE=\"".get_string("savemycomment", "workshop")."\" />\n";
 		echo "</CENTER></FORM>\n";
 		workshop_print_assessment($workshop, $assessment);
 		}
@@ -288,8 +294,8 @@
 		print_heading_with_help(get_string("editingassessmentelements", "workshop"), "elements", "workshop");
 		?>
 		<form name="form" method="post" action="assessments.php">
-		<input type="hidden" name="id" value="<?PHP echo $cm->id ?>">
-		<input type="hidden" name="action" value="insertelements">
+		<input type="hidden" name="id" value="<?PHP echo $cm->id ?>" />
+		<input type="hidden" name="action" value="insertelements" />
 		<CENTER><TABLE cellpadding=5 border=1>
 		<?PHP
 		
@@ -446,11 +452,12 @@
 					}
 				break;
 			}
-		// close table and form
+		// close table and form
+
 		?>
 		</TABLE>
-		<input type="submit" value="<?php  print_string("savechanges") ?>">
-		<input type="submit" name=cancel value="<?php  print_string("cancel") ?>">
+		<input type="submit" value="<?php  print_string("savechanges") ?>" />
+		<input type="submit" name=cancel value="<?php  print_string("cancel") ?>" />
 		</CENTER>
 		</FORM>
 		<?PHP
@@ -503,10 +510,10 @@
 		
 		?>
 		<FORM NAME="gradingform" ACTION="assessments.php" METHOD="post">
-		<INPUT TYPE="HIDDEN" NAME="action" VALUE="updategrading">
-		<INPUT TYPE="HIDDEN" NAME="id" VALUE="<?PHP echo $cm->id ?>">
-		<INPUT TYPE="HIDDEN" NAME="stype" VALUE="<?PHP echo $_GET['stype'] ?>">
-		<INPUT TYPE="HIDDEN" NAME="aid" VALUE="<?PHP echo $_GET['aid'] ?>">
+		<INPUT TYPE="HIDDEN" NAME="action" VALUE="updategrading" />
+		<INPUT TYPE="HIDDEN" NAME="id" VALUE="<?PHP echo $cm->id ?>" />
+		<INPUT TYPE="HIDDEN" NAME="stype" VALUE="<?PHP echo $_GET['stype'] ?>" />
+		<INPUT TYPE="HIDDEN" NAME="aid" VALUE="<?PHP echo $_GET['aid'] ?>" />
 		<CENTER>
 		<TABLE CELLPADDING=5 BORDER=1>
 		<?PHP
@@ -525,7 +532,7 @@
 		echo "<TR><TD ALIGN=RIGHT><B>".get_string("gradeforstudentsassessment", "workshop")."</TD><TD>\n";
 		choose_from_menu($num, "gradinggrade", $assessment->gradinggrade, "");
 		echo "</TD></TR></TABLE>\n";
-		echo "<INPUT TYPE=submit VALUE=\"".get_string("savemygrading", "workshop")."\">\n";
+		echo "<INPUT TYPE=submit VALUE=\"".get_string("savemygrading", "workshop")."\" />\n";
 		echo "</CENTER></FORM>\n";
 	}
 
diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index b09be734a1..df2a628150 100644
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -1112,7 +1112,7 @@ function workshop_print_recent_mod_activity($activity, $course, $detail=false) {
 
     echo "</a>$closeformat";
 
-    echo "<br><font size=\"2\">";
+    echo "<br /><font size=\"2\">";
     echo "<a href=\"$CFG->wwwroot/user/view.php?id=" . $activity->user->userid . "&course=" . "$course\">"
         . $activity->user->fullname . "</a>";
     echo " - " . userdate($activity->timestamp) . "</font></td></tr>";
diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php
index e417d532c7..bfdeadfbd8 100644
--- a/mod/workshop/locallib.php
+++ b/mod/workshop/locallib.php
@@ -1828,10 +1828,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
     // FORM is needed for Mozilla browsers, else radio bttons are not checked
         ?>
     <form name="assessmentform" method="post" action="assessments.php">
-    <input type="hidden" name="id" value="<?php echo $cm->id ?>">
-    <input type="hidden" name="aid" value="<?php echo $assessment->id ?>">
-    <input type="hidden" name="action" value="updateassessment">
-    <input type="hidden" name="returnto" value="<?php echo $returnto ?>">
+    <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
+    <input type="hidden" name="aid" value="<?php echo $assessment->id ?>" />
+    <input type="hidden" name="action" value="updateassessment" />
+    <input type="hidden" name="returnto" value="<?php echo $returnto ?>" />
     <center>
     <table cellpadding=2 border=1>
     <?php
@@ -1935,10 +1935,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                                             }
                                         }
                                     if ($checked) {
-                                        echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED> &nbsp;&nbsp;&nbsp;\n";
+                                        echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED=\"checked\" /> &nbsp;&nbsp;&nbsp;\n";
                                         }
                                     else {
-                                        echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\"> &nbsp;&nbsp;&nbsp;\n";
+                                        echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
                                         }
                                     }
                                 echo "&nbsp;&nbsp;&nbsp;<B>$SCALE->end</B></CENTER>\n";
@@ -2015,10 +2015,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                                         }
                                     }
                                 if ($checked) {
-                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED> &nbsp;&nbsp;&nbsp;\n";
+                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED=\"checked\" /> &nbsp;&nbsp;&nbsp;\n";
                                     }
                                 else {
-                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\"> &nbsp;&nbsp;&nbsp;\n";
+                                    echo " <INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
                                     }
                                 }
                             echo "&nbsp;&nbsp;&nbsp;<B>$SCALE->end</B></CENTER>\n";
@@ -2119,10 +2119,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                 echo "<TR valign=top>\n";
                 echo "  <TD>$iplus1</TD><TD>".text_to_html($elements[$i]->description)."</TD>\n";
                 if ($selection == $i) {
-                    echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\" CHECKED></TD>\n";
+                    echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\" CHECKED=\"checked\" /></TD>\n";
                     }
                 else {
-                    echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\"></TD>\n";
+                    echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\" /></TD>\n";
                     }
                 echo "<TD align=center>{$elements[$i]->maxscore}</TD></TR>\n";
                 }
@@ -2172,9 +2172,9 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                             }
                         echo "<TR valign=top>\n";
                         if ($selection == $j) {
-                            echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED></TD>\n";
+                            echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED=\"checked\" /></TD>\n";
                             }else {
-                            echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\"></TD>\n";
+                            echo "  <TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" /></TD>\n";
                             }
                         echo "<TD>".text_to_html($rubrics[$j]->description)."</TD>\n";
                         }
@@ -2259,16 +2259,16 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
     echo "</table>\n";
     if ($assessment) {
         if ($allowchanges) {  
-            echo "<input type=\"submit\" VALUE=\"".get_string("savemyassessment", "workshop")."\">\n";
+            echo "<input type=\"submit\" VALUE=\"".get_string("savemyassessment", "workshop")."\" />\n";
             }
         // ...if user is author, assessment not agreed, there's no comments, the showcommentlinks flag is set and 
         // it's not self assessment then show some buttons!
         if (($submission->userid == $USER->id) and !$assessment->timeagreed and !$comments and $showcommentlinks and 
                 $submission->userid != $assessment->userid) {
             echo "<input type=button VALUE=\"".get_string("agreetothisassessment", "workshop")."\" 
-                onclick=\"document.assessmentform.action.value='agreeassessment';document.assessmentform.submit();\">\n";
+                onclick=\"document.assessmentform.action.value='agreeassessment';document.assessmentform.submit();\" />\n";
             echo "<input type=submit value=\"".get_string("disagreewiththisassessment", "workshop")."\"
-                onclick=\"document.assessmentform.action.value='addcomment';document.assessmentform.submit();\">\n";
+                onclick=\"document.assessmentform.action.value='addcomment';document.assessmentform.submit();\" />\n";
             }
         }
     echo "</center>";
@@ -2288,7 +2288,7 @@ function workshop_print_assessments_by_user_for_admin($workshop, $user) {
             echo "<p><center><b>".get_string("assessmentby", "workshop", fullname($user))."</b></center></p>\n";
             workshop_print_assessment($workshop, $assessment);
             echo "<p align=\"right\"><a href=\"assessments.php?action=adminconfirmdelete&id=$cm->id&aid=$assessment->id\">".
-                get_string("delete", "workshop")."</a></p><hr>\n";
+                get_string("delete", "workshop")."</a></p><hr />\n";
             }
         }
     }
@@ -2309,7 +2309,7 @@ function workshop_print_assessments_for_admin($workshop, $submission) {
             echo "<p><center><b>".get_string("assessmentby", "workshop", fullname($user))."</b></center></p>\n";
             workshop_print_assessment($workshop, $assessment);
             echo "<p align=\"right\"><a href=\"assessments.php?action=adminconfirmdelete&id=$cm->id&aid=$assessment->id\">".
-                get_string("delete", "workshop")."</a></p><hr>\n";
+                get_string("delete", "workshop")."</a></p><hr />\n";
             }
         }
     }
@@ -2687,11 +2687,11 @@ function workshop_print_upload_form($workshop) {
 
     echo "<DIV ALIGN=CENTER>";
     echo "<FORM ENCTYPE=\"multipart/form-data\" METHOD=\"POST\" ACTION=upload.php>";
-    echo " <INPUT TYPE=hidden NAME=MAX_FILE_SIZE value=\"$workshop->maxbytes\">";
-    echo " <INPUT TYPE=hidden NAME=id VALUE=\"$cm->id\">";
-    echo "<b>".get_string("title", "workshop")."</b>: <INPUT NAME=\"title\" TYPE=\"text\" SIZE=\"60\" MAXSIZE=\"100\"><BR><BR>\n";
-    echo " <INPUT NAME=\"newfile\" TYPE=\"file\" size=\"50\">";
-    echo " <INPUT TYPE=submit NAME=save VALUE=\"".get_string("uploadthisfile")."\">";
+    echo " <INPUT TYPE=hidden NAME=MAX_FILE_SIZE value=\"$workshop->maxbytes\" />";
+    echo " <INPUT TYPE=hidden NAME=id VALUE=\"$cm->id\" />";
+    echo "<b>".get_string("title", "workshop")."</b>: <INPUT NAME=\"title\" TYPE=\"text\" SIZE=\"60\" MAXSIZE=\"100\" /><BR><BR>\n";
+    echo " <INPUT NAME=\"newfile\" TYPE=\"file\" size=\"50\" />";
+    echo " <INPUT TYPE=submit NAME=save VALUE=\"".get_string("uploadthisfile")."\" />";
     echo "</FORM>";
     echo "</DIV>";
 }
diff --git a/mod/workshop/mod.html b/mod/workshop/mod.html
index b4cfac8bc0..64d2f1c445 100644
--- a/mod/workshop/mod.html
+++ b/mod/workshop/mod.html
@@ -68,7 +68,7 @@
 <tr valign=top>
     <td align=right><P><B><?php  print_string("title", "workshop") ?>:</B></P></TD>
     <td>
-        <input type="text" name="name" size=60 value="<?php  p($form->name) ?>">
+        <input type="text" name="name" size=60 value="<?php  p($form->name) ?>" />
     </td>
 </tr>
 <tr valign=top>
@@ -331,15 +331,15 @@
 </table>
 <BR>
 <CENTER>
-<input type="hidden" name=course     value="<?php  p($form->course) ?>">
-<input type="hidden" name=coursemodule  value="<?php  p($form->coursemodule) ?>">
-<input type="hidden" name=section       value="<?php  p($form->section) ?>">
-<input type="hidden" name=module     value="<?php  p($form->module) ?>">
-<input type="hidden" name=modulename value="<?php  p($form->modulename) ?>">
-<input type="hidden" name=instance   value="<?php  p($form->instance) ?>">
-<input type="hidden" name=mode       value="<?php  p($form->mode) ?>">
-<input type="submit" value="<?php  print_string("savechanges") ?>">
-<input type="submit" name=cancel value="<?php  print_string("cancel") ?>">
+<input type="hidden" name=course     value="<?php  p($form->course) ?>" />
+<input type="hidden" name=coursemodule  value="<?php  p($form->coursemodule) ?>" />
+<input type="hidden" name=section       value="<?php  p($form->section) ?>" />
+<input type="hidden" name=module     value="<?php  p($form->module) ?>" />
+<input type="hidden" name=modulename value="<?php  p($form->modulename) ?>" />
+<input type="hidden" name=instance   value="<?php  p($form->instance) ?>" />
+<input type="hidden" name=mode       value="<?php  p($form->mode) ?>" />
+<input type="submit" value="<?php  print_string("savechanges") ?>" />
+<input type="submit" name=cancel value="<?php  print_string("cancel") ?>" />
 <p>
 <p><?PHP notify(get_string("noteonassessmentelements", "workshop")); ?>
 
diff --git a/mod/workshop/restorelib.php b/mod/workshop/restorelib.php
index c1403c5906..2f5e34d6fc 100644
--- a/mod/workshop/restorelib.php
+++ b/mod/workshop/restorelib.php
@@ -81,7 +81,7 @@
             $newid = insert_record ("workshop",$workshop);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","workshop")." \"".$workshop->name."\"<br>";
+            echo "<ul><li>".get_string("modulename","workshop")." \"".$workshop->name."\"<br />";
             backup_flush(300);
 
             if ($newid) {
@@ -141,7 +141,7 @@
             if (($i+1) % 10 == 0) {
                 echo ".";
                 if (($i+1) % 200 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -189,7 +189,7 @@
                 if (($i+1) % 10 == 0) {
                     echo ".";
                     if (($i+1) % 200 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
@@ -250,7 +250,7 @@
             if (($i+1) % 50 == 0) {
                 echo ".";
                 if (($i+1) % 1000 == 0) {
-                    echo "<br>";
+                    echo "<br />";
                 }
                 backup_flush(300);
             }
@@ -324,7 +324,7 @@
                 if (($i+1) % 50 == 0) {
                     echo ".";
                     if (($i+1) % 1000 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
@@ -393,7 +393,7 @@
                 if (($i+1) % 50 == 0) {
                     echo ".";
                     if (($i+1) % 1000 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
@@ -439,7 +439,7 @@
                 if (($i+1) % 50 == 0) {
                     echo ".";
                     if (($i+1) % 1000 == 0) {
-                        echo "<br>";
+                        echo "<br />";
                     }
                     backup_flush(300);
                 }
@@ -683,7 +683,7 @@
             }
             break;
         default:
-            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br>";                 //Debug
+            echo "action (".$log->module."-".$log->action.") unknow. Not restored<br />";                 //Debug
             break;
         }
 
diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php
index 4944a9b06e..d1e43a8be1 100644
--- a/mod/workshop/submissions.php
+++ b/mod/workshop/submissions.php
@@ -67,9 +67,9 @@
         print_heading(get_string("amendtitle", "workshop"));
         ?>
         <form name="amendtitleform" action="submissions.php" method="post">
-        <input type="hidden" name="action" value="adminupdatetitle">
-        <input type="hidden" name="id" value="<?PHP echo $cm->id ?>">
-        <input type="hidden" name="sid" value="<?PHP echo $_REQUEST['sid'] ?>">
+        <input type="hidden" name="action" value="adminupdatetitle" />
+        <input type="hidden" name="id" value="<?PHP echo $cm->id ?>" />
+        <input type="hidden" name="sid" value="<?PHP echo $_REQUEST['sid'] ?>" />
         <center>
         <table celpadding="5" border="1">
         <?PHP
@@ -78,9 +78,9 @@
         echo "<tr valign=\"top\">\n";
         echo "  <td align=\"right\"><P><B>". get_string("title", "workshop").":</b></p></td>\n";
         echo "  <td>\n";
-        echo "      <input type=\"text\" name=\"title\" size=\"60\" maxlength=\"100\" value=\"$submission->title\">\n";
+        echo "      <input type=\"text\" name=\"title\" size=\"60\" maxlength=\"100\" value=\"$submission->title\" />\n";
         echo "  </td></tr></table>\n";
-        echo "<input type=submit VALUE=\"".get_string("amendtitle", "workshop")."\">\n";
+        echo "<input type=submit VALUE=\"".get_string("amendtitle", "workshop")."\" />\n";
         echo "</center></form>\n";
 
         }