From 7150226896f5d81044e910b92f41a8df4af0c558 Mon Sep 17 00:00:00 2001 From: skodak Date: Thu, 4 Jan 2007 23:38:17 +0000 Subject: [PATCH] MDL-7861 xhtml strict fixes - fixed all
in our code --- auth/mnet/auth.php | 4 +- auth/radius/auth.php | 20 ++++---- auth/shibboleth/config.html | 2 +- backup/backuplib.php | 2 +- backup/restorelib.php | 10 ++-- blocks/search/config_global.html | 4 +- course/format/lams/format.php | 2 +- enrol/ldap/config.html | 8 +-- enrol/mnet/config.html | 2 +- enrol/mnet/enrol.php | 4 +- filter/algebra/algebradebug.php | 16 +++--- grade/lib.php | 2 +- group/assign.php | 2 +- iplookup/ipatlas/plot.inc | 4 +- lang/en_utf8/auth.php | 2 +- lang/en_utf8/enrol_mnet.php | 8 +-- lang/en_utf8/help/quiz/itemanalysis.html | 6 +-- lang/en_utf8/lesson.php | 2 +- lib/moodlelib.php | 6 +-- mod/choice/lib.php | 4 +- mod/exercise/restorelib.php | 4 +- mod/glossary/editcategories.php | 2 +- mod/hotpot/attempt.php | 2 +- mod/hotpot/db/update_to_v2.php | 4 +- mod/hotpot/restorelib.php | 4 +- mod/lams/lib.php | 54 ++++++++++----------- mod/lams/mod.html | 8 +-- mod/lesson/reformat.php | 4 +- mod/lesson/restorelib.php | 18 +++---- mod/resource/type/ims/repository_deploy.php | 6 +-- mod/wiki/ewiki/fragments/wiki_format.inc | 8 +-- search/indexer.php | 2 +- search/lib.php | 2 +- search/query.php | 2 +- search/tests/index.php | 2 +- 35 files changed, 116 insertions(+), 116 deletions(-) diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php index 305466f9471..4b675fd308f 100644 --- a/auth/mnet/auth.php +++ b/auth/mnet/auth.php @@ -234,9 +234,9 @@ class auth_plugin_mnet $remoteuser = (object) $mnetrequest->response; } else { foreach ($mnetrequest->error as $code => $errormessage) { - $message .= "ERROR $code:
$errormessage
"; + $message .= "ERROR $code:
$errormessage
"; } - error("RPC auth/mnet/user_authorise:
$message"); + error("RPC auth/mnet/user_authorise:
$message"); } if (empty($remoteuser) or empty($remoteuser->username)) { diff --git a/auth/radius/auth.php b/auth/radius/auth.php index abe23e310cb..c173eaeb242 100644 --- a/auth/radius/auth.php +++ b/auth/radius/auth.php @@ -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
"); - // printf("Password: $password
"); - // printf("host: $this->config->host
"); - // printf("nasport: $this->config->nasport
"); - // printf("secret: $this->config->secret
"); + // printf("Username: $username
"); + // printf("Password: $password
"); + // printf("host: $this->config->host
"); + // printf("nasport: $this->config->nasport
"); + // printf("secret: $this->config->secret
"); $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
\n", $rauth->getError()); + printf("Radius start: %s
\n", $rauth->getError()); exit; } $result = $rauth->send(); if (PEAR::isError($result)) { - printf("Radius send failed: %s
\n", $result->getMessage()); + printf("Radius send failed: %s
\n", $result->getMessage()); exit; } else if ($result === true) { - // printf("Radius Auth succeeded
\n"); + // printf("Radius Auth succeeded
\n"); return true; } else { - // printf("Radius Auth rejected
\n"); + // printf("Radius Auth rejected
\n"); return false; } // get attributes, even if auth failed if (!$rauth->getAttributes()) { - printf("Radius getAttributes: %s
\n", $rauth->getError()); + printf("Radius getAttributes: %s
\n", $rauth->getError()); } else { $rauth->dumpAttributes(); } diff --git a/auth/shibboleth/config.html b/auth/shibboleth/config.html index a20e9d2fe14..b019837ae65 100755 --- a/auth/shibboleth/config.html +++ b/auth/shibboleth/config.html @@ -49,7 +49,7 @@ convert_data and $config->convert_data != '' and !is_readable($config->convert_data)) { - echo '
'; + echo '
'; print_string("auth_shib_convert_data_warning", "auth"); echo ''; } diff --git a/backup/backuplib.php b/backup/backuplib.php index 987d000eaed..231b187496e 100644 --- a/backup/backuplib.php +++ b/backup/backuplib.php @@ -1943,7 +1943,7 @@ $status = zip_files($files, "$basedir/$name"); - //echo "
Status: ".$status; //Debug + //echo "
Status: ".$status; //Debug return $status; } diff --git a/backup/restorelib.php b/backup/restorelib.php index e050059b712..ad62c8aaf3d 100644 --- a/backup/restorelib.php +++ b/backup/restorelib.php @@ -6111,14 +6111,14 @@ fwrite ($restorelog_file,""); fwrite ($restorelog_file,$stylesheetshtml); fwrite ($restorelog_file,"".$course_header->course_shortname." Restored "); - fwrite ($restorelog_file,"

The following changes were made during the Restoration of this Course.



"); - fwrite ($restorelog_file,"The Course ShortName is now - ".$course_header->course_shortname." The FullName is now - ".$course_header->course_fullname."

"); + fwrite ($restorelog_file,"

The following changes were made during the Restoration of this Course.



"); + fwrite ($restorelog_file,"The Course ShortName is now - ".$course_header->course_shortname." The FullName is now - ".$course_header->course_fullname."

"); $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,"   This Courses Start Date is now " .$date['weekday'].", ".$date['mday']." ".$date['month']." ".$date['year']."

"); + fwrite ($restorelog_file,"   This Courses Start Date is now " .$date['weekday'].", ".$date['mday']." ".$date['month']." ".$date['year']."

"); if ($status) { return $restorelog_file; @@ -6139,8 +6139,8 @@ $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,"
This file was written to directly by each modules restore process."); - fwrite ($restorelog_file,"

Log complete."); + fwrite ($restorelog_file,"
This file was written to directly by each modules restore process."); + fwrite ($restorelog_file,"

Log complete."); if ($status) { return $restorelog_file; diff --git a/blocks/search/config_global.html b/blocks/search/config_global.html index 63e6a1b5912..b16c2f45031 100644 --- a/blocks/search/config_global.html +++ b/blocks/search/config_global.html @@ -5,7 +5,7 @@ p($CFG->block_search_text); } else { p("Search Moodle"); - } ?>"/>
+ } ?>"/>
"/>

+ } ?>"/>

\ No newline at end of file diff --git a/course/format/lams/format.php b/course/format/lams/format.php index 056003be8f7..617b5ac7f91 100644 --- a/course/format/lams/format.php +++ b/course/format/lams/format.php @@ -115,7 +115,7 @@ if ($thissection->summary or $thissection->sequence or isediting($course->id)) { ''. ''. '
'. - '

All the LAMS module settings have not been set up!
Please contact your administrator.

'. + '

All the LAMS module settings have not been set up!
Please contact your administrator.

'. '
'. ''. ''. diff --git a/enrol/ldap/config.html b/enrol/ldap/config.html index 20b6a0d6945..ced5cd395ae 100755 --- a/enrol/ldap/config.html +++ b/enrol/ldap/config.html @@ -254,7 +254,7 @@ if (!isset($frm->enrol_ldap_template)) { -
+

+

+

+