MDL-7861 xhtml strict fixes - fixed all <br> in our code
authorskodak <skodak>
Thu, 4 Jan 2007 23:38:17 +0000 (23:38 +0000)
committerskodak <skodak>
Thu, 4 Jan 2007 23:38:17 +0000 (23:38 +0000)
35 files changed:
auth/mnet/auth.php
auth/radius/auth.php
auth/shibboleth/config.html
backup/backuplib.php
backup/restorelib.php
blocks/search/config_global.html
course/format/lams/format.php
enrol/ldap/config.html
enrol/mnet/config.html
enrol/mnet/enrol.php
filter/algebra/algebradebug.php
grade/lib.php
group/assign.php
iplookup/ipatlas/plot.inc
lang/en_utf8/auth.php
lang/en_utf8/enrol_mnet.php
lang/en_utf8/help/quiz/itemanalysis.html
lang/en_utf8/lesson.php
lib/moodlelib.php
mod/choice/lib.php
mod/exercise/restorelib.php
mod/glossary/editcategories.php
mod/hotpot/attempt.php
mod/hotpot/db/update_to_v2.php
mod/hotpot/restorelib.php
mod/lams/lib.php
mod/lams/mod.html
mod/lesson/reformat.php
mod/lesson/restorelib.php
mod/resource/type/ims/repository_deploy.php
mod/wiki/ewiki/fragments/wiki_format.inc
search/indexer.php
search/lib.php
search/query.php
search/tests/index.php

index 305466f..4b675fd 100644 (file)
@@ -234,9 +234,9 @@ class auth_plugin_mnet
             $remoteuser = (object) $mnetrequest->response;
         } else {
             foreach ($mnetrequest->error as $code => $errormessage) {
-                $message .= "ERROR $code:<br>$errormessage<br>";
+                $message .= "ERROR $code:<br/>$errormessage<br/>";
             }
-            error("RPC auth/mnet/user_authorise:<br>$message");
+            error("RPC auth/mnet/user_authorise:<br/>$message");
         }
 
         if (empty($remoteuser) or empty($remoteuser->username)) {
index abe23e3..c173eae 100644 (file)
@@ -45,35 +45,35 @@ class auth_plugin_radius {
         require_once 'Auth/RADIUS.php';
         
         // Added by Clive on 7th May for test purposes
-        // printf("Username: $username <br>");
-        // printf("Password: $password <br>");
-        // printf("host: $this->config->host <br>");
-        // printf("nasport: $this->config->nasport <br>");
-        // printf("secret: $this->config->secret <br>");
+        // printf("Username: $username <br/>");
+        // printf("Password: $password <br/>");
+        // printf("host: $this->config->host <br/>");
+        // printf("nasport: $this->config->nasport <br/>");
+        // printf("secret: $this->config->secret <br/>");
         
         $rauth = new Auth_RADIUS_PAP($username, $password);
         $rauth->addServer($this->config->host, $this->config->nasport, $this->config->secret);
         
         if (!$rauth->start()) {
-            printf("Radius start: %s<br>\n", $rauth->getError());
+            printf("Radius start: %s<br/>\n", $rauth->getError());
             exit;
         }
         
         $result = $rauth->send();
         if (PEAR::isError($result)) {
-            printf("Radius send failed: %s<br>\n", $result->getMessage());
+            printf("Radius send failed: %s<br/>\n", $result->getMessage());
             exit;
         } else if ($result === true) {
-            // printf("Radius Auth succeeded<br>\n");
+            // printf("Radius Auth succeeded<br/>\n");
             return true;
         } else {
-            // printf("Radius Auth rejected<br>\n");
+            // printf("Radius Auth rejected<br/>\n");
             return false;
         }
         
         // get attributes, even if auth failed
         if (!$rauth->getAttributes()) {
-            printf("Radius getAttributes: %s<br>\n", $rauth->getError());
+            printf("Radius getAttributes: %s<br/>\n", $rauth->getError());
         } else {
             $rauth->dumpAttributes();
         }
index a20e9d2..b019837 100755 (executable)
@@ -49,7 +49,7 @@
         <?php 
 
         if ($config->convert_data and $config->convert_data != '' and !is_readable($config->convert_data)) {
-              echo '<br><font color="red">';
+              echo '<br/><font color="red">';
               print_string("auth_shib_convert_data_warning", "auth");
               echo '</font>';
         }
index 987d000..231b187 100644 (file)
 
         $status = zip_files($files, "$basedir/$name");
 
-        //echo "<br>Status: ".$status;                                     //Debug
+        //echo "<br/>Status: ".$status;                                     //Debug
         return $status;
 
     } 
index e050059..ad62c8a 100644 (file)
         fwrite ($restorelog_file,"<head>");
         fwrite ($restorelog_file,$stylesheetshtml);        
         fwrite ($restorelog_file,"<title>".$course_header->course_shortname." Restored </title>");
-        fwrite ($restorelog_file,"</head><body><br><h1>The following changes were made during the Restoration of this Course.</h1><br><br>");
-        fwrite ($restorelog_file,"The Course ShortName is now - ".$course_header->course_shortname." The FullName is now - ".$course_header->course_fullname."<br><br>");
+        fwrite ($restorelog_file,"</head><body><br/><h1>The following changes were made during the Restoration of this Course.</h1><br/><br/>");
+        fwrite ($restorelog_file,"The Course ShortName is now - ".$course_header->course_shortname." The FullName is now - ".$course_header->course_fullname."<br/><br/>");
         $startdate = addslashes($course_header->course_startdate);
         $date = usergetdate($startdate);
         fwrite ($restorelog_file,"The Originating Courses Start Date was " .$date['weekday'].", ".$date['mday']." ".$date['month']." ".$date['year']."");
         $startdate += $restore->course_startdateoffset;
         $date = usergetdate($startdate);
-        fwrite ($restorelog_file,"&nbsp;&nbsp;&nbsp;This Courses Start Date is now  " .$date['weekday'].",  ".$date['mday']." ".$date['month']." ".$date['year']."<br><br>");
+        fwrite ($restorelog_file,"&nbsp;&nbsp;&nbsp;This Courses Start Date is now  " .$date['weekday'].",  ".$date['mday']." ".$date['month']." ".$date['year']."<br/><br/>");
 
         if ($status) {
             return $restorelog_file;
         $status = check_dir_exists($dest_dir, true, true);
         $restorelog_file = fopen("$dest_dir/restorelog.html","a");
         //Write the footer to close the logging file
-        fwrite ($restorelog_file,"<br>This file was written to directly by each modules restore process.");
-        fwrite ($restorelog_file,"<br><br>Log complete.</body></html>");
+        fwrite ($restorelog_file,"<br/>This file was written to directly by each modules restore process.");
+        fwrite ($restorelog_file,"<br/><br/>Log complete.</body></html>");
        
         if ($status) {
             return $restorelog_file;
index 63e6a1b..b16c2f4 100644 (file)
@@ -5,7 +5,7 @@
         p($CFG->block_search_text);
     } else {
         p("Search Moodle");
-    } ?>"/><br>
+    } ?>"/><br/>
   
   <label for="block_search_button">Button label</label>
   <input type="text" name="block_search_button" value="<?php 
@@ -13,7 +13,7 @@
         p($CFG->block_search_button);
     } else {
         p("Go");
-    } ?>"/><br><br>
+    } ?>"/><br/><br/>
   
   <input type="submit" value="<?php print_string('savechanges'); ?>" />
 </div>
\ No newline at end of file
index 056003b..617b5ac 100644 (file)
@@ -115,7 +115,7 @@ if ($thissection->summary or $thissection->sequence or isediting($course->id)) {
             '<td class="activity forum">'.
             '<table align="center" width="100%"  class="noticebox" border="0" cellpadding="15" cellspacing="0">'.
             '<tr><td bgcolor="#FFAAAA" class="noticeboxcontent">'.
-            '<h3   class="main">All the LAMS module settings have not been set up!<BR> Please contact your administrator.</h3>'.
+            '<h3   class="main">All the LAMS module settings have not been set up!<br/> Please contact your administrator.</h3>'.
             '</td></tr></table>'.                                        
             '</td>'.
             '</tr>'.
index 20b6a0d..ced5cd3 100755 (executable)
@@ -254,7 +254,7 @@ if (!isset($frm->enrol_ldap_template)) {
             <?php  print_string("no")  ?></option>
         <option value="1" <?php echo ($frm->enrol_ldap_course_idnumber_updatelocal ? 'selected="yes"' : '') ?> >
             <?php  print_string("yes") ?></option>
-    </select><BR>
+    </select><br/>
     <?php  print_string("enrol_ldap_editlock", "enrol_ldap") ?>
     <select name="enrol_ldap_course_idnumber_editlock">
         <option value="0" <?php echo ($frm->enrol_ldap_course_idnumber_editlock ? '' : 'selected="yes"') ?> >
@@ -278,7 +278,7 @@ if (!isset($frm->enrol_ldap_template)) {
             <?php  print_string("no")  ?></option>
         <option value="1" <?php echo ($frm->enrol_ldap_course_shortname_updatelocal ? 'selected="yes"' : '') ?> >
             <?php  print_string("yes") ?></option>
-    </select><BR>
+    </select><br/>
     <?php  print_string("enrol_ldap_editlock", "enrol_ldap") ?>
     <select name="enrol_ldap_course_shortname_editlock">
         <option value="0" <?php echo ($frm->enrol_ldap_course_shortname_editlock ? '' : 'selected="yes"') ?> >
@@ -303,7 +303,7 @@ if (!isset($frm->enrol_ldap_template)) {
             <?php  print_string("no")  ?></option>
         <option value="1" <?php echo ($frm->enrol_ldap_course_fullname_updatelocal ? 'selected="yes"' : '') ?> >
             <?php  print_string("yes") ?></option>
-    </select><BR>
+    </select><br/>
     <?php  print_string("enrol_ldap_editlock", "enrol_ldap") ?>
     <select name="enrol_ldap_course_idnumber_editlock">
         <option value="0" <?php echo ($frm->enrol_ldap_course_fullname_editlock ? '' : 'selected="yes"') ?> >
@@ -328,7 +328,7 @@ if (!isset($frm->enrol_ldap_template)) {
             <?php  print_string("no")  ?></option>
         <option value="1" <?php echo ($frm->enrol_ldap_course_summary_updatelocal ? 'selected="yes"' : '') ?> >
             <?php  print_string("yes") ?></option>
-    </select><BR>
+    </select><br/>
     <?php  print_string("enrol_ldap_editlock", "enrol_ldap") ?>
     <select name="enrol_ldap_course_summary_editlock">
         <option value="0" <?php echo ($frm->enrol_ldap_course_summary_editlock ? '' : 'selected="yes"') ?> >
index 987bc4e..f3dce52 100644 (file)
@@ -5,7 +5,7 @@
 </tr>
 <tr valign="top">
     <td align="left" colspan="3">
-    <a href="<?php echo $CFG->wwwroot .'/enrol/mnet/remote_hosts.php?sesskey=' . sesskey(); ?>" >Manage Moodle Network Enrolments.</a><br>
+    <a href="<?php echo $CFG->wwwroot .'/enrol/mnet/remote_hosts.php?sesskey=' . sesskey(); ?>" >Manage Moodle Network Enrolments.</a><br/>
     Servers configured: <?php echo count(array_keys($mnethosts)); ?>
 
     </td>
index d2346fc..945ba9c 100644 (file)
@@ -436,9 +436,9 @@ class enrolment_plugin_mnet {
             return $courses;
         } else {
             foreach ($mnetrequest->error as $code => $errormessage) {
-                $message .= "ERROR $code:<br>$errormessage<br>";
+                $message .= "ERROR $code:<br/>$errormessage<br/>";
             }
-            error("RPC enrol/mnet/available_courses:<br>$message");
+            error("RPC enrol/mnet/available_courses:<br/>$message");
         }
         return false;
     }
index c1b04ac..787a68e 100644 (file)
@@ -105,13 +105,13 @@ function algebra2tex($algebra) {
     $cmd  = "cd $CFG->dirroot\\$CFG->algebrafilterdirwin & algebra2tex.pl x/2";
     $test = `$cmd`;
     if ($test != '\frac{x}{2}') {
-      echo "There is a problem with either Perl or the script algebra2tex.pl<br>";
+      echo "There is a problem with either Perl or the script algebra2tex.pl<br/>";
       $ecmd = $cmd . " 2>&1";
-      echo `$ecmd` . "<br>\n";
-      echo "The shell command<br>$cmd<br>returned status = $status<br>\n";
+      echo `$ecmd` . "<br/>\n";
+      echo "The shell command<br/>$cmd<br/>returned status = $status<br/>\n";
       $commandpath = "$CFG->dirroot\\$CFG->algebrafilterdirwin\\algebra2tex.pl";
       if (file_exists($commandpath)) {
-        echo "The file permissions of algebra2tex.pl are: " . decoct(fileperms($commandpath)) . "<br>";
+        echo "The file permissions of algebra2tex.pl are: " . decoct(fileperms($commandpath)) . "<br/>";
       }
       die;
     }
@@ -121,13 +121,13 @@ function algebra2tex($algebra) {
     $cmd  = "cd $CFG->dirroot/$CFG->algebrafilterdir; ./algebra2tex.pl x/2";
     $test = `$cmd`;
     if ($test != '\frac{x}{2}') {
-      echo "There is a problem with either Perl or the script algebra2tex.pl<br>";
+      echo "There is a problem with either Perl or the script algebra2tex.pl<br/>";
       $ecmd = $cmd . " 2>&1";
-      echo `$ecmd` . "<br>\n";
-      echo "The shell command<br>$cmd<br>returned status = $status<br>\n";
+      echo `$ecmd` . "<br/>\n";
+      echo "The shell command<br/>$cmd<br/>returned status = $status<br/>\n";
       $commandpath = "$CFG->dirroot/$CFG->algebrafilterdir/algebra2tex.pl";
       if (file_exists($commandpath)) {
-        echo "The file permissions of algebra2tex.pl are: " . decoct(fileperms($commandpath)) . "<br>";
+        echo "The file permissions of algebra2tex.pl are: " . decoct(fileperms($commandpath)) . "<br/>";
       }
       die;
     }
index 68e1574..8b04ba0 100644 (file)
@@ -790,7 +790,7 @@ function grade_set_uncategorized() {
                                 if ($modgrades = $gradefunction($mod->instance)) {
                                     $itemcount++;
                                     //modgrades contains student information with associated grade
-                                    //echo "<b>modname: $mod->modname id: $mod->id course: $mod->course</b><br>";
+                                    //echo "<b>modname: $mod->modname id: $mod->id course: $mod->course</b><br/>";
                                     // get instance name from db.
                                     $instance = get_record($mod->modname, 'id', $mod->instance);
                                     // see if the item is already in the category table and if it is call category select with the id so it is selected
index d81e0c6..f62397a 100644 (file)
@@ -47,7 +47,7 @@ if ($success) {
                 if (! $userid = clean_param($userid, PARAM_INT)) {
                     continue;
                 }
-                //echo "Try user $userid, group $groupid<br>\n";
+                //echo "Try user $userid, group $groupid<br/>\n";
                 $success = groups_add_member($groupid, $userid);
                 if (! $success) {
                     print_error('Failed to add user $userid to group.');
index 32aaac9..4a003e9 100644 (file)
@@ -92,7 +92,7 @@ if ($use_firewall) {
 
      $fp = fsockopen ($firewall_host, $firewall_port, $errno, $errstr, 30) or die("Could not open socket to proxy");
      if (!$fp) {
-       echo "$errstr ($errno)<br>\n";
+       echo "$errstr ($errno)<br/>\n";
      } else {
        fputs ($fp, "GET http://netgeo.caida.org/perl/netgeo.cgi?target=$ip HTTP/1.0\r\nHost: netgeo.caida.org\r\n\r\n") or die("Could not write to socket");
        while (!feof($fp)) {
@@ -106,7 +106,7 @@ if ($use_firewall) {
 
 $fp = fsockopen ("netgeo.caida.org", 80, $errno, $errstr, 30) or die("Could not open socket to caida.org");
 if (!$fp) {
-    echo "$errstr ($errno)<br>\n";
+    echo "$errstr ($errno)<br/>\n";
 } else {
     fputs ($fp, "GET /perl/netgeo.cgi?target=$ip HTTP/1.0\r\nHost: netgeo.caida.org\r\n\r\n") or die("Could not write to socket");
     while (!feof($fp)) {
index a43640c..d04204d 100644 (file)
@@ -148,7 +148,7 @@ $string['auth_radiusnasport'] = 'Port to use to connect';
 $string['auth_radiussecret'] = 'Shared secret';
 
 // Shibboleth plugin
-$string['auth_shibbolethdescription'] = 'Using this method users are created and authenticated using <a href=\"http://shibboleth.internet2.edu/\" target=\"_blank\">Shibboleth</a>.<br>Be sure to read the <a href=\"../auth/shibboleth/README.txt\" target=\"_blank\">README</a> for Shibboleth on how to set up your Moodle with Shibboleth';
+$string['auth_shibbolethdescription'] = 'Using this method users are created and authenticated using <a href=\"http://shibboleth.internet2.edu/\" target=\"_blank\">Shibboleth</a>.<br/>Be sure to read the <a href=\"../auth/shibboleth/README.txt\" target=\"_blank\">README</a> for Shibboleth on how to set up your Moodle with Shibboleth';
 $string['auth_shibbolethtitle'] = 'Shibboleth';
 $string['auth_shibboleth_login'] = 'Shibboleth Login';
 $string['auth_shibboleth_manual_login'] = 'Manual Login';
index de6b0a4..f3100d2 100644 (file)
@@ -12,11 +12,11 @@ $string['allowedcourses'] = '$a allowed courses';
 $string['nocoursesdefined'] = 'No courses found. Define new courses <a href=\"$a\">here</a>.';
 $string['allowedcourseslinktext'] = 'Edit allowed courses and categories here.';
 $string['mnet_enrol_name']             = 'Moodle Networked Enrolment';
-$string['mnet_enrol_description']      = 'Publish this service to allow administrators at $a to enrol their students in courses you have created on your server.<br>' .
+$string['mnet_enrol_description']      = 'Publish this service to allow administrators at $a to enrol their students in courses you have created on your server.<br/>' .
                                          '<ul><li><em>Dependency</em>: You must also <strong>publish</strong> the SSO (Service Provider) service to $a.</li>'.
-                                         '<li><em>Dependency</em>: You must also <strong>subscribe</strong> to the SSO (Identity Provider) service on $a.</li></ul><br>'.
-                                         'Subscribe to this service to be able to enrol your students in courses  on $a.<br>'.
+                                         '<li><em>Dependency</em>: You must also <strong>subscribe</strong> to the SSO (Identity Provider) service on $a.</li></ul><br/>'.
+                                         'Subscribe to this service to be able to enrol your students in courses  on $a.<br/>'.
                                          '<ul><li><em>Dependency</em>: You must also <strong>subscribe</strong> to the SSO (Service Provider) service on $a.</li>'.
-                                         '<li><em>Dependency</em>: You must also <strong>publish</strong> the SSO (Identity Provider) service to $a.</li></ul><br>';
+                                         '<li><em>Dependency</em>: You must also <strong>publish</strong> the SSO (Identity Provider) service to $a.</li></ul><br/>';
 
 ?>
index 45330ac..41515aa 100644 (file)
@@ -11,8 +11,8 @@ It is calculated as:
 FI = (X<sub>average</sub>) / X<sub>max</sub> 
 <br />
 
-where X<sub>average</sub> is the mean credit obtained by all users attempting the item, <br>
-and X<sub>max</sub> is the maximum credit achievable for that item.<br>
+where X<sub>average</sub> is the mean credit obtained by all users attempting the item, <br/>
+and X<sub>max</sub> is the maximum credit achievable for that item.<br/>
 If questions can be distributed dicotomically into correct / uncorrect categories, 
 this parameter coincides with the percentage of users that answer the question correctly. </p>
 
@@ -47,7 +47,7 @@ The discrimination coefficient is a correlation coefficient between scores at th
 <br/>
 DC = Sum(xy)/ (N * s<sub>x</sub> * s<sub>y</sub>) 
 <br/>
-where Sum(xy) is the sum of the products of deviations for item scores and overall quiz scores, <br>
+where Sum(xy) is the sum of the products of deviations for item scores and overall quiz scores, <br/>
 N is the number of responses given to this question<br/>
 s<sub>x</sub> is the standard deviation of fractional scores for this question and, <br/>
 s<sub>y</sub> is the standard deviation of scores at the quiz as a whole.
index 61a7b4b..946d47e 100644 (file)
@@ -77,7 +77,7 @@ $string['displayleftif'] = 'and only display if $a has grade greater than:';
 $string['displayleftmenu'] = 'Display left menu';
 $string['displayofgrade'] = 'Display of grade (for students only)';
 $string['displayreview'] = 'Display review button';
-$string['displayscorewithessays'] = 'You earned $a->score out of $a->tempmaxgrade for the automatically graded questions.<br>Your $a->essayquestions essay question(s) will be graded and added<br />into your final score at a later date.<br /><br />Your current grade without the essay question(s) is $a->score out of $a->grade';
+$string['displayscorewithessays'] = 'You earned $a->score out of $a->tempmaxgrade for the automatically graded questions.<br/>Your $a->essayquestions essay question(s) will be graded and added<br />into your final score at a later date.<br /><br />Your current grade without the essay question(s) is $a->score out of $a->grade';
 $string['displayscorewithoutessays'] = 'Your score is $a->score (out of $a->grade).';
 $string['editlesson'] = 'Edit $a';
 $string['editlessonsettings'] = 'Edit lesson settings';
index 071b25a..67e9bb5 100644 (file)
@@ -4001,14 +4001,14 @@ function current_charset($ignorecache = false) {
  *
  * Prints out a translated string using the return value from the {@link get_string()} function.
  *
- * Example usage of this function when the string is in the moodle.php file:<br>
+ * Example usage of this function when the string is in the moodle.php file:<br/>
  * <code>
  * echo '<strong>';
  * print_string('wordforstudent');
  * echo '</strong>';
  * </code>
  *
- * Example usage of this function when the string is not in the moodle.php file:<br>
+ * Example usage of this function when the string is not in the moodle.php file:<br/>
  * <code>
  * echo '<h1>';
  * print_string('typecourse', 'calendar');
@@ -4064,7 +4064,7 @@ function clean_getstring_data( $a ) {
  *
  * Example usage of this function involves finding the string you would
  * like a local equivalent of and using its identifier and module information
- * to retrive it.<br>
+ * to retrive it.<br/>
  * If you open moodle/lang/en/moodle.php and look near line 1031
  * you will find a string to prompt a user for their word for student
  * <code>
index 969064d..5fb434b 100644 (file)
@@ -432,7 +432,7 @@ function choice_show_results($choice, $course, $cm, $forcepublish='') {
                 if ($choice->limitanswers && !$optionid==0) {
                     echo get_string("taken", "choice").":";
                     echo $countans;
-                    echo "<br>";
+                    echo "<br/>";
                     echo get_string("limit", "choice").":";
                     $choice_option = get_record("choice_options", "id", $optionid);
                     echo $choice_option->maxanswers;
@@ -527,7 +527,7 @@ function choice_show_results($choice, $course, $cm, $forcepublish='') {
                 if ($choice->limitanswers && !$optionid==0) {
                     echo get_string("taken", "choice").":";
                     echo $column[$optionid];
-                    echo "<br>";
+                    echo "<br/>";
                     echo get_string("limit", "choice").":";
                     $choice_option = get_record("choice_options", "id", $optionid);
                     echo $choice_option->maxanswers;
index a86b157..c9430af 100644 (file)
             $exercise->maxbytes = backup_todb($info['MOD']['#']['MAXBYTES']['0']['#']); 
             $exercise->deadline = backup_todb($info['MOD']['#']['DEADLINE']['0']['#']);
             $date = usergetdate($exercise->deadline);
-            fwrite ($restorelog_file,"<br>The Exercise - ".$exercise->name." <br>");
+            fwrite ($restorelog_file,"<br/>The Exercise - ".$exercise->name." <br/>");
             fwrite ($restorelog_file,"The DEADLINE was  " .$date['weekday'].", ".$date['mday']." ".$date['month']." ".$date['year']."");            
             $exercise->deadline += $restore->course_startdateoffset;
             $date = usergetdate($exercise->deadline);
-            fwrite ($restorelog_file,"&nbsp;&nbsp;&nbsp;the DEADLINE is now  " .$date['weekday'].",  ".$date['mday']." ".$date['month']." ".$date['year']."<br>");         
+            fwrite ($restorelog_file,"&nbsp;&nbsp;&nbsp;the DEADLINE is now  " .$date['weekday'].",  ".$date['mday']." ".$date['month']." ".$date['year']."<br/>");         
             $exercise->timemodified = backup_todb($info['MOD']['#']['TIMEMODIFIED']['0']['#']);
             $exercise->grade = backup_todb($info['MOD']['#']['GRADE']['0']['#']);
             $exercise->gradinggrade = backup_todb($info['MOD']['#']['GRADINGGRADE']['0']['#']);
index ff8e38c..fff068a 100644 (file)
@@ -97,7 +97,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>".format_text($category->name)."</b><br>";
+                echo "<center><b>".format_text($category->name)."</b><br/>";
 
                 $num_entries = count_records("glossary_entries_categories","categoryid",$category->id);
                 if ( $num_entries ) {
index 3b8ffd3..a853ecb 100644 (file)
@@ -576,7 +576,7 @@ function hotpot_set_attempt_details(&$attempt) {
         $attempt->details = '<?xml version="1.0"?><hpjsresult><fields>'.$attempt->details.'</fields></hpjsresult>';
     }
 
-//  print "forcing status to in progress ..<br>\n";
+//  print "forcing status to in progress ..<br/>\n";
 //  $attempt->status = HOTPOT_STATUS_INPROGRESS;
 }
 
index 41f1dcc..91655b2 100644 (file)
@@ -130,7 +130,7 @@ function hotpot_remove_orphans($secondarytable, $secondarykeyfield, $primarytabl
 
     if ($records) {
         $keys = implode(',', array_keys($records));
-        print "removing orphan record(s) from {$CFG->prefix}$secondarytable<br>";
+        print "removing orphan record(s) from {$CFG->prefix}$secondarytable<br/>";
         $ok = $ok && execute_sql("DELETE FROM {$CFG->prefix}$secondarytable WHERE $secondarykeyfield IN ($keys)");
     }
 
@@ -418,7 +418,7 @@ function hotpot_update_to_v2_1() {
         if (hotpot_rm("$CFG->dirroot{$ds}$dir", false)) {
             print get_string('success');
         } else {
-            print "failed<br>Please remove '$CFG->dirroot{$ds}$dir' manually";
+            print "failed<br/>Please remove '$CFG->dirroot{$ds}$dir' manually";
         }
         print "<br />\n";
     }
index 140a388..9dea6f8 100644 (file)
@@ -333,8 +333,8 @@ function hotpot_restore_record(&$restore, $status, &$xml, $table, $foreign_keys,
                         } else {
                             // foreign key could not be updated
                             if (!defined('RESTORE_SILENTLY')) {
-                                print "<ul><li><b>Warning:</b><br>Foreign key could not be updated:<br>";
-                                print "'$key_table' record (old id=$old_id) is missing from backup data<br>";
+                                print "<ul><li><b>Warning:</b><br/>Foreign key could not be updated:<br/>";
+                                print "'$key_table' record (old id=$old_id) is missing from backup data<br/>";
                                 print "'$table' record ";
                                 if (isset($record->id)) {
                                     print "(old id=$record->id) ";
index 0489557..6dfeb25 100644 (file)
@@ -22,7 +22,7 @@ function lams_update_instance($lams) {
 /// Given an object containing all the necessary data,
 /// (defined by the form in mod.html) this function
 /// will update an existing instance with new data.
-    //echo "enter lams_update_instance<BR>";
+    //echo "enter lams_update_instance<br/>";
   $lams->timemodified = time();
   $lams->id = $lams->instance;
   lams_delete_lesson($USER->username,$lams->learning_session_id);
@@ -31,13 +31,13 @@ function lams_update_instance($lams) {
         return false;
     }
     # May have to add extra stuff in here #
-  //echo $lams->id."<BR>";
-    //echo $lams->sequence."<BR>";
-    //echo $lams->course."<BR>";
-    //echo $lams->name."<BR>";
-    //echo $lams->introduction."<BR>";
-    //echo $lams->learning_session_id."<BR>";
-    //echo "exit lams_update_instance<BR>";
+  //echo $lams->id."<br/>";
+    //echo $lams->sequence."<br/>";
+    //echo $lams->course."<br/>";
+    //echo $lams->name."<br/>";
+    //echo $lams->introduction."<br/>";
+    //echo $lams->learning_session_id."<br/>";
+    //echo "exit lams_update_instance<br/>";
   return update_record("lams", $lams);
 }
 
@@ -203,17 +203,17 @@ function lams_get_sequences($username,$courseid) {
  * @return int lesson id
  */
 function lams_get_lesson($username,$ldid,$courseid,$title,$desc,$type) {
-    //echo "enter lams_get_lesson<BR>";
+    //echo "enter lams_get_lesson<br/>";
     global $CFG,$USER;
     if(!isset($CFG->lams_serverid)||!isset($CFG->lams_serverkey))
     {
-        //echo "serverid or serverkey is not set<BR>";
+        //echo "serverid or serverkey is not set<br/>";
         return NULL;
     }
     $relativeurl="/services/LearningSessionService?wsdl";
     $s = lams_get_soap_client($relativeurl);
     if(is_null($s)){
-        //echo "soap client is null<BR>";
+        //echo "soap client is null<br/>";
         return NULL;
     }
     $datetime =    date("F d,Y g:i a");
@@ -226,8 +226,8 @@ function lams_get_lesson($username,$ldid,$courseid,$title,$desc,$type) {
     //echo $hashvalue;
     $parameters = array($CFG->lams_serverid,$datetime,$hashvalue,$username,$ldid,$courseid,$title,$desc,$type);
     $result = $s->call('createLearningSession',$parameters);
-    //echo "result:".$result."<BR>";
-    //echo "exit lams_get_lesson<BR>";
+    //echo "result:".$result."<br/>";
+    //echo "exit lams_get_lesson<br/>";
     if($s->getError()){
         $result = $s->getError();
     }
@@ -243,7 +243,7 @@ function lams_get_lesson($username,$ldid,$courseid,$title,$desc,$type) {
  * @return true or false
  */
 function lams_delete_lesson($username,$lsid) {
-    //echo "enter lams_get_lesson<BR>";
+    //echo "enter lams_get_lesson<br/>";
     global $CFG,$USER;
     if(!isset($CFG->lams_serverid)||!isset($CFG->lams_serverkey))
     {
@@ -281,7 +281,7 @@ function lams_delete_lesson($username,$lsid) {
  /*
 function lams_get_class($courseid) {
     global $CFG,$USER;
-    //echo "enter lams_get_class"."<BR>";
+    //echo "enter lams_get_class"."<br/>";
     $orgId = lams_get_organisation();
     if(empty($orgId)){
         return NULL;
@@ -301,14 +301,14 @@ function lams_get_class($courseid) {
       $result = $s->call('createClass',$parameters);
       //echo "<xmp/>".$s->request."</xmp>";
       //echo "<xmp/>".$s->response."</xmp>";
-      //echo "result:".$result."<BR>";
+      //echo "result:".$result."<br/>";
        $lams_course->course = $courseid;
        $lams_course->classid = $result;
         insert_record("lams_course",$lams_course);
-        //echo "exit lams_get_class"."<BR>";
+        //echo "exit lams_get_class"."<br/>";
          return $result;
   }else{
-      //echo "exit lams_get_class"."<BR>";
+      //echo "exit lams_get_class"."<br/>";
       return $lams_course->classid;
   }
 }
@@ -322,7 +322,7 @@ function lams_get_class($courseid) {
  /*
 function lams_get_organisation() {
     global $CFG,$USER;
-    //echo "enter lams_get_organisaiton"."<BR>";
+    //echo "enter lams_get_organisaiton"."<br/>";
     if(!isset($CFG->lams_serverid)||!isset($CFG->lams_serverkey))
     {
         return NULL;
@@ -341,11 +341,11 @@ function lams_get_organisation() {
       //echo "<xmp/>".$s->request."</xmp>";
       //echo "<xmp/>".$s->response."</xmp>";
       set_config("lams_orgid",$result);
-      //echo "result:".$result."<BR>";
-      //echo "exit lams_get_organisaiton"."<BR>";
+      //echo "result:".$result."<br/>";
+      //echo "exit lams_get_organisaiton"."<br/>";
       return $result;
     }else{
-        //echo "exit lams_get_organisaiton"."<BR>";
+        //echo "exit lams_get_organisaiton"."<br/>";
         return $CFG->lams_orgid;
     }
 }
@@ -364,7 +364,7 @@ function lams_get_organisation() {
  /*
 function lams_get_user($username,$courseid) {
     global $CFG,$USER;
-    //echo "enter lams_get_user"."<BR>";
+    //echo "enter lams_get_user"."<br/>";
     if(!isset($CFG->lams_serverid)||!isset($CFG->lams_serverkey))
     {
         return NULL;
@@ -397,11 +397,11 @@ function lams_get_user($username,$courseid) {
       $lams_user->username = $username;
       $lams_user->login = $result;
       insert_record("lams_user",$lams_user);
-      //echo "result:".$result."<BR>";
-      //echo "exit lams_get_user"."<BR>";
+      //echo "result:".$result."<br/>";
+      //echo "exit lams_get_user"."<br/>";
       return $result;
     }else{
-        //echo "exit lams_get_user"."<BR>";
+        //echo "exit lams_get_user"."<br/>";
         return $lams_user->login;
     }
 }
@@ -432,7 +432,7 @@ function lams_get_user_roles($userid=0, $courseid){
             $roles .= "|"."learner";
         }
     }
-    //echo $roles."<BR>";
+    //echo $roles."<br/>";
     return $roles;
 }
 */
index c18de97..33c840f 100644 (file)
@@ -291,19 +291,19 @@ function processStateChange() {
                 "<p>Select an existing sequence or create a new sequence.</p>";
         }else if(req.status == 504){//gateway timeout. probabaly LAMS server is not available.
             document.getElementById("message").innerHTML =
-                '<table align="center" width="57%"  class="noticebox" border="0" cellpadding="15" cellspacing="0"><tr><td bgcolor="#FFAAAA" class="noticeboxcontent"><h4   class="main">It seems the LAMS server is not available!<BR> Please contact your administrator.</h4></td></tr></table>';
+                '<table align="center" width="57%"  class="noticebox" border="0" cellpadding="15" cellspacing="0"><tr><td bgcolor="#FFAAAA" class="noticeboxcontent"><h4   class="main">It seems the LAMS server is not available!<br/> Please contact your administrator.</h4></td></tr></table>';
         }else if(req.status == 401){//AuthenticationException thrown by LAMS server.
             document.getElementById("message").innerHTML =
-                '<table align="center" width="57%"  class="noticebox" border="0" cellpadding="15" cellspacing="0"><tr><td bgcolor="#FFAAAA" class="noticeboxcontent"><h4   class="main">This moodle server is not authenticated by LAMS!<BR> Please contact your administrator.</h4></td></tr></table>';
+                '<table align="center" width="57%"  class="noticebox" border="0" cellpadding="15" cellspacing="0"><tr><td bgcolor="#FFAAAA" class="noticeboxcontent"><h4   class="main">This moodle server is not authenticated by LAMS!<br/> Please contact your administrator.</h4></td></tr></table>';
         }else if(req.status == 502){//Unknow exception thrown by LAMS server
             document.getElementById("message").innerHTML =
                 '<table align="center" width="57%"  class="noticebox" border="0" cellpadding="15" cellspacing="0"><tr><td bgcolor="#FFAAAA" class="noticeboxcontent"><h4   class="main">An unexpected error returned from LAMS server:'+req.responseText+'! Please contact your administrator.</h4></td></tr></table>';
         }else if(req.status == 417){//ServerNotFound exception thrown by LAMS server
             document.getElementById("message").innerHTML =
-                '<table align="center" width="57%"  class="noticebox" border="0" cellpadding="15" cellspacing="0"><tr><td bgcolor="#FFAAAA" class="noticeboxcontent"><h4   class="main">This moodle server has not registered in LAMS!<BR> Please contact your administrator.</h4></td></tr></table>';
+                '<table align="center" width="57%"  class="noticebox" border="0" cellpadding="15" cellspacing="0"><tr><td bgcolor="#FFAAAA" class="noticeboxcontent"><h4   class="main">This moodle server has not registered in LAMS!<br/> Please contact your administrator.</h4></td></tr></table>';
         }else if(req.status == 402){//All LAMS module settings have not not been set up
             document.getElementById("message").innerHTML =
-                '<table align="center" width="57%"  class="noticebox" border="0" cellpadding="15" cellspacing="0"><tr><td bgcolor="#FFAAAA" class="noticeboxcontent"><h4   class="main">All the LAMS module settings have not been set up!<BR> Please contact your administrator.</h4></td></tr></table>';
+                '<table align="center" width="57%"  class="noticebox" border="0" cellpadding="15" cellspacing="0"><tr><td bgcolor="#FFAAAA" class="noticeboxcontent"><h4   class="main">All the LAMS module settings have not been set up!<br/> Please contact your administrator.</h4></td></tr></table>';
         }else{//this error should come from moodle server itself
             document.getElementById("message").innerHTML =
                 '<table align="center" width="57%"  class="noticebox" border="0" cellpadding="15" cellspacing="0"><tr><td bgcolor="#FFAAAA" class="noticeboxcontent"><h4   class="main">It should be a moodle server error:'+req.status + ' ' + req.statusText+'! Please contact your administrator.</h4></td></tr></table>';
index 9382ffc..7068d02 100644 (file)
@@ -8,7 +8,7 @@
  **/
 
 function removedoublecr($filename) {
-// This function will adjust a file in roughly Aiken style by replacing extra newlines with <BR> tags
+// This function will adjust a file in roughly Aiken style by replacing extra newlines with <br/> tags
 // so that instructors can have newlines wherever they like as long as the overall format is in Aiken
     
     $filearray = file($filename);
@@ -27,7 +27,7 @@ function removedoublecr($filename) {
             if (count($outarray) ) {
                 // get the last item in the outarray
                 $cur_pos = (count($outarray) - 1);
-                $outarray[$cur_pos] = trim($outarray[$cur_pos])."<br>\n";
+                $outarray[$cur_pos] = trim($outarray[$cur_pos])."<br/>\n";
             }
         }
         else {
index c42174a..e611a50 100644 (file)
                 if (!defined('RESTORE_SILENTLY')) {
                     echo ".";
                     if (($i+1) % 200 == 0) {
-                        echo "<br>";
+                        echo "<br/>";
                     }
                 }
                 backup_flush(300);
                     if (!defined('RESTORE_SILENTLY')) {
                         echo ".";
                         if (($i+1) % 200 == 0) {
-                            echo "<br>";
+                            echo "<br/>";
                         }
                     }
                     backup_flush(300);
                     if (!defined('RESTORE_SILENTLY')) {
                         echo ".";
                         if (($i+1) % 1000 == 0) {
-                            echo "<br>";
+                            echo "<br/>";
                         }
                     }
                     backup_flush(300);
                     if (!defined('RESTORE_SILENTLY')) {
                         echo ".";
                         if (($i+1) % 1000 == 0) {
-                            echo "<br>";
+                            echo "<br/>";
                         }
                     }
                     backup_flush(300);
                     if (!defined('RESTORE_SILENTLY')) {
                         echo ".";
                         if (($i+1) % 1000 == 0) {
-                            echo "<br>";
+                            echo "<br/>";
                         }
                     }
                     backup_flush(300);
                     if (!defined('RESTORE_SILENTLY')) {
                         echo ".";
                         if (($i+1) % 1000 == 0) {
-                            echo "<br>";
+                            echo "<br/>";
                         }
                     }
                     backup_flush(300);
                     if (!defined('RESTORE_SILENTLY')) {
                         echo ".";
                         if (($i+1) % 1000 == 0) {
-                            echo "<br>";
+                            echo "<br/>";
                         }
                     }
                     backup_flush(300);
                     if (!defined('RESTORE_SILENTLY')) {
                         echo ".";
                         if (($i+1) % 1000 == 0) {
-                            echo "<br>";
+                            echo "<br/>";
                         }
                     }
                     backup_flush(300);
             break;
         default:
             if (!defined('RESTORE_SILENTLY')) {
-                echo "action (".$log->module."-".$log->action.") unknown. Not restored<br>";                 //Debug
+                echo "action (".$log->module."-".$log->action.") unknown. Not restored<br/>";                 //Debug
             }
             break;
         }
index 0ffdec0..ee349d5 100644 (file)
                 $path = $dirpath.'/'.$filename;
                 if (is_dir($path) && file_exists("$path/imsmanifest.xml")) {
                     if ($all == 'force' || !file_exists("$path/moodle_inx.ser")) {
-                        echo "DEPLOYING $path<br>";
+                        echo "DEPLOYING $path<br/>";
                         ims_deploy_file($file.'/'.$filename, $all);
                     }
                 }
                 else if (is_dir($path)) {
-                    echo "DEPLOYING $path<br>";
+                    echo "DEPLOYING $path<br/>";
                     ims_deploy_folder($file.'/'.$filename, $all); 
                 }
                 else {
-                    echo "WONT DEPLOY $path<br>";
+                    echo "WONT DEPLOY $path<br/>";
                 }
             }
         }
index f68e9d0..4a03a58 100644 (file)
@@ -19,8 +19,8 @@ $ewiki_idf_url = array( "http://",
                         "file://" );
 
 // allowed wikinames
-//define( "EWIKI_CHARS_L", "a-zäöüß_µ¤$" );
-//define( "EWIKI_CHARS_U", "A-ZÄÖÜ" );
+//define( "EWIKI_CHARS_L", "a-z����_��$" );
+//define( "EWIKI_CHARS_U", "A-Z���" );
 
 function wiki_format( $wiki_source,
                       $strip_slashes = true,
@@ -56,7 +56,7 @@ function wiki_format( $wiki_source,
   $syn_htmlentities = array( "&" => "&amp;",
                              ">" => "&gt;",
                              "<" => "&lt;",
-                             "%%%" => "<br>" );
+                             "%%%" => "<br/>" );
 
   $wm_list = array( "-" => array('ul type="square"', "", "li"),
                     "*" => array('ul type="circle"', "", "li"),
@@ -72,7 +72,7 @@ function wiki_format( $wiki_source,
                           // "###" => array("<big><b>", "</b></big>"),
                           "**" => array("<b>", "</b>"),
                           "##" => array("<big>", "</big>"),
-                          "µµ" => array("<small>", "</small>") );
+                          "��" => array("<small>", "</small>") );
 
   $link_regex = "#(!?\[[^[\]\n]+\])|((?:!?[a-z]{2,6}://|mailto:)[^\s\[\]\'\"\)\,<]+)#";
 
index 04772c5..c1e18ab 100644 (file)
   //now blocks...
   //
 
-  mtrace(".<br><a href='index.php'>Back to query page</a>.");
+  mtrace(".<br/><a href='index.php'>Back to query page</a>.");
   mtrace('</pre>');
 
   //finished, turn busy flag off
index 92d5e75..ba40fc7 100644 (file)
     if (is_array($str) or is_object($str)) {
       print_r($str);
     } else if ($str) {
-      print $str."<br>";
+      print $str."<br/>";
     } //if
 
     exit(0);
index a24db4c..f83cc6f 100644 (file)
   ?>
 </form>
 
-<br>
+<br/>
 
 <?php
 
index b0a1609..d31cd73 100644 (file)
@@ -90,7 +90,7 @@
   //now blocks...
   //
 
-  mtrace("<br><a href='../index.php'>Back to query page</a> or <a href='../indexersplash.php'>Start indexing</a>.");
+  mtrace("<br/><a href='../index.php'>Back to query page</a> or <a href='../indexersplash.php'>Start indexing</a>.");
   mtrace('</pre>');
 
 ?>
\ No newline at end of file