Minor changes for XHTML compatibility

diff --git a/lib/weblib.php b/lib/weblib.php
index 706efa7f65e64af5dd1a51ebd2b669ec1f3f577c..5904173eee17518a38cc719c68601bb8eebad2c8 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -541,7 +541,7 @@ function button_to_popup_window ($url, $name='popup', $linkname='click here',
     $fullscreen = 0;
 
     echo '<input type="button" name="popupwindow" title="'. $title .'" value="'. $linkname .' ..." '.
-         "onClick=\"return openpopup('$url', '$name', '$options', $fullscreen);\" />\n";
+         "onclick=\"return openpopup('$url', '$name', '$options', $fullscreen);\" />\n";
 }
 
 
@@ -554,7 +554,7 @@ function close_window_button() {
     echo '<script type="text/javascript">' . "\n";
     echo '<!--' . "\n";
     echo "document.write('<form>');\n";
-    echo "document.write('<input type=\"button\" onClick=\"self.close();\" value=\"".get_string("closewindow")."\" />');\n";
+    echo "document.write('<input type=\"button\" onclick=\"self.close();\" value=\"".get_string("closewindow")."\" />');\n";
     echo "document.write('</form>');\n";
     echo '-->' . "\n";
     echo '</script>' . "\n";

diff --git a/mod/dialogue/lib.php b/mod/dialogue/lib.php
index 2d4cb570eb04abe964091e1553c6803c3046cad0..a82bbf0201578a6becafb2fdb60474ba93b0c198 100644 (file)
--- a/mod/dialogue/lib.php
+++ b/mod/dialogue/lib.php
@@ -171,7 +171,7 @@ function dialogue_print_recent_activity($course, $isteacher, $timestart) {
                 if (instance_is_visible("dialogue",$tempmod)) {
                     $date = userdate($log->time, $strftimerecent);
                     echo '<p><font size="1">'.$date.' - '.fullname($log).'<br />';
-                    echo "\"<a href=\"$CFG->wwwroot/mod/dialogue/$log->url\">";
+                    echo "\"<a href=\"$CFG->wwwroot/mod/dialogue/".str_replace('&', '&amp;', $log->url)."\">";
                     echo "$log->name";
                     echo "</a>\"</font></p>";
                 }
@@ -205,7 +205,7 @@ function dialogue_print_recent_activity($course, $isteacher, $timestart) {
                 if (instance_is_visible("dialogue",$tempmod)) {
                     $date = userdate($log->time, $strftimerecent);
                     echo '<p><font size="1">'.$date.' - '.fullname($log).'<br />';
-                    echo "\"<a href=\"$CFG->wwwroot/mod/dialogue/$log->url\">";
+                    echo "\"<a href=\"$CFG->wwwroot/mod/dialogue/".str_replace('&', '&amp;', $log->url)."\">";
                     echo "$log->name";
                     echo "</a>\"</font></p>";
                 }
@@ -240,7 +240,7 @@ function dialogue_print_recent_activity($course, $isteacher, $timestart) {
                     $date = userdate($log->time, $strftimerecent);
                     echo "<p><font size=1>$date - ".get_string("namehascloseddialogue", "dialogue",
                         fullname($log))."<br />";
-                    echo "\"<a href=\"$CFG->wwwroot/mod/dialogue/$log->url\">";
+                    echo "\"<a href=\"$CFG->wwwroot/mod/dialogue/".str_replace('&', '&amp;', $log->url)."\">";
                     echo "$log->name";
                     echo "</a>\"</font></p>";
                 }

diff --git a/mod/exercise/lib.php b/mod/exercise/lib.php
index f2a406207b48bbb1d74692f73c1dde9c0301f5d1..d84b2414c2a18ac835d7a0cbd2f8403e95fefa5d 100644 (file)
--- a/mod/exercise/lib.php
+++ b/mod/exercise/lib.php
@@ -342,7 +342,7 @@ function exercise_print_recent_activity($course, $isteacher, $timestart) {
                     if (instance_is_visible("exercise",$tempmod)) {
                         $date = userdate($log->time, $strftimerecent);
                         echo '<p><font size="1">'.$date.' - '.fullname($log).'<br />';
-                        echo "\"<a href=\"$CFG->wwwroot/mod/exercise/$log->url\">";
+                        echo "\"<a href=\"$CFG->wwwroot/mod/exercise/".str_replace('&', '&amp;', $log->url)."\">";
                         echo "$log->name";
                         echo "</a>\"</font></p>";
                         }
@@ -377,7 +377,7 @@ function exercise_print_recent_activity($course, $isteacher, $timestart) {
                 if (instance_is_visible("exercise",$tempmod)) {
                     $date = userdate($log->time, $strftimerecent);
                     echo '<p><font size="1">'.$date.' - '.fullname($log).'<br />';
-                    echo "\"<a href=\"$CFG->wwwroot/mod/exercise/$log->url\">";
+                    echo "\"<a href=\"$CFG->wwwroot/mod/exercise/".str_replace('&', '&amp;', $log->url)."\">";
                     echo "$log->name";
                     echo "</a>\"</font></p>";
                     }
@@ -412,7 +412,7 @@ function exercise_print_recent_activity($course, $isteacher, $timestart) {
                     if (instance_is_visible("exercise",$tempmod)) {
                         $date = userdate($log->time, $strftimerecent);
                         echo '<p><font size="1">'.$date.' - '.fullname($log).'<br />';
-                        echo "\"<a href=\"$CFG->wwwroot/mod/exercise/$log->url\">";
+                        echo "\"<a href=\"$CFG->wwwroot/mod/exercise/".str_replace('&', '&amp;', $log->url)."\">";
                         echo "$log->name";
                         echo "</a>\"</font></p>";
                         }

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 86f69de06feaf4ee48c97b136d778814788de387..3a7b4ba61a7f96aae59b062554870d3a2c234b9d 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -248,7 +248,7 @@ function glossary_print_recent_activity($course, $isteacher, $timestart) {
         if ($modvisible and $entry->approved) {
             $entries[$log->info] = glossary_log_info($log);
             $entries[$log->info]->time = $log->time;
-            $entries[$log->info]->url  = $log->url;
+            $entries[$log->info]->url  = str_replace('&', '&', $log->url);
         }
     }
 

diff --git a/mod/journal/lib.php b/mod/journal/lib.php
index a2a8673b5c361aac62d314b72c1574621c22a14c..077f1dc1183b485845987324af2ad4ff224257a6 100644 (file)
--- a/mod/journal/lib.php
+++ b/mod/journal/lib.php
@@ -212,7 +212,7 @@ function journal_print_recent_activity($course, $isteacher, $timestart) {
             if (!isset($journals[$log->info])) {
                 $journals[$log->info] = $j_log_info;
                 $journals[$log->info]->time = $log->time;
-                $journals[$log->info]->url = $log->url;
+                $journals[$log->info]->url = str_replace('&', '&', $log->url);
             }
         }
     }

diff --git a/mod/survey/lib.php b/mod/survey/lib.php
index 1c41ac3a56bd538e2ea622f009fb96ff3fb1d1fc..e53c92e196fef73491493dbf5379dc92f06d655b 100644 (file)
--- a/mod/survey/lib.php
+++ b/mod/survey/lib.php
@@ -156,7 +156,7 @@ function survey_print_recent_activity($course, $isteacher, $timestart) {
         if ($modvisible) {
             $surveys[$log->id] = survey_log_info($log);
             $surveys[$log->id]->time = $log->time;
-            $surveys[$log->id]->url = $log->url;
+            $surveys[$log->id]->url = str_replace('&', '&' $log->url);
         }
     }
 

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index 60fa08914a0f527e1eaa739016906c76677651f6..1e17df003b51bad0474bbc68cfaf62150d8cfb1a 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -716,7 +716,7 @@ function workshop_print_recent_activity($course, $isteacher, $timestart) {
                         else { // don't break anonymous rule
                             echo "<p><font size=\"1\">$date - A $course->student<br />";
                             }
-                        echo "\"<a href=\"$CFG->wwwroot/mod/workshop/$log->url\">";
+                        echo "\"<a href=\"$CFG->wwwroot/mod/workshop/".str_replace('&', '&amp;', $log->url)."\">";
                         echo "$log->name";
                         echo "</a>\"</font></p>";
                         }
@@ -757,7 +757,7 @@ function workshop_print_recent_activity($course, $isteacher, $timestart) {
                         else { // don't break anonymous rule
                             echo "<p><font size=\"1\">$date - A $course->student<br />";
                             }
-                        echo "\"<a href=\"$CFG->wwwroot/mod/workshop/$log->url\">";
+                        echo "\"<a href=\"$CFG->wwwroot/mod/workshop/".str_replace('&', '&amp;', $log->url)."\">";
                         echo "$log->name";
                         echo "</a>\"</font></p>";
                         }
@@ -793,7 +793,7 @@ function workshop_print_recent_activity($course, $isteacher, $timestart) {
                     if (instance_is_visible("workshop",$tempmod)) {
                         $date = userdate($log->time, $strftimerecent);
                         echo "<p><font size=\"1\">$date - A $course->student<br />";
-                        echo "\"<a href=\"$CFG->wwwroot/mod/workshop/$log->url\">";
+                        echo "\"<a href=\"$CFG->wwwroot/mod/workshop/".str_replace('&', '&amp;', $log->url)."\">";
                         echo "$log->name";
                         echo "</a>\"</font></p>";
                         }
@@ -828,7 +828,7 @@ function workshop_print_recent_activity($course, $isteacher, $timestart) {
                 if (instance_is_visible("workshop",$tempmod)) {
                     $date = userdate($log->time, $strftimerecent);
                     echo "<p><font size=\"1\">$date - $course->teacher<br />";
-                    echo "\"<a href=\"$CFG->wwwroot/mod/workshop/$log->url\">";
+                    echo "\"<a href=\"$CFG->wwwroot/mod/workshop/".str_replace('&', '&amp;', $log->url)."\">";
                     echo "$log->name";
                     echo "</a>\"</font></p>";
                     }
@@ -863,7 +863,7 @@ function workshop_print_recent_activity($course, $isteacher, $timestart) {
                     if (instance_is_visible("workshop",$tempmod)) {
                         $date = userdate($log->time, $strftimerecent);
                         echo "<p><font size=\"1\">$date - ".fullname($log)."<br />";
-                        echo "\"<a href=\"$CFG->wwwroot/mod/workshop/$log->url\">";
+                        echo "\"<a href=\"$CFG->wwwroot/mod/workshop/".str_replace('&', '&amp;', $log->url)."\">";
                         echo "$log->name";
                         echo "</a>\"</font></p>";
                         }