Some XHTML compatibility changes

diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index 948f3b16ef64a876fb1bbe2461debc994c5f1cd4..c216efd66f07cf940451ecc61278c8066a70a5b4 100644 (file)
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -914,14 +914,14 @@ function lesson_print_tree_link_menu($page, $id, $showpages=false) {
        $output = "";
        $close = false;
        $title=$page->title;  //CDC Chris Berri took out parsing of title in left menu on 6/11
-       $link="id=$id&action=navigation&pageid=".$page->id;
+       $link="id=$id&action=navigation&pageid=".$page->id;
        
        if($page->id == $_REQUEST['pageid']) { 
                $close=true; 
                $output.="<strong>"; 
        } 
        
-       $output .= "<li><a href=\"view.php?id=$id&action=navigation&pageid=$page->id\">".$title."</a></li>\n"; 
+       $output .= "<li><a href=\"view.php?id=$id&amp;action=navigation&amp;pageid=$page->id\">".$title."</a></li>\n"; 
        
        if($close) {
                $output.="</strong>";
@@ -1131,4 +1131,4 @@ function lesson_check_nickname($name) {
 }
 /// CDC-FLAG ///
 
-?>
\ No newline at end of file
+?>

diff --git a/mod/lesson/mod.html b/mod/lesson/mod.html
index d8e405f7e04898d11ec84157f07efa7378283353..9564959353c6842cda5727e7e6ff8b81e851c3ed 100644 (file)
--- a/mod/lesson/mod.html
+++ b/mod/lesson/mod.html
@@ -1,7 +1,7 @@
 <!-- define a new instance of lesson -->
 <!-- It is used from /course/mod.php.  The whole instance is available as $form. -->
 <?php
-require_once("styles.php");
+//require_once("styles.php");
 require("$CFG->dirroot/mod/lesson/locallib.php");  // for parameter array
 if ($form->mode == "add") {
        if ($defaults = get_record("lesson_default", "course", $form->course)) {
@@ -110,17 +110,17 @@ if ($form->mode == "add") {
 <form name="form" method="post" action="<?php echo $ME ?>">
 <center>
 
-<table cellpadding=5>
-<tr valign=top>
-    <td align=right><p><b><?php  print_string("name") ?>:</b></p></td>
+<table cellpadding="5">
+<tr valign="top">
+    <td align="right"><b><?php  print_string("name") ?>:</b></td>
     <td>
-        <!-- //CDC hidden label added. --><label for="name" class="hidden-label">Name</label><input type="text" id="name" name="name" size=30 value="<?php  p($form->name) ?>">
+        <!-- //CDC hidden label added. --><label for="name" class="hidden-label">Name</label><input type="text" id="name" name="name" size="30" value="<?php  p($form->name) ?>" />
     </td>
 </tr>
 
 <!-- CDC-FLAG -->
 <tr>
-    <td align=right><p><b><?php  print_string("practice", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php  print_string("practice", "lesson"); ?>:</b></td>
     <td>
     <?PHP 
         $options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -131,7 +131,7 @@ if ($form->mode == "add") {
 </tr>
 
 <tr>
-    <td align=right><p><b><?php  print_string("modattempts", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php  print_string("modattempts", "lesson"); ?>:</b></td>
     <td>
     <?PHP 
         $options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -142,7 +142,7 @@ if ($form->mode == "add") {
 </tr>
 
 <tr>
-    <td align=right><p><b><?php  print_string("usepassword", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php  print_string("usepassword", "lesson"); ?>:</b></td>
     <td>
     <?PHP 
         $options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -153,16 +153,16 @@ if ($form->mode == "add") {
 </tr>
 
 <tr>
-    <td align=right><p><b><?php  print_string("password", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php  print_string("password", "lesson"); ?>:</b></td>
     <td>
-        <input type="text" name="password" size=7 value=""> <?php echo " (".get_string("leavetokeep").")"; ?>
+        <input type="text" name="password" size="7" value="" /> <?php echo " (".get_string("leavetokeep").")"; ?>
                <?php helpbutton("password", get_string("password", "lesson"), "lesson"); ?>
     </td>
 </tr>
 <!-- CDC-FLAG -->
 
-<tr valign=top>
-    <td align=right><p><b><?php  print_string("maximumgrade") ?>:</b></p></td>
+<tr valign="top">
+    <td align="right"><b><?php  print_string("maximumgrade") ?>:</b></td>
     <td>
         <?php
         for ($i=100; $i>=0; $i--) {
@@ -176,7 +176,7 @@ if ($form->mode == "add") {
 
 <!-- CDC-FLAG -->
 <tr>
-    <td align=right><p><b><?php  print_string("customscoring", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php  print_string("customscoring", "lesson"); ?>:</b></td>
     <td>
     <?PHP 
         $options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -187,9 +187,9 @@ if ($form->mode == "add") {
 </tr>
 
 <tr>
-    <td align=right><p><b><?php  print_string("ongoing", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php  print_string("ongoing", "lesson"); ?>:</b></td>
     <td>
-    <?PHP 
+    <?php
         $options[0] = get_string("no"); $options[1] = get_string("yes");
                choose_from_menu($options, "ongoing", $form->ongoing, "");
         helpbutton("ongoing", get_string("ongoing", "lesson"), "lesson");
@@ -198,8 +198,8 @@ if ($form->mode == "add") {
 </tr>
 <!-- CDC-FLAG -->
 
-<tr valign=top>
-    <td align=right><p><b><?php  print_string("maximumnumberofanswersbranches", "lesson") ?>:</b></p></td>
+<tr valign="top">
+    <td align="right"><b><?php  print_string("maximumnumberofanswersbranches", "lesson") ?>:</b></td>
     <td>
         <?php
         for ($i=20; $i>1; $i--) {
@@ -211,8 +211,8 @@ if ($form->mode == "add") {
     </td>
 </tr>
 
-<tr valign=top>
-    <td align=right><p><b><?php  print_string("maximumnumberofattempts", "lesson") ?>:</b></p></td>
+<tr valign="top">
+    <td align="right"><b><?php  print_string("maximumnumberofattempts", "lesson") ?>:</b></td>
     <td>
         <?php
         unset($numbers);
@@ -227,9 +227,9 @@ if ($form->mode == "add") {
 
 <!-- CDC-FLAG -->
 <tr>
-    <td align=right><p><b><?php print_string("displayreview", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("displayreview", "lesson"); ?>:</b></td>
     <td>
-    <?PHP 
+    <?php
         $options[0] = get_string("no"); $options[1] = get_string("yes");
                choose_from_menu($options, "review", $form->review, "");
         helpbutton("review", get_string("displayreview", "lesson"), "lesson");
@@ -239,17 +239,17 @@ if ($form->mode == "add") {
 <!-- CDC-FLAG -->
 
 <tr>
-    <td align=right><p><b><?php  print_string("actionaftercorrectanswer", "lesson") ?>:</b></p></td>
+    <td align="right"><b><?php  print_string("actionaftercorrectanswer", "lesson") ?>:</b></td>
     <td>
-    <?PHP 
+    <?php 
         choose_from_menu($LESSON_NEXTPAGE_ACTION, "nextpagedefault", $form->nextpagedefault, "");
         helpbutton("nextpageaction", get_string("actionaftercorrectanswer", "lesson"), "lesson");
     ?>
     </td>
 </tr>
 
-<tr valign=top>
-    <td align=right><p><b><?php  print_string("minimumnumberofquestions", "lesson") ?>:</b></p></td>
+<tr valign="top">
+    <td align="right"><b><?php  print_string("minimumnumberofquestions", "lesson") ?>:</b></td>
     <td>
         <?php
         unset($numbers);
@@ -262,8 +262,8 @@ if ($form->mode == "add") {
     </td>
 </tr>
 
-<tr valign=top>
-    <td align=right><p><b><?php  print_string("numberofpagestoshow", "lesson") ?>:</b></p></td>
+<tr valign="top">
+    <td align="right"><b><?php  print_string("numberofpagestoshow", "lesson") ?>:</b></td>
     <td>
         <?php
         unset($numbers);
@@ -278,7 +278,7 @@ if ($form->mode == "add") {
 
 <!-- CDC-FLAG -->
 <tr>
-    <td align=right><p><b><?php print_string("timed", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("timed", "lesson"); ?>:</b></td>
     <td>
     <?PHP 
         $options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -289,16 +289,16 @@ if ($form->mode == "add") {
 </tr>
 
 <tr>
-    <td align=right><p><b><?php print_string("maxtime", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("maxtime", "lesson"); ?>:</b></td>
     <td>
-        <input type="text" name="maxtime" maxlength="7" size=7 value="<?php  p($form->maxtime) ?>">
+        <input type="text" name="maxtime" maxlength="7" size="7" value="<?php  p($form->maxtime) ?>" />
                <?php helpbutton("maxtime", get_string("maxtime", "lesson"), "lesson"); ?>
     </td>
 </tr>
 <!-- CDC-FLAG -->
 
 <tr>
-    <td align=right><p><b><?php  print_string("canretake", "lesson", $course->student) ?>:</b></p></td>
+    <td align="right"><b><?php  print_string("canretake", "lesson", $course->student) ?>:</b></td>
     <td>
     <?PHP 
         $options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -309,7 +309,7 @@ if ($form->mode == "add") {
 </tr>
 
 <tr>
-    <td align=right><p><b><?php  print_string("handlingofretakes", "lesson") ?>:</b></p></td>
+    <td align="right"><b><?php  print_string("handlingofretakes", "lesson") ?>:</b></td>
     <td>
     <?PHP 
         $options[0] = get_string("usemean", "lesson"); $options[1] = get_string("usemaximum", "lesson");
@@ -321,7 +321,7 @@ if ($form->mode == "add") {
 
 <!-- CDC-FLAG -->
 <tr>
-    <td align=right><p><b><?php print_string("treeview", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("treeview", "lesson"); ?>:</b></td>
     <td>
     <?PHP 
         $options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -332,7 +332,7 @@ if ($form->mode == "add") {
 </tr>
 
 <tr>
-    <td align=right><p><b><?php print_string("slideshow", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("slideshow", "lesson"); ?>:</b></td>
     <td>
     <?PHP 
         $options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -343,32 +343,32 @@ if ($form->mode == "add") {
 </tr>
 
 <tr>
-    <td align=right><p><b><?php print_string("slideshowwidth", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("slideshowwidth", "lesson"); ?>:</b></td>
     <td>
-        <input type="text" name="width" maxlength="7" size=7 value="<?php  p($form->width) ?>">px
+        <input type="text" name="width" maxlength="7" size="7" value="<?php  p($form->width) ?>" />px
                <?php helpbutton("width", get_string("slideshowwidth", "lesson"), "lesson"); ?>
     </td>
 </tr>
 
 <tr>
-    <td align=right><p><b><?php print_string("slideshowheight", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("slideshowheight", "lesson"); ?>:</b></td>
     <td>
-        <input type="text" name="height" maxlength="7" size=7 value="<?php  p($form->height) ?>">px
+        <input type="text" name="height" maxlength="7" size="7" value="<?php  p($form->height) ?>" />px
                <?php helpbutton("height", get_string("slideshowheight", "lesson"), "lesson"); ?>
     </td>
 </tr>
 
 <tr>
-    <td align=right><p><b><?php print_string("slideshowbgcolor", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("slideshowbgcolor", "lesson"); ?>:</b></td>
     <td>
-        <input type="text" name="bgcolor" maxlength="7" size=7 value="<?php  p($form->bgcolor) ?>">
+        <input type="text" name="bgcolor" maxlength="7" size="7" value="<?php  p($form->bgcolor) ?>" />
                <?php helpbutton("bgcolor", get_string("slideshowbgcolor", "lesson"), "lesson"); ?>
 
     </td>
 </tr>
 
 <tr>
-    <td align=right><p><b><?php  print_string("displayleftmenu", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php  print_string("displayleftmenu", "lesson"); ?>:</b></td>
     <td>
     <?PHP 
         $options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -379,7 +379,7 @@ if ($form->mode == "add") {
 </tr>
 
 <tr>
-    <td align=right><p><b><?php print_string("displayhighscores", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("displayhighscores", "lesson"); ?>:</b></td>
     <td>
     <?PHP 
         $options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -390,16 +390,16 @@ if ($form->mode == "add") {
 </tr>
 
 <tr>
-    <td align=right><p><b><?php print_string("maxhighscores", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("maxhighscores", "lesson"); ?>:</b></td>
     <td>
-        <input type="text" name="maxhighscores" maxlength="7" size=7 value="<?php  p($form->maxhighscores) ?>">
+        <input type="text" name="maxhighscores" maxlength="7" size="7" value="<?php  p($form->maxhighscores) ?>" />
                <?php helpbutton("maxhighscores", get_string("maxhighscores", "lesson"), "lesson"); ?>
     </td>
 </tr>
 <!-- CDC-FLAG -->
 
-<tr valign=top>
-    <td align=right><p><b><?php  print_string("available", "lesson") ?>:</b></td>
+<tr valign="top">
+    <td align="right"><b><?php  print_string("available", "lesson") ?>:</b></td>
     <td><?php
            print_date_selector("availableday", "availablemonth", "availableyear", $form->available);
            echo "&nbsp;-&nbsp;";
@@ -407,8 +407,8 @@ if ($form->mode == "add") {
     ?></td>
 </tr>
 
-<tr valign=top>
-    <td align=right><p><b><?php  print_string("deadline", "lesson") ?>:</b></td>
+<tr valign="top">
+    <td align="right"><b><?php  print_string("deadline", "lesson") ?>:</b></td>
     <td><?php
            print_date_selector("deadlineday", "deadlinemonth", "deadlineyear", $form->deadline);
            echo "&nbsp;-&nbsp;";
@@ -417,7 +417,7 @@ if ($form->mode == "add") {
 </tr>
 
 <tr>
-    <td align=right><p><b><?php print_string("lessondefault", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("lessondefault", "lesson"); ?>:</b></td>
     <td>
     <?PHP 
         $options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -430,11 +430,11 @@ if ($form->mode == "add") {
        if ($form->mode != "add") {
 ?>
 <tr>
-    <td align=right><p><b><?php  print_string("deleteattempts", "lesson"); ?>:</b></p></td>
+    <td align="right"><b><?php  print_string("deleteattempts", "lesson"); ?>:</b></td>
     <td>
-        <input type="text" name="deleteattempts" size=7 value="">
+        <input type="text" name="deleteattempts" size="7" value="" />
                <?php helpbutton("deleteattempts", get_string("deleteattempts", "lesson"), "lesson"); ?>
-               <input type="hidden" name="deleteattemptsid" value="<?php echo $USER->id; ?>">
+               <input type="hidden" name="deleteattemptsid" value="<?php echo $USER->id; ?>" />
     </td>
 </tr>
 <?php
@@ -443,13 +443,13 @@ if ($form->mode == "add") {
 
 </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/view.php b/mod/lesson/view.php
index c250552d1c836fc5a414daca98b1d26a2432622a..ed3b74ecdc602c7483dadeaf00f897114da4b5f4 100644 (file)
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -5,7 +5,6 @@
 
     require_once('../../config.php');
     require_once('locallib.php');
-    require_once('styles.php');
     require_once('lib.php');
 
     require_variable($id);    // Course Module ID
@@ -41,8 +40,9 @@
             $action = 'teacherview';
         } elseif  (time() < $lesson->available) {
             print_header($course->shortname .': '. $lesson->name, $course->fullname,
-                         $navigation .'<A HREF=index.php?id='. $course->id .'>'. $strlessons .'</A> -> <a href="view.php?id='. $cm->id .'">'. $lesson->name .'</a>', 
-                          '', '', true, '', navmenu($course, $cm));
+                         $navigation .'<a href="index.php?id='. $course->id .'">'. $strlessons .'</a> -> <a href="view.php?id='. $cm->id .'">'. $lesson->name .'</a>', '',
+                         "<style type=\"text/css\">@import url($CFG->wwwroot/mod/lesson/styles.php);</style>", true,
+                         '', navmenu($course, $cm));
             print_simple_box_start('center');
             echo '<div align="center">';
             echo get_string('lessonopen', 'lesson', userdate($lesson->available)).'<br />';
@@ -53,8 +53,9 @@
             exit();
         } elseif (time() > $lesson->deadline) {
             print_header($course->shortname .': '. $lesson->name, $course->fullname,
-                         "$navigation <A HREF=index.php?id=$course->id>$strlessons</A> -> <a href=\"view.php?id=$cm->id\">$lesson->name</a>", 
-                          '', '', true, '', navmenu($course, $cm));
+                         "$navigation <a href=\"index.php?id=$course->id\">$strlessons</a> -> <a href=\"view.php?id=$cm->id\">$lesson->name</a>", '',
+                         "<style type=\"text/css\">@import url($CFG->wwwroot/mod/lesson/styles.php);</style>", true,
+                          '', navmenu($course, $cm));
             print_simple_box_start('center');
             echo '<div align="center">';
             echo get_string('lessonclosed', 'lesson', userdate($lesson->deadline)) .'<br />';
@@ -91,8 +92,9 @@
     }
 
     print_header($course->shortname .': '. $lesson->name, $course->fullname,
-                 "$navigation <A HREF=index.php?id=$course->id>$strlessons</A> -> <a href=\"view.php?id=$cm->id\">$lesson->name</a>", 
-                  '', '', true, $button, // took out update_module_button($cm->id, $course->id, $strlesson) and replaced it with $button
+                 "$navigation <a href=\"index.php?id=$course->id\">$strlessons</a> -> <a href=\"view.php?id=$cm->id\">$lesson->name</a>", '',
+                 "<style type=\"text/css\">@import url($CFG->wwwroot/mod/lesson/styles.php);</style>", true,
+                 $button, // took out update_module_button($cm->id, $course->id, $strlesson) and replaced it with $button
                   navmenu($course, $cm));
 
     // set up some general variables
@@ -103,7 +105,7 @@
     } else {
         $pixpath = $path .'/../theme/'. $CFG->theme .'/pix';
     }
-                       
+
     /************** navigation **************************************/
     if ($action == 'navigation') {
         //CDC Chris Berri added this echo call for left menu.  must match that in lesson.php for styles
@@ -112,9 +114,9 @@
                if($page = get_record_select('lesson_pages', 'lessonid = '. $lesson->id .' AND prevpageid = 0')) {
                         // print the pages
                         echo '<form name="lessonpages2" method="post" action="view.php">';
-                        echo '<input type="hidden" name="id" value="'. $cm->id .'">';
-                        echo '<input type="hidden" name="action" value="navigation">';
-                        echo '<input type="hidden" name="pageid">';
+                        echo '<input type="hidden" name="id" value="'. $cm->id .'" />';
+                        echo '<input type="hidden" name="action" value="navigation" />';
+                        echo '<input type="hidden" name="pageid" />';
                                 echo "<div class='lmlinks'><table bgcolor=\"$THEME->cellheading\"><tr></tr>";
                                 echo "<tr><td class='lmheading'>".get_string('lessonmenu', 'lesson') .'</td></tr><br>';
                                 echo "<tr><td class='lmMainlinks'>";
@@ -145,18 +147,18 @@
             if (!$correctpass) {
                 print_simple_box_start('center');
                 echo '<form name="password" 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";
                 echo '<table cellpadding="7px">';
                 if (isset($_POST['userpassword'])) {
                     echo "<tr align=\"center\" style='color:#DF041E;'><td>".get_string('loginfail', 'lesson') .'</td></tr>';
                 }
                 echo '<tr align="center"><td>'. get_string('passwordprotectedlesson', 'lesson', $lesson->name) .'</td></tr>';
-                echo '<tr align="center"><td>'. get_string('enterpassword', 'lesson').' <input type="password" name="userpassword"></td></tr>';
+                echo '<tr align="center"><td>'. get_string('enterpassword', 'lesson').' <input type="password" name="userpassword" /></td></tr>';
                         
                 echo '<tr align="center"><td>';
-                echo '<input type="button" value="'. get_string('cancel', 'lesson') .'" onclick="parent.location=\'../../course/view.php?id='. $course->id .'\';">  ';
-                echo '<input type="button" value="'. get_string('continue', 'lesson') .'" onclick="document.password.submit();">';
+                echo '<input type="button" value="'. get_string('cancel', 'lesson') .'" onclick="parent.location=\'../../course/view.php?id='. $course->id .'\';" />  ';
+                echo '<input type="button" value="'. get_string('continue', 'lesson') .'" onclick="document.password.submit();" />';
                 echo '</td></tr></table>';
                 print_simple_box_end();
                 exit();
@@ -246,13 +248,13 @@
                     if ($lesson->timed) {
                         if ($lesson->retake) {
                             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="startlastseen">' . "\n";  /// CDC-FLAG added this line
+                            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="startlastseen" />' . "\n";  /// CDC-FLAG added this line
                             print_simple_box('<p align="center">'. get_string('leftduringtimed', 'lesson') .'</p>', 'center');
                             echo '<p align="center"><input type="button" value="'. get_string('continue', 'lesson').
-                                "\" onclick=\"document.queryform.pageid.value='$firstpageid';document.queryform.startlastseen.value='no';document.queryform.submit();\"></p>\n";  /// CDC-FLAG added document.queryform.startlastseen.value='yes'
+                                "\" onclick=\"document.queryform.pageid.value='$firstpageid';document.queryform.startlastseen.value='no';document.queryform.submit();\" /></p>\n";  /// CDC-FLAG added document.queryform.startlastseen.value='yes'
                             echo '</form>' . "\n"; 
                                                        echo '</div></div>';///CDC Chris Berri added close div tag
                         } else {
@@ -263,17 +265,18 @@
                             echo '</div>';
                             print_simple_box_end();
                         }
+                        
                     } else {
                         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=\"startlastseen\">\n";  /// CDC-FLAG added this line
+                        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=\"startlastseen\" />\n";  /// CDC-FLAG added this line
                         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.startlastseen.value='yes';document.queryform.submit();\">&nbsp;&nbsp;&nbsp;<input type=\"button\" value=\"".get_string("no").  /// CDC-FLAG 6/11/04 ///
-                            "\" onclick=\"document.queryform.pageid.value='$firstpageid';document.queryform.startlastseen.value='no';document.queryform.submit();\"></p>\n";  /// CDC-FLAG added document.queryform.startlastseen.value='yes'
+                            "\" onclick=\"document.queryform.pageid.value='$lastpageseen';document.queryform.startlastseen.value='yes';document.queryform.submit();\" />&nbsp;&nbsp;&nbsp;<input type=\"button\" value=\"".get_string("no").  /// CDC-FLAG 6/11/04 ///
+                            "\" onclick=\"document.queryform.pageid.value='$firstpageid';document.queryform.startlastseen.value='no';document.queryform.submit();\" /></p>\n";  /// CDC-FLAG added document.queryform.startlastseen.value='yes'
                         echo "</form>\n"; echo "</div></div>";///CDC Chris Berri added close div tag
                     }
                     print_footer($course);
@@ -404,7 +407,7 @@
                                                print_simple_box_end();
                                                echo "<br /><br /><br /><br />";
                     } else {
-                        redirect("view.php?id=$cm->id&action=navigation&pageid=".LESSON_EOL."&outoftime=normal", get_string("outoftime", "lesson"));
+                        redirect("view.php?id=$cm->id&amp;action=navigation&amp;pageid=".LESSON_EOL."&amp;outoftime=normal", get_string("outoftime", "lesson"));
                     }
                     // update clock when viewing a new page... no special treatment
                     if ((($timer->starttime + $lesson->maxtime * 60) - time()) < 60) {
@@ -458,7 +461,7 @@
                 } else {
                     $nextpageid = $page->nextpageid;
                 }
-                redirect("view.php?id=$cm->id&action=navigation&pageid=$nextpageid", get_string('endofclustertitle', 'lesson'));
+                redirect("view.php?id=$cm->id&amp;action=navigation&amp;pageid=$nextpageid", get_string('endofclustertitle', 'lesson'));
             }
             /// CDC-FLAG ///
 
@@ -582,9 +585,9 @@
             // 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\" />";
                 /// CDC-FLAG ///
                 if (!$lesson->slideshow || $page->qtype != 20) {
                     print_simple_box_start("center");
@@ -600,12 +603,12 @@
                                                        $value = "";
                                                }       
                         echo "<tr><td align=\"center\">".get_string("youranswer", "lesson").
-                            ": <label for=\"answer\" class=\"hidden-label\">Answer</label><input type=\"text\" id=\"answer\" name=\"answer\" size=\"50\" maxlength=\"200\" $value>\n"; //CDC hidden label added.
+                            ": <label for=\"answer\" class=\"hidden-label\">Answer</label><input type=\"text\" id=\"answer\" name=\"answer\" size=\"50\" maxlength=\"200\" $value />\n"; //CDC hidden label added.
                         echo '</table>';
                         print_simple_box_end();
                         if (!$lesson->slideshow) {
                             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 :
@@ -617,7 +620,7 @@
                                                        } else {
                                                                $checked = "";
                                                        } 
-                            echo "<label for=\"answerid\" class=\"hidden-label\">Answer ID</label><input type=\"radio\" id=\"answerid\" name=\"answerid\" value=\"{$answer->id}\" $checked>"; //CDC hidden label added.
+                            echo "<label for=\"answerid\" class=\"hidden-label\">Answer ID</label><input type=\"radio\" id=\"answerid\" name=\"answerid\" value=\"{$answer->id}\" $checked />"; //CDC hidden label added.
                             echo "</td><td>";
                             $options->para = false; // no <p></p>
                             echo format_text(trim($answer->answer), FORMAT_MOODLE, $options);
@@ -630,7 +633,7 @@
                         print_simple_box_end();
                         if (!$lesson->slideshow) {
                             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 :
@@ -649,7 +652,7 @@
                                                                        }
                                                                }
                                 // more than one answer allowed 
-                                echo "<label for=\"answer[$i]\" class=\"hidden-label\">answer[$i]</label><input type=\"checkbox\" id=\"answer[$i]\" name=\"answer[$i]\" value=\"{$answer->id}\" $checked>"; //CDC hidden label added.
+                                echo "<label for=\"answer[$i]\" class=\"hidden-label\">answer[$i]</label><input type=\"checkbox\" id=\"answer[$i]\" name=\"answer[$i]\" value=\"{$answer->id}\" $checked />"; //CDC hidden label added.
                             } else {
                                                                if (isset($USER->modattempts[$lesson->id]) && $answer->id == $attempt->answerid) {
                                                                        $checked = "CHECKED";
@@ -657,7 +660,7 @@
                                                                        $checked = "";
                                                                } 
                                 // only one answer allowed
-                                echo "<label for=\"answerid\" class=\"hidden-label\">answer id</label><input type=\"radio\" id=\"answerid\" name=\"answerid\" value=\"{$answer->id}\" $checked>"; //CDC hidden label added.
+                                echo "<label for=\"answerid\" class=\"hidden-label\">answer id</label><input type=\"radio\" id=\"answerid\" name=\"answerid\" value=\"{$answer->id}\" $checked />"; //CDC hidden label added.
                             }
                             echo "</td><td>";
                             $options->para = false; // no <p></p>
@@ -674,10 +677,10 @@
                         if (!$lesson->slideshow) {
                             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";
                             }
                         }
                         /// CDC-FLAG ///
@@ -731,21 +734,21 @@
                         print_simple_box_end();
                         if (!$lesson->slideshow) {                                             
                             echo "<p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                                get_string("pleasematchtheabovepairs", "lesson")."\"></p>\n";
+                                get_string("pleasematchtheabovepairs", "lesson")."\" /></p>\n";
                         }
                         break;
                     /// CDC-FLAG ///
 
                     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
                         /// CDC-FLAG ///
                         if(!$lesson->slideshow) {
                             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>";
                             }
                         }
@@ -767,7 +770,7 @@
                         print_simple_box_end();
                         if (!$lesson->slideshow) {
                             echo "<p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                                 get_string("pleaseenteryouranswerinthebox", "lesson")."\"></p>\n";
+                                 get_string("pleaseenteryouranswerinthebox", "lesson")."\" /></p>\n";
                         }
                         break;
                 }
@@ -779,8 +782,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
@@ -825,9 +828,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"; 
@@ -1020,11 +1023,11 @@
                 echo "<div align=\"center\"><br>";
                 if (!$grades = get_records_select("lesson_grades", "lessonid = $lesson->id", "completed")) {
                     echo get_string("youmadehighscore", "lesson", $lesson->maxhighscores)."<br>";
-                    echo "<a href=\"view.php?id=$cm->id&action=nameforhighscores\">".get_string("clicktopost", "lesson")."</a><br>";
+                    echo "<a href=\"view.php?id=$cm->id&amp;action=nameforhighscores\">".get_string("clicktopost", "lesson")."</a><br>";
                 } else {
                     if (!$highscores = get_records_select("lesson_high_scores", "lessonid = $lesson->id")) {
                         echo get_string("youmadehighscore", "lesson", $lesson->maxhighsores)."<br>";
-                        echo "<a href=\"view.php?id=$cm->id&action=nameforhighscores\">".get_string("clicktopost", "lesson")."</a><br>";
+                        echo "<a href=\"view.php?id=$cm->id&amp;action=nameforhighscores\">".get_string("clicktopost", "lesson")."</a><br>";
                     } else {
                         // get all the high scores into an array
                         foreach ($highscores as $highscore) {
@@ -1037,13 +1040,13 @@
                         
                         if ($thegrade >= $lowscore || count($topscores) <= $lesson->maxhighscores) {
                             echo get_string("youmadehighscore", "lesson", $lesson->maxhighscores)."<br>";
-                            echo "<a href=\"view.php?id=$cm->id&action=nameforhighscores\">".get_string("clicktopost", "lesson")."</a><br>";
+                            echo "<a href=\"view.php?id=$cm->id&amp;action=nameforhighscores\">".get_string("clicktopost", "lesson")."</a><br>";
                         } else {
                             echo get_string("nothighscore", "lesson", $lesson->maxhighscores)."<br>";
                         }
                     }
                 }
-                echo "<br><a href=\"view.php?id=$cm->id&action=highscores&link=1\">".get_string("viewhighscores", "lesson")."</a>";
+                echo "<br><a href=\"view.php?id=$cm->id&amp;action=highscores&link=1\">".get_string("viewhighscores", "lesson")."</a>";
                 echo "</div>";                                                 
             }
             /// CDC-FLAG ///                   
@@ -1060,7 +1063,7 @@
                                $lastattempt = end($attempts);
                                $USER->modattempts[$lesson->id] = $lastattempt->pageid;
                                echo "<form name=\"reviewform\" method=\"post\" action=\"view.php?id=$cm->id\">";
-                               echo "<input type=\"hidden\" name=\"pageid\" value=\"$pageid\">";
+                               echo "<input type=\"hidden\" name=\"pageid\" value=\"$pageid\" />";
                                echo "</form>";
                                echo "<p align=\"center\"><a href=\"javascript:document.reviewform.submit();\">".get_string("reviewlesson", "lesson")."</a></p>\n"; 
                        } elseif ($lesson->modattempts && isteacher($course->id)) {
@@ -1084,28 +1087,28 @@
                 case LESSON_SHORTANSWER :
                 case LESSON_NUMERICAL :
                     echo "<tr><td><p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                         get_string("pleaseenteryouranswerinthebox", "lesson")."\"></p></td></tr>\n";
+                         get_string("pleaseenteryouranswerinthebox", "lesson")."\" /></p></td></tr>\n";
                     break;
                 case LESSON_TRUEFALSE :
                     echo "<tr><td><p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                        get_string("pleasecheckoneanswer", "lesson")."\"></p></td></tr>\n"; 
+                        get_string("pleasecheckoneanswer", "lesson")."\" /></p></td></tr>\n"; 
                     break;
                 case LESSON_MULTICHOICE :
                     if ($page->qoption) {
                         echo "<tr><td><p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                            get_string("pleasecheckoneormoreanswers", "lesson")."\"></p></td></tr>\n";
+                            get_string("pleasecheckoneormoreanswers", "lesson")."\" /></p></td></tr>\n";
                     } else {
                         echo "<tr><td><p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                             get_string("pleasecheckoneanswer", "lesson")."\"></p></td></tr>\n";
+                             get_string("pleasecheckoneanswer", "lesson")."\" /></p></td></tr>\n";
                     }
                     break;
                 case LESSON_MATCHING :
                     echo "<tr><td><p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                        get_string("pleasematchtheabovepairs", "lesson")."\"></p></td></tr>\n";
+                        get_string("pleasematchtheabovepairs", "lesson")."\" /></p></td></tr>\n";
                     break;
                 case LESSON_ESSAY :
                     echo "<tr><td><p align=\"center\"><input type=\"submit\" name=\"continue\" value=\"".
-                         get_string("pleaseenteryouranswerinthebox", "lesson")."\"></p></td></tr>\n";
+                         get_string("pleaseenteryouranswerinthebox", "lesson")."\" /></p></td></tr>\n";
                     break;
                 case LESSON_BRANCHTABLE : 
                                        if (!empty($answers)) {
@@ -1125,19 +1128,19 @@
                                                        foreach ($nextprevious as $jump) {
                                                                if ($jump->jumpto == LESSON_PREVIOUSPAGE) {
                                                                        echo "<td align=\"left\"><input type=\"button\" onclick=\"document.answerform.jumpto.value=$jump->jumpto;document.answerform.submit();\"".
-                                                                                "value = \"$jump->answer\"></td>";
+                                                                                "value = \"$jump->answer\" /></td>";
                                                                }
                                                        }
                                                        echo "<td align=\"center\"><table><tr>";
                                                        foreach ($otherjumps as $otherjump) {
                                                                        echo "<td><input type=\"button\" onclick=\"document.answerform.jumpto.value=$otherjump->jumpto;document.answerform.submit();\"".
-                                                                                "value = \"$otherjump->answer\"></td>";
+                                                                                "value = \"$otherjump->answer\" /></td>";
                                                        }
                                                        echo "</tr></table></td>";
                                                        foreach ($nextprevious as $jump) {
                                                                if ($jump->jumpto == LESSON_NEXTPAGE) {
                                                                        echo "<td align=\"right\"><input type=\"button\" onclick=\"document.answerform.jumpto.value=$jump->jumpto;document.answerform.submit();\"".
-                                                                                "value = \"$jump->answer\"></td>";
+                                                                                "value = \"$jump->answer\" /></td>";
                                                                }
                                                        }
                                                        echo "</tr>";
@@ -1146,17 +1149,17 @@
                                                        foreach ($nextprevious as $jump) {
                                                                if ($jump->jumpto == LESSON_NEXTPAGE) {
                                                                        echo "<tr><td><input type=\"button\" onclick=\"document.answerform.jumpto.value=$jump->jumpto;document.answerform.submit();\"".
-                                                                                "value = \"$jump->answer\"></td></tr>";
+                                                                                "value = \"$jump->answer\" /></td></tr>";
                                                                }
                                                        }
                                                        foreach ($otherjumps as $otherjump) {
                                                                        echo "<tr><td><input type=\"button\" onclick=\"document.answerform.jumpto.value=$otherjump->jumpto;document.answerform.submit();\"".
-                                                                                "value = \"$otherjump->answer\"></td></tr>";
+                                                                                "value = \"$otherjump->answer\" /></td></tr>";
                                                        }
                                                        foreach ($nextprevious as $jump) {
                                                                if ($jump->jumpto == LESSON_PREVIOUSPAGE) {
                                                                        echo "<tr><td><input type=\"button\" onclick=\"document.answerform.jumpto.value=$jump->jumpto;document.answerform.submit();\"".
-                                                                                "value = \"$jump->answer\"></td></tr>";
+                                                                                "value = \"$jump->answer\" /></td></tr>";
                                                                }
                                                        }
                                                }
@@ -1225,7 +1228,7 @@
                                // get only the attempts that are in response to essay questions
                                $essaypageids = implode(",", array_keys($essaypages)); // all the pageids in comma seperated list
                                if ($essayattempts = get_records_select("lesson_attempts", "lessonid = $lesson->id AND pageid IN($essaypageids)")) {
-                                       echo "<div align=\"center\"><a href=\"view.php?id=$cm->id&action=essayview\">".get_string("gradeessay", "lesson")."</a></div><br />";
+                                       echo "<div align=\"center\"><a href=\"view.php?id=$cm->id&amp;action=essayview\">".get_string("gradeessay", "lesson")."</a></div><br />";
                                }
                        }
             /// CDC-FLAG /// tree code - in final release, will use lang file for all text output.
@@ -1291,7 +1294,7 @@
                             get_string("importquestions", "lesson")."</a> | ".
                             "<a href=\"lesson.php?id=$cm->id&amp;action=addcluster&amp;pageid=0\">".
                             get_string("addcluster", "lesson")."</a> | ".
-                            "<a href=\"lesson.php?id=$cm->id&action=addbranchtable&pageid=0\">".
+                            "<a href=\"lesson.php?id=$cm->id&amp;action=addbranchtable&amp;pageid=0\">".
                             get_string("addabranchtable", "lesson")."</a> | ".
                             "<a href=\"lesson.php?id=$cm->id&amp;action=addpage&amp;pageid=0\">".
                             get_string("addaquestionpage", "lesson")." ".get_string("here","lesson").
@@ -1312,8 +1315,8 @@
                         "<img src=\"$pixpath/t/edit.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"edit\" /></a>\n".
                         "<a title=\"".get_string("delete")."\" href=\"lesson.php?id=$cm->id&amp;action=confirmdelete&amp;pageid=$page->id\">\n".
                         "<img src=\"$pixpath/t/delete.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\" alt=\"delete\" /></a>\n";
-                    }
-                    echo "</td></tr>\n";             
+                }
+                echo "</td></tr>\n";             
                 echo "<tr><td colspan=\"2\">\n";
                 print_simple_box(format_text($page->contents), "center");
                 echo "</td></tr>\n";
@@ -1351,7 +1354,7 @@
                             echo get_string("endofbranch", "lesson");
                             break;
                     }
-                    echo "</td></tr>\n";
+                    echo "</b></td></tr>\n";
                     $i = 1;
                     $n = 0;
                     foreach ($answers as $answer) {
@@ -1497,11 +1500,11 @@
                             echo get_string("checkquestion", "lesson");
                         }
                         echo "\" onclick=\"document.lessonpages.pageid.value=$page->id;".
-                            "document.lessonpages.submit();\">";
+                            "document.lessonpages.submit();\" />";
                     }
                     echo "&nbsp;</td></tr>\n";
                 }
-                echo "</td></tr></table></td></tr>\n";
+                echo "</table></td></tr>\n";
                 if (isteacheredit($course->id)) {
                     /// CDC-FLAG /// 6/16/04                           
                     echo "<tr><td align=\"left\"><small><a href=\"import.php?id=$cm->id&amp;pageid=$page->id\">".
@@ -1526,7 +1529,7 @@
                         get_string("addaquestionpage", "lesson")." ".get_string("here","lesson").
                         "</a></small></td></tr>\n";
                 }
-                echo "<tr><td>\n";
+//                echo "<tr><td>\n";
                 // check the prev links - fix (silently) if necessary - there was a bug in
                 // versions 1 and 2 when add new pages. Not serious then as the backwards
                 // links were not used in those versions
@@ -1557,7 +1560,7 @@
             }
         } /// CDC-FLAG /// end of else from above tree code!!!
         
-            echo "</table></form>\n";
+            echo "</table></center></form>\n";
             /// CDC-FLAG ///
             // NoticeFix both viewAll's
             if(isset($_GET['display']) && !isset($_GET['viewAll'])) {
@@ -1638,16 +1641,16 @@
                                                $style = "style='color:#999999;'";
                                        }
                                        // link for each essay
-                                       $essaylinks[] = "<a $style href=\"view.php?id=$cm->id&action=essaygrade&attemptid=$essay->id\">".$pages[$essay->pageid]->title."</a>";
+                                       $essaylinks[] = "<a $style href=\"view.php?id=$cm->id&amp;action=essaygrade&attemptid=$essay->id\">".$pages[$essay->pageid]->title."</a>";
                                }
             }
                        // email link for this user
-                       $emaillink = "<a href=\"view.php?id=$cm->id&action=emailessay&userid=".$id."\">".get_string("emailgradedessays", "lesson")."</a>";
+                       $emaillink = "<a href=\"view.php?id=$cm->id&amp;action=emailessay&userid=".$id."\">".get_string("emailgradedessays", "lesson")."</a>";
 
                        $table->data[] = array($studentname, implode(", ", $essaylinks), $emaillink);        
                }
                // email link for all users
-               $emailalllink = "<a href=\"view.php?id=$cm->id&action=emailessay\">".get_string("emailallgradedessays", "lesson")."</a>";
+               $emailalllink = "<a href=\"view.php?id=$cm->id&amp;action=emailessay\">".get_string("emailallgradedessays", "lesson")."</a>";
         
                $table->data[] = array(" ", " ", $emailalllink);
                
@@ -1675,9 +1678,9 @@
 
 
         echo "<form name=\"essaygrade\" method=\"post\" action=\"view.php\">\n";
-        echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\">\n";
-        echo "<input type=\"hidden\" name=\"action\">\n";
-        echo "<input type=\"hidden\" name=\"attemptid\" value=\"$attemptid\">\n";
+        echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n";
+        echo "<input type=\"hidden\" name=\"action\" />\n";
+        echo "<input type=\"hidden\" name=\"attemptid\" value=\"$attemptid\" />\n";
        
                // all tables will have these
         $table->align = array("left");
@@ -1719,10 +1722,10 @@
                echo "<br />";
         echo "<table align=\"center\"><tr><td>";
         echo "<input type=\"button\" value=\"Cancel\" onclick=\"document.essaygrade.action.value='essayview';".
-             "document.essaygrade.submit();\">";
+             "document.essaygrade.submit();\" />";
         echo "</td><td>";
         echo "<input type=\"button\" value=\"Submit Grade\" onclick=\"document.essaygrade.action.value='updategrade';".
-             "document.essaygrade.submit();\">";
+             "document.essaygrade.submit();\" />";
         echo "</td></tr></table>";
                echo "</form>";
                
@@ -1765,10 +1768,10 @@
                $essay->useranswer = serialize($essayinfo);
                
         if(update_record("lesson_attempts", $essay) && update_record("lesson_grades", $updategrade)) {
-            redirect("view.php?id=$cm->id&action=essayview", get_string("updatesuccess", "lesson"));
+            redirect("view.php?id=$cm->id&amp;action=essayview", get_string("updatesuccess", "lesson"));
         } else {
             echo get_string("updatefailed", "lesson")."!<br>";
-            echo "<a href=\"view.php?id=$cm->id&action=essayview\">".get_string("continue", "lesson")."</a>";
+            echo "<a href=\"view.php?id=$cm->id&amp;action=essayview\">".get_string("continue", "lesson")."</a>";
             exit();
         }
     }
@@ -1840,13 +1843,13 @@
                     update_record("lesson_attempts", $essay);
                 } else {
                     echo "Email Failed!<br>";
-                    echo "<a href=\"view.php?id=$cm->id&action=essayview\">".get_string("continue", "lesson")."</a>";
+                    echo "<a href=\"view.php?id=$cm->id&amp;action=essayview\">".get_string("continue", "lesson")."</a>";
                     echo "</div>";
                     exit();
                 }
             }
         }
-        redirect("view.php?id=$cm->id&action=essayview", get_string("emailsuccess", "lesson"));
+        redirect("view.php?id=$cm->id&amp;action=essayview", get_string("emailsuccess", "lesson"));
     }
 
     /*******************high scores **************************************/
@@ -1893,7 +1896,7 @@
         if (isset($_GET['link'])) {
             echo "<br><a href=\"../../course/view.php?id=$course->id\">".get_string("returntocourse", "lesson")."</a>";
         } else {
-            echo "<br><a href=\"../../course/view.php?id=$course->id\">".get_string("cancel", "lesson")."</a> | <a href=\"view.php?id=$cm->id&action=navigation\">".get_string("startlesson", "lesson")."</a>";
+            echo "<br><a href=\"../../course/view.php?id=$course->id\">".get_string("cancel", "lesson")."</a> | <a href=\"view.php?id=$cm->id&amp;action=navigation\">".get_string("startlesson", "lesson")."</a>";
         }
         echo "</div>";
             
@@ -1920,7 +1923,7 @@
         if ($pasthighscore = get_record_select("lesson_high_scores", "lessonid = $lesson->id and userid = $USER->id")) {
             $pastgrade = $grades[$pasthighscore->gradeid]->grade;
             if ($pastgrade >= $newgrade->grade) {
-                redirect("view.php?id=$cm->id&action=highscores&link=1", "Update Successful");
+                redirect("view.php?id=$cm->id&amp;action=highscores&amp;link=1", "Update Successful");
             } else {
                 // delete old and find out where new one goes
                 if (!delete_records("lesson_high_scores", "id", $pasthighscore->id)) {
@@ -1971,7 +1974,7 @@
             error("Insert of new high score Failed!");
         }
         
-        redirect("view.php?id=$cm->id&action=highscores&link=1", get_string("postsuccess", "lesson"));
+        redirect("view.php?id=$cm->id&amp;action=highscores&amp;link=1", get_string("postsuccess", "lesson"));
         echo "</div>";
     }
     /*******************name for highscores **************************************/
@@ -1980,18 +1983,18 @@
         echo "<div align=\"center\">";
         if (isset($_POST['name'])) {
             if (lesson_check_nickname(trim($_POST['name']))) {
-                redirect("view.php?id=$cm->id&action=updatehighscores&name=".trim($_POST['name']), get_string("nameapproved", "lesson"));
+                redirect("view.php?id=$cm->id&amp;action=updatehighscores&amp;name=".trim($_POST['name']), get_string("nameapproved", "lesson"));
             } else {
                 echo get_string("namereject", "lesson")."<br><br>";
             }
         }
                 
         echo "<form name=\"nickname\" method =\"post\" action=\"view.php\">";
-        echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\">";
-        echo "<input type=\"hidden\" name=\"action\" value=\"nameforhighscores\">";
+        echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />";
+        echo "<input type=\"hidden\" name=\"action\" value=\"nameforhighscores\" />";
         
-        echo get_string("entername", "lesson").": <input type=\"text\" name=\"name\" maxlength=\"5\"><br>";
-        echo "<input type=\"submit\" value=\"".get_string("submitname", "lesson")."\">";
+        echo get_string("entername", "lesson").": <input type=\"text\" name=\"name\" maxlength=\"5\"><br />";
+        echo "<input type=\"submit\" value=\"".get_string("submitname", "lesson")."\" />";
         echo "</form>";
         echo "</div>";
     }