improve XHTML compatability of HotPot reports; fix termination of <input> tags for...

diff --git a/mod/hotpot/report/click/report.php b/mod/hotpot/report/click/report.php
index f3428e6f0597d33f0f9840818711b1b858699bb6..cdfe1e1b76ec0c6b4bee41c07d2b849ac6ff8ba2 100644 (file)
--- a/mod/hotpot/report/click/report.php
+++ b/mod/hotpot/report/click/report.php
@@ -221,7 +221,7 @@ class hotpot_report extends hotpot_default_report {
                                } // foreach $detail
                                // set data cell values for
                                $this->set_data_click(
-                                       $allow_review ? '<a href="review.php?hp='.$hotpot->id.'&attempt='.$attempt->id.'">'.$clickcount.'</a>' : $clickcount,
+                                       $allow_review ? '<a href="review.php?hp='.$hotpot->id.'&amp;attempt='.$attempt->id.'">'.$clickcount.'</a>' : $clickcount,
                                        trim(userdate($attempt->timefinish, $strftimetime)),
                                        $exercisetype,
                                        $click
@@ -399,7 +399,7 @@ class hotpot_report extends hotpot_default_report {
                        $idnumber = fullname($attempt);
                }
                if ($options['reportformat']=='htm') {
-                       $idnumber = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$attempt->userid.'&course='.$course->id.'">'.$idnumber.'</a>';
+                       $idnumber = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$attempt->userid.'&amp;course='.$course->id.'">'.$idnumber.'</a>';
                }
                $this->data['user'] = array(
                        'idnumber' => $idnumber,

diff --git a/mod/hotpot/report/default.php b/mod/hotpot/report/default.php
index 254e5b22a45ab6850ef7d406f1cb814942d80f36..0983ec636eb7bf0510518bfb4e167bc34426d9de 100644 (file)
--- a/mod/hotpot/report/default.php
+++ b/mod/hotpot/report/default.php
@@ -389,6 +389,7 @@ class hotpot_default_report {
 
             $align = empty($table->align[$i]) ? '' : ' align="'.$table->align[$i].'"';
             $class = empty($table->class[$i]) ? $d : ' class="'.$table->class[$i].'"';
+            $class = ' class="'.(empty($table->class[$i]) ? $d : $table->class[$i]).'"';
             $size  = empty($table->size[$i])  ? '' : ' width="'.$table->size[$i].'"';
             $wrap  = empty($table->wrap[$i])  ? '' : ' nowrap="nowrap"';
 
@@ -472,7 +473,7 @@ class hotpot_default_report {
                             } else { // $cell is a string
                                 $text = $cell;
                             }
-                            print $td.$text."</td>\n";
+                            print $td.$text.(empty($table->fontsize[$col]) ? '' : '</font>')."</td>\n";
                         } else {
                             $skipcol[$col]--;
                         }

diff --git a/mod/hotpot/report/fullstat/report.php b/mod/hotpot/report/fullstat/report.php
index 42f387dc23d87b76c856c438c1dcb9329535c909..371c7db495a07ba0d6eb6c8634de59f5ad0932a4 100644 (file)
--- a/mod/hotpot/report/fullstat/report.php
+++ b/mod/hotpot/report/fullstat/report.php
@@ -72,13 +72,13 @@ class hotpot_report extends hotpot_default_report {
                                $name = "$u->firstname $u->lastname";
                        }
                        if ($is_html) {
-                               $name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$u->userid.'&course='.$course->id.'">'.$name.'</a>';
+                               $name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$u->userid.'&amp;course='.$course->id.'">'.$name.'</a>';
                        }
                        $grade = isset($user->grade) ? $user->grade : $blank;
                        foreach ($user->attempts as $attempt) {
                                $attemptnumber = $attempt->attempt;
                                if ($allow_review) {
-                                       $attemptnumber = ' <a href="review.php?hp='.$hotpot->id.'&attempt='.$attempt->id.'">'.$attemptnumber.'</a>';
+                                       $attemptnumber = ' <a href="review.php?hp='.$hotpot->id.'&amp;attempt='.$attempt->id.'">'.$attemptnumber.'</a>';
                                }
                                $cells = array ($name, $grade, $attemptnumber);
                                // $name and $grade are only printed on first line per user

diff --git a/mod/hotpot/report/overview/report.php b/mod/hotpot/report/overview/report.php
index 52218f535b622aafee0ac1ee61a138d395e2a8c1..738b9ac358cd16d4d52b24ee6a6985d4826abdec 100644 (file)
--- a/mod/hotpot/report/overview/report.php
+++ b/mod/hotpot/report/overview/report.php
@@ -49,7 +49,7 @@ class hotpot_report extends hotpot_default_report {
                        $name = fullname($u);
                        if ($is_html) {
                                $picture = print_user_picture($u->userid, $course->id, $u->picture, false, true);
-                               $name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$u->userid.'&course='.$course->id.'">'.$name.'</a>';
+                               $name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$u->userid.'&amp;course='.$course->id.'">'.$name.'</a>';
                        }
                        $grade = isset($user->grade) && $user->grade<>'&nbsp;' ? $user->grade : $spacer;
                        $attemptcount = count($user->attempts);
@@ -83,11 +83,11 @@ class hotpot_report extends hotpot_default_report {
                                $attemptnumber = $attempt->attempt;
                                $starttime = trim(userdate($attempt->timestart, $strtimeformat));
                                if ($is_html && isset($attempt->score) && (has_capability('mod/hotpot:viewreport',get_context_instance(CONTEXT_COURSE, $course->id)) || $hotpot->review)) {
-                                       $attemptnumber = '<a href="review.php?hp='.$hotpot->id.'&attempt='.$attempt->id.'">'.$attemptnumber.'</a>';
-                                       $starttime = '<a href="review.php?hp='.$hotpot->id.'&attempt='.$attempt->id.'">'.$starttime.'</a>';
+                                       $attemptnumber = '<a href="review.php?hp='.$hotpot->id.'&amp;attempt='.$attempt->id.'">'.$attemptnumber.'</a>';
+                                       $starttime = '<a href="review.php?hp='.$hotpot->id.'&amp;attempt='.$attempt->id.'">'.$starttime.'</a>';
                                }
                                if ($is_html && has_capability('mod/hotpot:viewreport',get_context_instance(CONTEXT_COURSE, $course->id))) {
-                                       $checkbox = '<input type=checkbox name="box'.$attempt->clickreportid.'" value="'.$attempt->clickreportid.'">'.$spacer;
+                                       $checkbox = '<input type="checkbox" name="box'.$attempt->clickreportid.'" value="'.$attempt->clickreportid.'" />'.$spacer;
                                } else {
                                        $checkbox = '';
                                }
@@ -116,13 +116,13 @@ class hotpot_report extends hotpot_default_report {
                        $table->start = $this->deleteform_javascript();
                        $table->start .= '<form method="post" action="report.php" id="deleteform" onsubmit="'."return deletecheck('".$strdeletecheck."', 'selection')".'">'."\n";
                        $table->start .= '<input type="hidden" name="del" value="selection" />'."\n";
-                       $table->start .= '<input type="hidden" name="id" value="'.$cm->id.'">'."\n";
+                       $table->start .= '<input type="hidden" name="id" value="'.$cm->id.'" />'."\n";
                        $table->finish = '<center>'."\n";
                        $table->finish .= '<input type="submit" value="'.get_string("deleteselected").'" />&nbsp;'."\n";
                        if ($abandoned) {
-                               $table->finish .= '<input type=button value="'.get_string('deleteabandoned', 'hotpot').'" onClick="if(deletecheck('."'".addslashes(get_string('deleteabandonedcheck', 'hotpot', $abandoned))."', 'abandoned', true".')) document.getElementById(\'deleteform\').submit();" />'."\n";
+                               $table->finish .= '<input type="button" value="'.get_string('deleteabandoned', 'hotpot').'" onClick="if(deletecheck('."'".addslashes(get_string('deleteabandonedcheck', 'hotpot', $abandoned))."', 'abandoned', true".')) document.getElementById(\'deleteform\').submit();" />'."\n";
                        }
-                       $table->finish .= '<input type=button value="'.get_string("deleteall").'" onClick="if(deletecheck('."'".addslashes($strdeletecheck)."', 'all', true".'))document.getElementById(\'deleteform\').submit();" />'."\n";
+                       $table->finish .= '<input type="button" value="'.get_string("deleteall").'" onClick="if(deletecheck('."'".addslashes($strdeletecheck)."', 'all', true".'))document.getElementById(\'deleteform\').submit();" />'."\n";
                        $table->finish .= '</center>'."\n";
                        $table->finish .= '</form>'."\n";
                }

diff --git a/mod/hotpot/report/simplestat/report.php b/mod/hotpot/report/simplestat/report.php
index 6df2e561e017eedaed0d87ec972e92be37752118..1cda711c663d72d1d9b1622fa54f5a0915df678c 100644 (file)
--- a/mod/hotpot/report/simplestat/report.php
+++ b/mod/hotpot/report/simplestat/report.php
@@ -58,7 +58,7 @@ class hotpot_report extends hotpot_default_report {
                        $name = fullname($u);
                        if ($is_html) {
                                $picture = print_user_picture($u->userid, $course->id, $u->picture, false, true);
-                               $name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$u->userid.'&course='.$course->id.'">'.$name.'</a>';
+                               $name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$u->userid.'&amp;course='.$course->id.'">'.$name.'</a>';
                        }
                        if (isset($user->grade)) {
                                $grade = $user->grade;
@@ -97,7 +97,7 @@ class hotpot_report extends hotpot_default_report {
                                // get attempt number
                                $attemptnumber= $attempt->attempt;
                                if ($is_html && $allow_review) {
-                                       $attemptnumber = '<a href="review.php?hp='.$hotpot->id.'&attempt='.$attempt->id.'">'.$attemptnumber.'</a>';
+                                       $attemptnumber = '<a href="review.php?hp='.$hotpot->id.'&amp;attempt='.$attempt->id.'">'.$attemptnumber.'</a>';
                                }
                                if ($is_best_grade) {
                                        $score = '<span class="highlight">'.$attemptnumber.'</span>';

diff --git a/mod/hotpot/template/v6.php b/mod/hotpot/template/v6.php
index 017117fef153d39bccfa2732c565b40c29187e96..6db415dee1c6c684f92aa80a85657c687eeb9ebf 100644 (file)
--- a/mod/hotpot/template/v6.php
+++ b/mod/hotpot/template/v6.php
@@ -913,7 +913,7 @@ class hotpot_xml_quiz_template extends hotpot_xml_template_default {
                         $a++;
                     }
 
-                    $gap .= '<input type="text" id="Gap'.$q.'" onfocus="TrackFocus('.$q.')" onblur="LeaveGap()" class="GapBox" size="'.$gapsize.'" /></input>';
+                    $gap .= '<input type="text" id="Gap'.$q.'" onfocus="TrackFocus('.$q.')" onblur="LeaveGap()" class="GapBox" size="'.$gapsize.'"></input>';
                 }
                 if ($includeclues) {
                     $clue = $this->parent->xml_value($question_record, $question."['clue'][0]['#']");
@@ -1264,7 +1264,7 @@ class hotpot_xml_quiz_template extends hotpot_xml_template_default {
                     $question_type==HOTPOT_JQUIZ_HYBRID
                 ) {
                     $str .= '<div class="ShortAnswer" id="Q_'.$q.'_SA"><form method="post" action="" onsubmit="return false;"><div>';
-                    $str .= '<input type="text" id="Q_'.$q.'_Guess" onfocus="TrackFocus('."'".'Q_'.$q.'_Guess'."'".')" onblur="LeaveGap()" class="ShortAnswerBox" size="9" /></input><br /><br />';
+                    $str .= '<input type="text" id="Q_'.$q.'_Guess" onfocus="TrackFocus('."'".'Q_'.$q.'_Guess'."'".')" onblur="LeaveGap()" class="ShortAnswerBox" size="9"></input><br /><br />';
 
                     $caption = $this->v6_expand_CheckCaption();
                     $str .= $this->v6_expand_jquiz_button($caption, "CheckShortAnswer($q)");