diff --git a/admin/auth.php b/admin/auth.php index 0b2d3f73231..2dba551f1ce 100644 --- a/admin/auth.php +++ b/admin/auth.php @@ -216,7 +216,7 @@ foreach ($displayauths as $auth => $name) { admin_externalpage_print_header($adminroot); print_simple_box(get_string('configauthenticationplugins', 'admin'), 'center', '700'); -echo "
frametarget name=\"authmenu\" method=\"post\" action=\"auth.php\">"; +echo "frametarget id=\"authmenu\" method=\"post\" action=\"auth.php\">"; echo "sesskey."\">"; print_table($table); diff --git a/admin/auth_config.php b/admin/auth_config.php index 47e2516e222..578ca0ce5b6 100644 --- a/admin/auth_config.php +++ b/admin/auth_config.php @@ -62,12 +62,8 @@ asort($options); admin_externalpage_print_header($adminroot); // choose an authentication method -echo "frametarget name=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n"; +echo "frametarget id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n"; echo "sesskey."\">\n"; -echo "

\n"; -echo get_string('chooseauthmethod').': '; -choose_from_menu ($options, "auth", $auth, '', "document.location='auth_config.php?sesskey=$USER->sesskey&auth='+document.authmenu.auth.options[document.authmenu.auth.selectedIndex].value", ''); -echo "

\n\n"; // auth plugin description print_simple_box_start('center', '80%'); @@ -118,10 +114,18 @@ function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts, foreach ($user_fields as $field) { // Define some vars we'll work with - optional_variable($pluginconfig->{"field_map_$field"}, ''); - optional_variable($pluginconfig->{"field_updatelocal_$field"}, ''); - optional_variable($pluginconfig->{"field_updateremote_$field"}, ''); - optional_variable($pluginconfig->{"field_lock_$field"}, ''); + if (isset($pluginconfig->{"field_map_$field"})) { + $pluginconfig->{"field_map_$field"} = ''; + } + if (isset($pluginconfig->{"field_updatelocal_$field"})) { + $pluginconfig->{"field_updatelocal_$field"} = ''; + } + if (isset($pluginconfig->{"field_updateremote_$field"})) { + $pluginconfig->{"field_updateremote_$field"} = ''; + } + if (isset($pluginconfig->{"field_lock_$field"})) { + $pluginconfig->{"field_lock_$field"} = ''; + } // define the fieldname we display to the user $fieldname = $field; diff --git a/admin/enrol.php b/admin/enrol.php index 6d07cdd9398..3f6cfb2fdb6 100644 --- a/admin/enrol.php +++ b/admin/enrol.php @@ -52,7 +52,7 @@ print_simple_box(get_string('configenrolmentplugins', 'admin'), 'center', '700'); - echo "frametarget name=\"enrolmenu\" method=\"post\" action=\"enrol.php\">"; + echo "frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol.php\">"; echo "sesskey."\" />"; $table = new stdClass(); diff --git a/admin/enrol_config.php b/admin/enrol_config.php index 925546cab85..f69e7d54776 100644 --- a/admin/enrol_config.php +++ b/admin/enrol_config.php @@ -44,17 +44,8 @@ admin_externalpage_print_header($adminroot); - echo "frametarget name=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">"; + echo "frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">"; echo "sesskey."\">"; - echo "

"; - - -/// Choose an enrolment method - echo get_string('chooseenrolmethod').': '; - choose_from_menu ($options, "enrol", $enrol, "", - "document.location='enrol_config.php?enrol='+document.enrolmenu.enrol.options[document.enrolmenu.enrol.selectedIndex].value", ""); - - echo "

"; /// Print current enrolment type description print_simple_box_start("center", "80%"); diff --git a/admin/lang.php b/admin/lang.php index 83a4e06fd39..8d1b8428355 100644 --- a/admin/lang.php +++ b/admin/lang.php @@ -401,7 +401,7 @@ @include("$langdir/$currentfile"); if ($editable) { - echo ""; + echo ""; } echo ""; $linescounter = 0; diff --git a/admin/langdoc.php b/admin/langdoc.php index 25ff92dcdf8..d6d2ebf59f1 100755 --- a/admin/langdoc.php +++ b/admin/langdoc.php @@ -169,7 +169,7 @@ $langdir/$currentfile")."

"; echo "
\n"; if ($editable) { - echo ""; + echo ""; echo ''; echo ''; diff --git a/admin/langimport.php b/admin/langimport.php index 5c4b7fa8d26..f671df4985c 100755 --- a/admin/langimport.php +++ b/admin/langimport.php @@ -246,7 +246,7 @@ print_simple_box_start('center','60%'); echo ''; echo '
'; - echo ''; + echo ''; echo ''; unset($CFG->langlist); // ignore admin's langlist $installedlangs = get_list_of_languages(); @@ -261,7 +261,7 @@ echo ''; echo '
'; echo ''; - echo '
'; + echo ''; echo '
'; echo '
'; @@ -275,7 +275,7 @@ /// if this language pack is not already installed, then we allow installation - echo '
'; + echo ''; echo ''; echo '
\n"; if ($remote) { diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php index 43036863743..046159ff3c5 100644 --- a/admin/mnet/access_control.php +++ b/admin/mnet/access_control.php @@ -171,7 +171,7 @@ print_simple_box_start('center','90%','','20'); ?>
- + \n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/admin/roles/assign.html b/admin/roles/assign.html index a7c87854bd7..7286706f502 100755 --- a/admin/roles/assign.html +++ b/admin/roles/assign.html @@ -1,4 +1,4 @@ - + @@ -11,9 +11,9 @@
+ onfocus="getElementById('assignform').add.disabled=false; + getElementById('assignform').remove.disabled=true; + getElementById('assignform').removeselect.selectedIndex=-1;"> - + diff --git a/admin/roles/manage.php b/admin/roles/manage.php index 02c37ee3c40..f630aa5ca81 100755 --- a/admin/roles/manage.php +++ b/admin/roles/manage.php @@ -326,11 +326,11 @@ echo '
'; if ($action == 'view') { echo get_string('selectrole', 'role').': '; - echo ''; + echo ''; echo ''; choose_from_menu ($roleoptions, 'roleid', $roleid, get_string('listallroles', 'role').'...', $script='switchrole.submit()'); echo ''; - echo '
'; + echo ''; echo ''; echo ''; echo ''; diff --git a/admin/roles/override.html b/admin/roles/override.html index b03224f1a6d..8a9800bb050 100755 --- a/admin/roles/override.html +++ b/admin/roles/override.html @@ -5,7 +5,7 @@ $strprohibit = get_string('prohibit','role'); ?> - + diff --git a/admin/search.php b/admin/search.php index f33028ef8cd..c68ef13801e 100644 --- a/admin/search.php +++ b/admin/search.php @@ -58,7 +58,7 @@ if ($statusmsg != '') { $resultshtml = search_settings_html(admin_get_root(), $query); -echo ''; +echo ''; echo ''; echo ''; echo '
'; diff --git a/admin/settings.php b/admin/settings.php index 43d6ac66746..9279b9700ca 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -115,7 +115,7 @@ if ($statusmsg != '') { // --------------------------------------------------------------------------------------------------------------- -echo ''; +echo ''; echo ''; echo ''; echo ''; diff --git a/admin/upgradesettings.php b/admin/upgradesettings.php index 7bcf6ce44ed..3b6482c4202 100644 --- a/admin/upgradesettings.php +++ b/admin/upgradesettings.php @@ -58,7 +58,7 @@ admin_externalpage_print_header($adminroot); print_simple_box(get_string('upgradesettingsintro','admin'),'','100%','',5,'generalbox',''); -echo ''; +echo ''; echo ''; echo '
'; echo '
'; diff --git a/admin/xmldb/actions/edit_field/edit_field.class.php b/admin/xmldb/actions/edit_field/edit_field.class.php index 71e0b04f42e..bd833613cce 100644 --- a/admin/xmldb/actions/edit_field/edit_field.class.php +++ b/admin/xmldb/actions/edit_field/edit_field.class.php @@ -98,7 +98,7 @@ class edit_field extends XMLDBAction { $origstructure =& $dbdir->xml_file->getStructure(); /// Add the main form - $o = ''; + $o = ''; $o.= ' '; $o.= ' '; $o.= ' '; diff --git a/admin/xmldb/actions/edit_index/edit_index.class.php b/admin/xmldb/actions/edit_index/edit_index.class.php index 5e7a5e7f715..4aaaf8b9fc7 100644 --- a/admin/xmldb/actions/edit_index/edit_index.class.php +++ b/admin/xmldb/actions/edit_index/edit_index.class.php @@ -98,7 +98,7 @@ class edit_index extends XMLDBAction { $origstructure =& $dbdir->xml_file->getStructure(); /// Add the main form - $o = ''; + $o = ''; $o.= ' '; $o.= ' '; $o.= ' '; diff --git a/admin/xmldb/actions/edit_key/edit_key.class.php b/admin/xmldb/actions/edit_key/edit_key.class.php index 68812de24da..24d316386a7 100644 --- a/admin/xmldb/actions/edit_key/edit_key.class.php +++ b/admin/xmldb/actions/edit_key/edit_key.class.php @@ -98,7 +98,7 @@ class edit_key extends XMLDBAction { $origstructure =& $dbdir->xml_file->getStructure(); /// Add the main form - $o = ''; + $o = ''; $o.= ' '; $o.= ' '; $o.= ' '; diff --git a/admin/xmldb/actions/edit_sentence/edit_sentence.class.php b/admin/xmldb/actions/edit_sentence/edit_sentence.class.php index 24bf5902722..300f192f908 100644 --- a/admin/xmldb/actions/edit_sentence/edit_sentence.class.php +++ b/admin/xmldb/actions/edit_sentence/edit_sentence.class.php @@ -114,7 +114,7 @@ class edit_sentence extends XMLDBAction { $values = $statement->getValuesFromInsertSentence($sentence); /// Add the main form - $o = ''; + $o = ''; $o.= ' '; $o.= ' '; $o.= ' '; diff --git a/auth/cas/index_form.html b/auth/cas/index_form.html index 0cc529d5cd2..78ee639482b 100644 --- a/auth/cas/index_form.html +++ b/auth/cas/index_form.html @@ -15,12 +15,12 @@ ()

- +
".get_string("location")."
@@ -29,7 +29,7 @@ guestloginbutton) { ?>

:

- + " /> @@ -42,7 +42,7 @@ ?>

- + @@ -56,7 +56,7 @@ print_string("loginsteps", "", "signup.php"); ?>
-
+ " />
@@ -71,7 +71,7 @@ ?>
-
+ " />
diff --git a/backup/backup_check.html b/backup/backup_check.html index af5e194c38e..225ff656eb7 100644 --- a/backup/backup_check.html +++ b/backup/backup_check.html @@ -35,7 +35,7 @@ } ?> - +
- - + + " />
- +
- +

- +
diff --git a/blocks/login/block_login.php b/blocks/login/block_login.php index decfe2cd44f..2db70cead67 100644 --- a/blocks/login/block_login.php +++ b/blocks/login/block_login.php @@ -42,7 +42,7 @@ class block_login extends block_base { if (empty($USER->loggedin) or isguest()) { // Show the block - $this->content->text .= "\n".''; + $this->content->text .= "\n".''; $this->content->text .= '
: '; $this->content->text .= '
'; diff --git a/blocks/search/block_search.php b/blocks/search/block_search.php index f06d6c9d07f..365ad2f8868 100644 --- a/blocks/search/block_search.php +++ b/blocks/search/block_search.php @@ -50,7 +50,7 @@ //basic search form $this->content->text = - '
' + '
' . '' . '' . '' diff --git a/blog/preferences.html b/blog/preferences.html index 95fc363d97e..ef226749411 100755 --- a/blog/preferences.html +++ b/blog/preferences.html @@ -1,4 +1,4 @@ - +
'.get_string('amountofloan','block_loancalc').'
diff --git a/calendar/event_delete.html b/calendar/event_delete.html index 6383d50945a..8ebe69fb51e 100644 --- a/calendar/event_delete.html +++ b/calendar/event_delete.html @@ -1,7 +1,7 @@
:
1) { ?>
- +

  @@ -18,7 +18,7 @@

- +

  @@ -35,7 +35,7 @@

- +

  diff --git a/calendar/event_edit.html b/calendar/event_edit.html index 3a33f0bf0dd..8e612edc82d 100644 --- a/calendar/event_edit.html +++ b/calendar/event_edit.html @@ -1,4 +1,4 @@ - +
diff --git a/calendar/event_new.html b/calendar/event_new.html index 92cda132af2..47af5684651 100644 --- a/calendar/event_new.html +++ b/calendar/event_new.html @@ -2,7 +2,7 @@ // The following is a hack to fix bug 1488 $course = get_record('course', 'id', ($form->courseid) ? $form->courseid : $site->id); ?> - +
diff --git a/calendar/preferences.html b/calendar/preferences.html index e25a17462c2..b4e52c07aef 100644 --- a/calendar/preferences.html +++ b/calendar/preferences.html @@ -1,4 +1,4 @@ - + diff --git a/course/category.php b/course/category.php index 3cfc17795f4..d667bf3b957 100644 --- a/course/category.php +++ b/course/category.php @@ -274,7 +274,7 @@ $strrequireskey = get_string("requireskey"); - echo ''; + echo ''; echo ''; echo '
'; echo ''; @@ -402,7 +402,7 @@ echo ''; } @@ -430,7 +430,7 @@ if (has_capability('moodle/category:update', $context)) { /// Print form to rename the category $strrename= get_string('rename'); - echo ''; + echo ''; echo ''; echo ''; echo ''; diff --git a/course/editsection.html b/course/editsection.html index 913d0b07af8..46ec51f170d 100644 --- a/course/editsection.html +++ b/course/editsection.html @@ -1,5 +1,5 @@
- +
'.$strcourses.'
'; echo '
'; unset($displaylist[$category->id]); - choose_from_menu ($displaylist, "moveto", "", get_string("moveselectedcoursesto"), "javascript:document.movecourses.submit()"); + choose_from_menu ($displaylist, "moveto", "", get_string("moveselectedcoursesto"), "javascript: getElementById('movecourses').submit()"); echo ''; echo '

:

diff --git a/course/groups-edit.html b/course/groups-edit.html index b7005b2bd98..6d43f92e534 100755 --- a/course/groups-edit.html +++ b/course/groups-edit.html @@ -80,7 +80,7 @@ function groupWindow(selectgroup) { //]]> - +
: @@ -90,7 +90,7 @@ function groupWindow(selectgroup) {
- + @@ -124,7 +124,7 @@ function groupWindow(selectgroup) { - + @@ -156,7 +156,7 @@ function groupWindow(selectgroup) { - + diff --git a/course/importstudents.html b/course/importstudents.html index e8664173f5e..ab35b54cfd0 100644 --- a/course/importstudents.html +++ b/course/importstudents.html @@ -1,5 +1,5 @@ - + @@ -9,9 +9,9 @@
+ onFocus="getElementById('studentform').add.disabled=false; + getElementById('studentform').remove.disabled=true; + getElementById('studentform').removeselect.selectedIndex=-1;"> shortname: $strassigncourses", "$site->fullname", "id\">$course->shortname -> $strassigncourses", - "studentform.searchtext"); + "searchtext"); /// Print a help notice about the need to use this page diff --git a/course/index.php b/course/index.php index 8ff237f509c..429ce9163bf 100644 --- a/course/index.php +++ b/course/index.php @@ -280,7 +280,7 @@ /// Print form for creating new categories if (has_capability('moodle/category:create', $context)) { echo "
"; - echo ""; + echo ""; echo ""; echo ""; echo "sesskey\" />"; diff --git a/course/lib.php b/course/lib.php index 59b6d95100b..0b6f90cac15 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1864,19 +1864,19 @@ function print_course_search($value="", $return=false, $format="plain") { $strsearchcourses= get_string("searchcourses"); if ($format == 'plain') { - $output = ''; + $output = ''; $output .= '

'; $output .= ''; $output .= ''; $output .= '

'; } else if ($format == 'short') { - $output = '
'; + $output = ''; $output .= '

'; $output .= ''; $output .= ''; $output .= '

'; } else if ($format == 'navbar') { - $output = '
'; + $output = ''; $output .= '
'; $output .= ''; $output .= ''; diff --git a/course/mod_delete.html b/course/mod_delete.html index 8670c0784d2..e6c21eb48ea 100644 --- a/course/mod_delete.html +++ b/course/mod_delete.html @@ -1,4 +1,4 @@ -wwwroot/course/mod.php" ?>"> +wwwroot/course/mod.php" ?>"> diff --git a/course/pending-reject.html b/course/pending-reject.html index 6c6203e3803..5f60042d460 100644 --- a/course/pending-reject.html +++ b/course/pending-reject.html @@ -1,4 +1,4 @@ - +
" /> diff --git a/course/report/participation/index.php b/course/report/participation/index.php index 1cf7e1550db..e17e0266520 100644 --- a/course/report/participation/index.php +++ b/course/report/participation/index.php @@ -328,7 +328,7 @@ function checknos() { //]]> '; - echo ''; + echo ''; echo ''; echo ''; echo ''; diff --git a/course/reset.php b/course/reset.php index f8d92a5a9ea..c405e5af777 100755 --- a/course/reset.php +++ b/course/reset.php @@ -54,7 +54,7 @@ The feature will also reset the start date of the course if necessary. print_simple_box(get_string('resetinfo'), 'center', '60%'); - echo ''; + echo ''; print_heading(get_string('course'), 'left', 3); diff --git a/course/scales.php b/course/scales.php index 60b9506a86e..9505364dabd 100644 --- a/course/scales.php +++ b/course/scales.php @@ -177,7 +177,7 @@ $scale->scale = $form->scalescale; $scale->description = $form->description; } - echo "id\">"; + echo "id\">"; echo ""; echo ""; if (!empty($errors[$scale->id]->name)) { diff --git a/course/search.php b/course/search.php index a3fc8cf7a50..044f28f802a 100644 --- a/course/search.php +++ b/course/search.php @@ -153,7 +153,7 @@ } } else { // slightly more sophisticated - echo ""; + echo ""; echo "sesskey\">"; echo ""; echo ""; @@ -237,7 +237,7 @@ echo "
"; echo "\n"; echo "\n"; - choose_from_menu ($displaylist, "moveto", "", get_string("moveselectedcoursesto"), "javascript:document.movecourses.submit()"); + choose_from_menu ($displaylist, "moveto", "", get_string("moveselectedcoursesto"), "javascript: getElementById('movecourses').submit()"); echo ""; echo "
"; diff --git a/enrol/manual/enrol.html b/enrol/manual/enrol.html index 1c359f74da5..fee7c259cff 100644 --- a/enrol/manual/enrol.html +++ b/enrol/manual/enrol.html @@ -13,7 +13,7 @@

errormsg)) {formerr($this->errormsg);} ?>

- + @@ -41,7 +41,7 @@ if ($course->guest and !isguest()) { print_simple_box_start('center'); ?> - +
:
diff --git a/enrol/mnet/allowed_courses.php b/enrol/mnet/allowed_courses.php index 2407dc930b5..b6fb8ca08d8 100644 --- a/enrol/mnet/allowed_courses.php +++ b/enrol/mnet/allowed_courses.php @@ -111,7 +111,7 @@ print_simple_box_start('center','90%','','20'); ?>
- +
: 
@@ -17,9 +17,9 @@
fullname .':Error', $site->fullname .': Error 404', '', 'form.text'); + print_header($site->fullname .':Error', $site->fullname .': Error 404', '', 'text'); print_simple_box('

'. get_string('pagenotexist', 'error'). '
'.s($requesturi).'

', 'center'); ?>

-

-
+

+
diff --git a/files/index.php b/files/index.php index 4f3a555fbfd..89e7d354bb8 100644 --- a/files/index.php +++ b/files/index.php @@ -307,7 +307,7 @@ html_header($course, $wdir, "form.name"); echo "

$strrenamefileto:

"; echo "
"; - echo ""; + echo ""; echo ' '; echo " "; echo " "; @@ -348,7 +348,7 @@ html_header($course, $wdir, "form.name"); echo "

$strcreatefolder:

"; echo "
"; - echo ""; + echo ""; echo ' '; echo " "; echo " "; @@ -395,7 +395,7 @@ print_heading("$streditfile"); echo "
"; - echo ""; + echo ""; echo ' '; echo " "; echo " "; @@ -453,7 +453,7 @@ echo "
"; echo "

".get_string("whattocallzip")."

"; echo "
"; - echo ""; + echo ""; echo ' '; echo " "; echo " "; @@ -694,7 +694,7 @@ function displaydir ($wdir) { $strfile = get_string("file"); - echo ""; + echo ""; echo ''; echo "
"; echo ""; diff --git a/grade/exceptions.html b/grade/exceptions.html index 30feacea75f..494f43362fa 100644 --- a/grade/exceptions.html +++ b/grade/exceptions.html @@ -50,8 +50,8 @@ ?> function updategrade_item() { - document.form1.grade_itemid.value = document.form2.grade_items.value; - document.form3.grade_itemid.value = document.form2.grade_items.value; + getElementById('form1').grade_itemid.value = getElementById('form2').grade_items.value; + getElementById('form3').grade_itemid.value = getElementById('form2').grade_items.value; } @@ -61,11 +61,11 @@ function updateMembers(selectgrade_item) { username = grade_item.username; userid = grade_item.userid; - document.form3['members[]'].length = username.length; + getElementById('form3')['members[]'].length = username.length; for (i=0;i
- + @@ -125,7 +125,7 @@ function updateMembers(selectgrade_item) { -
+ @@ -147,7 +147,7 @@ function updateMembers(selectgrade_item) {
- + diff --git a/grade/lib.php b/grade/lib.php index 881d083b7bf..68e15745753 100644 --- a/grade/lib.php +++ b/grade/lib.php @@ -2376,7 +2376,7 @@ function grade_display_grade_weights() { $categories = get_records('grade_category', 'courseid', $course->id); if ($categories) { - echo ''; + echo ''; echo ''; echo ''; echo ''; echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -2634,7 +2634,7 @@ function grade_add_category_form() { /// just a simple text box with submit global $course; global $USER; - echo ''; + echo ''; echo get_string('addcategory','grades').':'; echo ''; echo ''; @@ -2647,7 +2647,7 @@ function grade_delete_category_form() { // outputs a form to delete a category global $course; global $USER; - echo ''; + echo ''; echo get_string('deletecategory','grades').': '; @@ -2733,7 +2733,7 @@ function grade_display_grade_preferences($course, $preferences) { print_single_button('index.php', $buttonoptions, $buttonlabel, 'post'); echo '
'; - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -2882,7 +2882,7 @@ function grade_display_letter_grades() { $letters[10]->courseid = $course->id; } - echo ''; + echo ''; echo '
'.get_string('setweights','grades'); helpbutton('weight', get_string('gradeweighthelp','grades'), 'grade'); @@ -2449,7 +2449,7 @@ function grade_set_categories() { echo ''.get_string('maxgrade','grades').''.get_string('curveto','grades').''.get_string('extracredit','grades').'
'; echo '
'.get_string('setgradeletters','grades'); helpbutton('letter', get_string('gradeletterhelp','grades'), 'grade'); diff --git a/lib/rsslib.php b/lib/rsslib.php index 757ece9ccbf..72dd02a0f33 100644 --- a/lib/rsslib.php +++ b/lib/rsslib.php @@ -457,7 +457,7 @@ function rss_get_form($act='none', $url='', $rssid='', $preferredtitle='', $shar $straddfeed = get_string('addfeed', 'block_rss_client'); $returnstring = '
'."\n"; - $returnstring .= ''."\n"; + $returnstring .= ''."\n"; if ($act == 'rssedit') { $returnstring .= $strupdatefeed; @@ -508,7 +508,7 @@ function rss_get_form($act='none', $url='', $rssid='', $preferredtitle='', $shar $returnstring .= ''."\n"; $returnstring .= '
". get_string('validatefeed', 'block_rss_client').""; +onClick=\"window.open('http://feedvalidator.org/check.cgi?url='+getElementId('block_rss').elements['url'].value,'validate','width=640,height=480,scrollbars=yes,status=yes,resizable=yes');return true;\">". get_string('validatefeed', 'block_rss_client').""; if ($act == 'rssedit') { $returnstring .= $stredit; diff --git a/lib/speller/controls.html b/lib/speller/controls.html index 95e85ad085b..1e7ed5737db 100644 --- a/lib/speller/controls.html +++ b/lib/speller/controls.html @@ -55,7 +55,7 @@ function suggText() { } function init_spell() { - var controlForm = document.spellcheck; + var controlForm = getElementById('spellcheck'); // create a new controlWindow object controlWindowObj = new controlWindow( controlForm ); @@ -74,7 +74,7 @@ function init_spell() { - + diff --git a/message/search.html b/message/search.html index e0a3118d532..f37fd95fcbe 100644 --- a/message/search.html +++ b/message/search.html @@ -1,4 +1,4 @@ - + diff --git a/message/send.php b/message/send.php index 4da717a3e0e..989925d13b5 100644 --- a/message/send.php +++ b/message/send.php @@ -87,7 +87,7 @@ echo ''; echo '
'; - echo ''; + echo ''; echo ''; echo ''; diff --git a/message/settings.html b/message/settings.html index c2aad9fc6d7..1c0ddcec9b2 100644 --- a/message/settings.html +++ b/message/settings.html @@ -1,4 +1,4 @@ - + diff --git a/mod/assignment/config.html b/mod/assignment/config.html index 54bd74f7368..f239c8aadfb 100644 --- a/mod/assignment/config.html +++ b/mod/assignment/config.html @@ -1,4 +1,4 @@ - +
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index ed2edba39b7..65f75ad51e3 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -885,7 +885,7 @@ class assignment_base { print_user_picture($teacher->id, $this->course->id, $teacher->picture); echo ''; echo '
'; - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -1186,7 +1186,7 @@ class assignment_base { /// Print quickgrade form around the table if ($quickgrade){ - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -1203,7 +1203,7 @@ class assignment_base { /// Mini form for setting user preference echo '
'; - echo ''; + echo ''; echo ''; echo ''; echo '
'; diff --git a/mod/assignment/type/common.html b/mod/assignment/type/common.html index bb15b6ed28e..5ef072f7d4c 100644 --- a/mod/assignment/type/common.html +++ b/mod/assignment/type/common.html @@ -1,4 +1,4 @@ - + sesskey = sesskey(); diff --git a/mod/chat/config.html b/mod/chat/config.html index 8d262c10f76..b37b7af5ba4 100644 --- a/mod/chat/config.html +++ b/mod/chat/config.html @@ -1,4 +1,4 @@ - + diff --git a/mod/chat/gui_header_js/chatinput.php b/mod/chat/gui_header_js/chatinput.php index 5ef4bb8ddbe..208e6352c85 100644 --- a/mod/chat/gui_header_js/chatinput.php +++ b/mod/chat/gui_header_js/chatinput.php @@ -34,10 +34,10 @@ if(waitFlag) return false; waitFlag = true; var input_chat_message = document.getElementById('input_chat_message'); - document.sendForm.chat_message.value = input_chat_message.value; + getElementById('sendForm').chat_message.value = input_chat_message.value; input_chat_message.value = ''; input_chat_message.className = 'wait'; - document.sendForm.submit(); + getElementById('sendForm').submit(); enableForm(); return false; } @@ -54,16 +54,16 @@ - >> - + diff --git a/mod/choice/view.php b/mod/choice/view.php index 265d64aa3e4..491d9fa1d21 100644 --- a/mod/choice/view.php +++ b/mod/choice/view.php @@ -89,7 +89,7 @@ has_capability('mod/choice:choose', $context) ) { // They haven't made their choice yet or updates allowed and choice is open - echo ''; + echo ''; choice_show_form($choice, $USER, $cm); diff --git a/mod/data/config.html b/mod/data/config.html index baca72ff467..090d6e5d4a3 100644 --- a/mod/data/config.html +++ b/mod/data/config.html @@ -1,4 +1,4 @@ - +
diff --git a/mod/data/field.php b/mod/data/field.php index 3a5ea41f92e..a4669b41b7f 100755 --- a/mod/data/field.php +++ b/mod/data/field.php @@ -299,7 +299,7 @@ if ($fields = get_records('data_fields','dataid',$data->id)) { echo '
'; - echo ''; + echo ''; echo ''; echo ''; echo ''; diff --git a/mod/data/lib.php b/mod/data/lib.php index 1d478d43b35..5bda765d483 100755 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -178,7 +178,7 @@ class data_field_base { /// Base class for Database Field Types (see field/* } print_simple_box_start('center','80%'); - echo ''."\n"; + echo ''."\n"; echo ''."\n"; if (empty($this->field->id)) { echo ''."\n"; @@ -912,7 +912,7 @@ function data_print_template($template, $records, $data, $search='',$page=0, $re ************************************************************************/ function data_print_preference_form($data, $perpage, $search, $sort='', $order='ASC'){ echo '
'; - echo ''; + echo ''; echo ''; echo ' '; $pagesizes = array(2=>2,3=>3,4=>4,5=>5,6=>6,7=>7,8=>8,9=>9,10=>10,15=>15, @@ -963,7 +963,7 @@ function data_print_ratings($data, $record) { $ratingsmenuused = false; echo '
'; - echo ''; + echo ''; if (has_capability('mod/data:rate', $context) and !data_isowner($record->id)) { data_print_ratings_mean($record->id, $ratingsscale, has_capability('mod/data:viewrating', $context)); diff --git a/mod/data/preset.php b/mod/data/preset.php index 6c773f16e49..f6e2d2a0a91 100644 --- a/mod/data/preset.php +++ b/mod/data/preset.php @@ -319,7 +319,7 @@ echo '
'; helpbutton('importfromfile', '', 'data'); echo ''; -echo ''; +echo ''; echo ''; echo ''; echo ''; @@ -333,7 +333,7 @@ echo '
'; helpbutton('usepreset', '', 'data'); echo ''; -echo ''; +echo ''; echo ''; echo ''; echo ''; diff --git a/mod/data/templates.php b/mod/data/templates.php index c9471cf3411..86d846dce5d 100755 --- a/mod/data/templates.php +++ b/mod/data/templates.php @@ -78,7 +78,7 @@ $bodytag = 'onload="'; $bodytag .= 'if (typeof('.$editorobj.') != \'undefined\') { currEditor = '.$editorobj.'; } '; - $bodytag .= 'currTextarea = document.tempform.template;'; + $bodytag .= 'currTextarea = getElementById(\'tempform\').template;'; $bodytag .= '" '; // Javascript to insert the field tags into the textarea. @@ -169,7 +169,7 @@ } - echo ''; + echo ''; echo ''; // Print button to autogen all forms, if all templates are empty diff --git a/mod/forum/config.html b/mod/forum/config.html index e5933f9b302..738eb59adde 100644 --- a/mod/forum/config.html +++ b/mod/forum/config.html @@ -1,4 +1,4 @@ - + diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 93d2fdbb5f7..28e5fcc8b08 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -3146,7 +3146,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=5, $dis && $course->id != SITEID)) { echo '
'; - echo "wwwroot/mod/forum/post.php\">"; + echo "wwwroot/mod/forum/post.php\">"; echo "id\" />"; echo ''; + echo ''; echo ''; echo ''; } diff --git a/mod/forum/prune.html b/mod/forum/prune.html index da09e93c20a..383b3a9b73f 100644 --- a/mod/forum/prune.html +++ b/mod/forum/prune.html @@ -1,4 +1,4 @@ - +
diff --git a/mod/forum/subscriber.html b/mod/forum/subscriber.html index 9417bbeb70f..3eb59d1a59f 100644 --- a/mod/forum/subscriber.html +++ b/mod/forum/subscriber.html @@ -1,5 +1,5 @@ - +
:
@@ -15,9 +15,9 @@

- + diff --git a/mod/glossary/editcategories.html b/mod/glossary/editcategories.html index 60efd60c29c..fc55d27ac7e 100644 --- a/mod/glossary/editcategories.html +++ b/mod/glossary/editcategories.html @@ -3,7 +3,7 @@ require_once("../../config.php"); ?>
- +
diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php index a81114deff4..ff8e38cb80f 100644 --- a/mod/glossary/editcategories.php +++ b/mod/glossary/editcategories.php @@ -106,7 +106,7 @@ echo "

"; print_string("areyousuredelete","glossary"); ?> - + @@ -173,7 +173,7 @@

- +
:
diff --git a/mod/glossary/formats.php b/mod/glossary/formats.php index 7820f167656..8033ac18544 100644 --- a/mod/glossary/formats.php +++ b/mod/glossary/formats.php @@ -66,7 +66,7 @@ $yes = get_string("yes"); $no = get_string("no"); - echo ''; + echo ''; echo ''; ?> diff --git a/mod/glossary/import.html b/mod/glossary/import.html index bbd52020889..b3864e36fd9 100644 --- a/mod/glossary/import.html +++ b/mod/glossary/import.html @@ -1,4 +1,4 @@ - +
:
diff --git a/mod/glossary/view.php b/mod/glossary/view.php index e8dea1308d7..88aac4fea9d 100644 --- a/mod/glossary/view.php +++ b/mod/glossary/view.php @@ -328,7 +328,7 @@ $ratings->allow = true; } - echo ""; + echo ""; echo "id\" />"; } diff --git a/mod/hotpot/config.html b/mod/hotpot/config.html index a783402612a..eb8189edcff 100644 --- a/mod/hotpot/config.html +++ b/mod/hotpot/config.html @@ -1,4 +1,4 @@ - + diff --git a/mod/hotpot/lib.php b/mod/hotpot/lib.php index e540b9b60d2..462207a0847 100644 --- a/mod/hotpot/lib.php +++ b/mod/hotpot/lib.php @@ -1708,7 +1708,7 @@ class hotpot_xml_quiz extends hotpot_xml_tree { $replace .= '\\2'; } if ($form_name) { - $replace = 'frametarget.'">'.$replace.''; + $replace = 'frametarget.'">'.$replace.''; } if ($center) { $replace = '
'.$replace.'
'; diff --git a/mod/hotpot/report/overview/report.php b/mod/hotpot/report/overview/report.php index a2bcee5182d..f0e87b85a18 100644 --- a/mod/hotpot/report/overview/report.php +++ b/mod/hotpot/report/overview/report.php @@ -114,15 +114,15 @@ class hotpot_report extends hotpot_default_report { if ($options['reportformat']=='htm' && has_capability('mod/hotpot:viewreport',get_context_instance(CONTEXT_COURSE, $course->id))) { $strdeletecheck = get_string('deleteattemptcheck','quiz'); $table->start = $this->deleteform_javascript(); - $table->start .= ''."\n"; + $table->start .= ''."\n"; $table->start .= ''."\n"; $table->start .= ''."\n"; $table->finish = '
'."\n"; $table->finish .= ' '."\n"; if ($abandoned) { - $table->finish .= ''."\n"; + $table->finish .= ''."\n"; } - $table->finish .= ''."\n"; + $table->finish .= ''."\n"; $table->finish .= '
'."\n"; $table->finish .= ''."\n"; } @@ -136,7 +136,7 @@ class hotpot_report extends hotpot_default_report { function deletecheck(p, v, x) { var r = false; // result // get length of form elements - var f = document.deleteform; + var f = getElementById('deleteform'); var l = f ? f.elements.length : 0; // count selected items, if necessary if (!x) { diff --git a/mod/hotpot/view.php b/mod/hotpot/view.php index 7ca9bc0d42d..8eb89e2160b 100644 --- a/mod/hotpot/view.php +++ b/mod/hotpot/view.php @@ -75,7 +75,7 @@ print_simple_box_end(); print "
\n"; } - print ''."\n"; + print ''."\n"; print_simple_box_start($boxalign, $boxwidth); print '
'; print get_string('requirepasswordmessage', 'quiz').'

'; diff --git a/mod/journal/edit.html b/mod/journal/edit.html index 024dcf4195e..3f2bc1f4af7 100644 --- a/mod/journal/edit.html +++ b/mod/journal/edit.html @@ -1,4 +1,4 @@ - +
+ diff --git a/mod/lesson/action/addbranchtable.php b/mod/lesson/action/addbranchtable.php index 3f3fe13fa21..931978344be 100644 --- a/mod/lesson/action/addbranchtable.php +++ b/mod/lesson/action/addbranchtable.php @@ -36,7 +36,7 @@ // give teacher a blank proforma print_heading_with_help(get_string("addabranchtable", "lesson"), "overview", "lesson"); ?> - + diff --git a/mod/lesson/action/addpage.php b/mod/lesson/action/addpage.php index 3f7ba74e254..a5d6ec9e48f 100644 --- a/mod/lesson/action/addpage.php +++ b/mod/lesson/action/addpage.php @@ -46,7 +46,7 @@ // give teacher a blank proforma print_heading_with_help(get_string("addaquestionpage", "lesson"), "overview", "lesson"); ?> - + diff --git a/mod/lesson/action/continue.html b/mod/lesson/action/continue.html index 59ef293d428..88746acfff8 100644 --- a/mod/lesson/action/continue.html +++ b/mod/lesson/action/continue.html @@ -38,7 +38,7 @@ modattempts[$lesson->id])) { // User is modifying attempts - save button and some instructions ?> - + @@ -60,7 +60,7 @@ review && !$correctanswer && !$noanswer && !$isessayquestion) { // Review button back ?> - + diff --git a/mod/lesson/action/editpage.php b/mod/lesson/action/editpage.php index 10efe0ef555..da4f303da08 100644 --- a/mod/lesson/action/editpage.php +++ b/mod/lesson/action/editpage.php @@ -53,7 +53,7 @@ } // give teacher a proforma ?> - + @@ -68,7 +68,7 @@ echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."
"; lesson_qtype_menu($LESSON_QUESTION_TYPE, $page->qtype, "lesson.php?id=$cm->id&action=editpage&pageid=$page->id", - "document.editpage.redisplay.value=1;document.editpage.submit();"); + "getElementById('editpage').redisplay.value=1;getElementById('editpage').submit();"); echo "

\n"; if ($page->qoption) { echo ""; @@ -83,7 +83,7 @@ echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."
"; lesson_qtype_menu($LESSON_QUESTION_TYPE, $page->qtype, "lesson.php?id=$cm->id&action=editpage&pageid=$page->id", - "document.editpage.redisplay.value=1;document.editpage.submit();"); + "getElementById('editpage').redisplay.value=1;getElementById('editpage').submit();"); echo "

\n"; if ($page->qoption) { echo ""; @@ -101,7 +101,7 @@ echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."
"; lesson_qtype_menu($LESSON_QUESTION_TYPE, $page->qtype, "lesson.php?id=$cm->id&action=editpage&pageid=$page->id", - "document.editpage.redisplay.value=1;document.editpage.submit();"); + "getElementById('editpage').redisplay.value=1;getElementById('editpage').submit();"); break; } ?> @@ -473,7 +473,7 @@ ?>


" - onClick="document.editpage.redisplay.value=1;document.editpage.submit();" /> + onClick="getElementById('editpage').redisplay.value=1;getElementById('editpage').submit();" /> " /> " /> diff --git a/mod/lesson/essay.php b/mod/lesson/essay.php index 3a5235d2469..6cbbcb9c2ca 100644 --- a/mod/lesson/essay.php +++ b/mod/lesson/essay.php @@ -292,7 +292,7 @@ // Expects the following to be set: $attemptid, $answer, $user, $page, $attempt echo '
- + diff --git a/mod/lesson/highscores.php b/mod/lesson/highscores.php index 5a7c4e7ed6a..fc85a604299 100644 --- a/mod/lesson/highscores.php +++ b/mod/lesson/highscores.php @@ -139,7 +139,7 @@ case 'add': print_simple_box_start('center'); echo '
- + '; diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php index 1cad858c561..bdc744eb03e 100644 --- a/mod/lesson/importppt.php +++ b/mod/lesson/importppt.php @@ -86,7 +86,7 @@ print_heading_with_help($strimportppt, "importppt", "lesson"); print_simple_box_start("center"); - echo ""; + echo ""; echo "id\" />\n"; echo "\n"; echo ""; diff --git a/mod/lesson/report.php b/mod/lesson/report.php index e41b9b7a1c6..0f3543af35a 100644 --- a/mod/lesson/report.php +++ b/mod/lesson/report.php @@ -239,7 +239,7 @@ } // print it all out ! if (has_capability('mod/lesson:edit', $context)) { - echo "\n + echo "\n \n id\" />\n id\" />\n"; diff --git a/mod/lesson/view.php b/mod/lesson/view.php index fe94dc6cabb..217219b7975 100644 --- a/mod/lesson/view.php +++ b/mod/lesson/view.php @@ -61,7 +61,7 @@ lesson_print_header($cm, $course, $lesson); echo "
\n"; print_simple_box_start('center'); - echo '' . "\n"; + echo '' . "\n"; echo '' . "\n"; if (optional_param('userpassword', 0, PARAM_CLEAN)) { notify(get_string('loginfail', 'lesson')); @@ -523,7 +523,7 @@ // get the answers in a set order, the id order if ($answers = get_records("lesson_answers", "pageid", $page->id, "id")) { - echo ""; + echo ""; echo "id\" />"; echo ""; echo ""; @@ -685,7 +685,7 @@ $class = 'standardbutton'; } // Each button must have its own form inorder for it to work with JavaScript turned off - $button = "wwwroot/mod/lesson/lesson.php\">\n". + $button = "wwwroot/mod/lesson/lesson.php\">\n". "id\" />\n". "\n". "\n". @@ -747,7 +747,7 @@ echo "\n"; } else { // a page without answers - find the next (logical) page - echo "
wwwroot/mod/lesson/view.php\">\n"; + echo "wwwroot/mod/lesson/view.php\">\n"; echo "id\" />\n"; if ($lesson->nextpagedefault) { // in Flash Card mode... diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php index d9c2966fb64..90a40bf0af6 100644 --- a/mod/quiz/attempt.php +++ b/mod/quiz/attempt.php @@ -140,7 +140,7 @@ } echo "
\n"; - echo "id\" autocomplete=\"off\">\n"; + echo "id\" autocomplete=\"off\">\n"; print_simple_box_start("center"); echo "
\n"; @@ -472,7 +472,7 @@ ?> \n"; + echo "\n"; } // Add a hidden field with the quiz id @@ -493,7 +493,7 @@ '; - echo ''; + echo ''; echo ''; echo ''; } diff --git a/user/message.html b/user/message.html index ca3619c1201..b56eb4de088 100644 --- a/user/message.html +++ b/user/message.html @@ -1,4 +1,4 @@ - +