From: skodak <skodak>
Date: Thu, 4 Jan 2007 21:32:36 +0000 (+0000)
Subject: MDL-8062 1.3 Remove name attribute from <form> and fix focus everywhere - more change... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b7dc225654259f3d741a582f3f446c8f174290da;p=moodle.git

MDL-8062 1.3 Remove name attribute from <form> and fix focus everywhere - more changes ahead
---

diff --git a/admin/auth.php b/admin/auth.php
index 0b2d3f7323..2dba551f1c 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 "<form $CFG->frametarget name=\"authmenu\" method=\"post\" action=\"auth.php\">";
+echo "<form $CFG->frametarget id=\"authmenu\" method=\"post\" action=\"auth.php\">";
 echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">";
 print_table($table);
 
diff --git a/admin/auth_config.php b/admin/auth_config.php
index 47e2516e22..578ca0ce5b 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 "<form $CFG->frametarget name=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
+echo "<form $CFG->frametarget id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
 echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">\n";
-echo "<div align=\"center\"><p><b>\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 "</b></p></div>\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 6d07cdd939..3f6cfb2fdb 100644
--- a/admin/enrol.php
+++ b/admin/enrol.php
@@ -52,7 +52,7 @@
 
     print_simple_box(get_string('configenrolmentplugins', 'admin'), 'center', '700');
 
-    echo "<form $CFG->frametarget name=\"enrolmenu\" method=\"post\" action=\"enrol.php\">";
+    echo "<form $CFG->frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol.php\">";
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />";
 
     $table = new stdClass();
diff --git a/admin/enrol_config.php b/admin/enrol_config.php
index 925546cab8..f69e7d5477 100644
--- a/admin/enrol_config.php
+++ b/admin/enrol_config.php
@@ -44,17 +44,8 @@
 
     admin_externalpage_print_header($adminroot);
 
-    echo "<form $CFG->frametarget name=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
+    echo "<form $CFG->frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">";
-    echo "<div align=\"center\"><p><b>";
-
-
-/// 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 "</b></p></div>";
 
 /// Print current enrolment type description
     print_simple_box_start("center", "80%");
diff --git a/admin/lang.php b/admin/lang.php
index 83a4e06fd3..8d1b842835 100644
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -401,7 +401,7 @@
             @include("$langdir/$currentfile");
 
             if ($editable) {
-                echo "<form name=\"$currentfile\" action=\"lang.php\" method=\"post\">";
+                echo "<form id=\"$currentfile\" action=\"lang.php\" method=\"post\">";
             }
             echo "<table summary=\"\" width=\"100%\" cellpadding=\"2\" cellspacing=\"3\" border=\"0\" class=\"generalbox\">";
             $linescounter = 0;
diff --git a/admin/langdoc.php b/admin/langdoc.php
index 25ff92dcdf..d6d2ebf59f 100755
--- a/admin/langdoc.php
+++ b/admin/langdoc.php
@@ -169,7 +169,7 @@ $langdir/$currentfile")."</font></p>";
         echo "<td align=\"center\">\n";
 
         if ($editable) {
-            echo "<form name=\"$currentfile\" action=\"langdoc.php\" method=\"post\">";
+            echo "<form id=\"$currentfile\" action=\"langdoc.php\" method=\"post\">";
             echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
             echo '<input type="hidden" name="currentfile" value="'.$currentfile.'" />';
 
diff --git a/admin/langimport.php b/admin/langimport.php
index 5c4b7fa8d2..f671df4985 100755
--- a/admin/langimport.php
+++ b/admin/langimport.php
@@ -246,7 +246,7 @@
             print_simple_box_start('center','60%');
             echo '<table summary="" width="100%">';
             echo '<tr><td align="center" valign="top">';
-            echo '<form name="uninstallform" action="langimport.php?mode=4" method="post">';
+            echo '<form id="uninstallform" action="langimport.php?mode=4" method="post">';
             echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
             unset($CFG->langlist);   // ignore admin's langlist
             $installedlangs = get_list_of_languages();
@@ -261,7 +261,7 @@
             echo '</select>';
             echo '<br /><input type="submit" value="'.get_string('uninstall','admin').'" />';
             echo '</form>';
-            echo '<form name="updateform" action="langimport.php?mode=5" method="post">';
+            echo '<form id="updateform" action="langimport.php?mode=5" method="post">';
             echo '<br /><input type="submit" value="'.get_string('updatelangs','admin').'" />';
             echo '</form>';
 
@@ -275,7 +275,7 @@
 
             /// if this language pack is not already installed, then we allow installation
 
-            echo '<form name="installform" method="post" action="langimport.php?mode=2">';
+            echo '<form id="installform" method="post" action="langimport.php?mode=2">';
             echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
             echo '<label for="pack">'.get_string('availablelangs','admin')."</label><br />\n";
             if ($remote) {
diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index 4303686374..046159ff3c 100644
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -171,7 +171,7 @@ print_simple_box_start('center','90%','','20');
 
 ?>
  <div class="mnetaddtoaclform"> 
-  <form name="mnetaddtoacl" method="post">
+  <form id="mnetaddtoacl" method="post">
     <input type="hidden" name="sesskey" value="<?php echo $sesskey; ?>">
 <?php
 
diff --git a/admin/register.php b/admin/register.php
index 9bb7a369de..a7e2bd7135 100644
--- a/admin/register.php
+++ b/admin/register.php
@@ -47,7 +47,7 @@
 
     print_simple_box_start("center", "");
 
-    echo "<form name=\"form\" action=\"http://moodle.org/register/\" method=\"post\">\n";
+    echo "<form id=\"form\" action=\"http://moodle.org/register/\" method=\"post\">\n";
     echo "<table cellpadding=\"9\" border=\"0\">\n";
     echo "<tr valign=\"top\">\n";
     echo "<td align=\"center\" colspan=\"2\">".get_string("location")."</td>\n";
diff --git a/admin/roles/assign.html b/admin/roles/assign.html
index a7c87854bd..7286706f50 100755
--- a/admin/roles/assign.html
+++ b/admin/roles/assign.html
@@ -1,4 +1,4 @@
-<form name="assignform" id="assignform" method="post" action="">
+<form id="assignform" method="post" action="">
 <input type="hidden" name="previoussearch" value="<?php p($previoussearch) ?>" />
 <input type="hidden" name="userid" value="<?php p($userid) ?>" />
 <input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
@@ -11,9 +11,9 @@
           <label for="removeselect"><?php print_string('existingusers', 'role', count($contextusers)); ?></label>
           <br />
           <select name="removeselect[]" size="20" id="removeselect" multiple="multiple"
-                  onfocus="document.assignform.add.disabled=true;
-                           document.assignform.remove.disabled=false;
-                           document.assignform.addselect.selectedIndex=-1;">
+                  onfocus="getElementById('assignform').add.disabled=true;
+                           getElementById('assignform').remove.disabled=false;
+                           getElementById('assignform').addselect.selectedIndex=-1;">
           <?php
               foreach ($contextusers as $contextuser) {
                   $fullname = fullname($contextuser, true);
@@ -44,9 +44,9 @@
           <label for="addselect"><?php print_string('potentialusers', 'role', $usercount); ?></label>
           <br />
           <select name="addselect[]" size="20" id="addselect" multiple="multiple"
-                  onfocus="document.assignform.add.disabled=false;
-                           document.assignform.remove.disabled=true;
-                           document.assignform.removeselect.selectedIndex=-1;">
+                  onfocus="getElementById('assignform').add.disabled=false;
+                           getElementById('assignform').remove.disabled=true;
+                           getElementById('assignform').removeselect.selectedIndex=-1;">
           <?php
 
               if (!empty($searchtext)) {
@@ -81,14 +81,14 @@
          <br />
          <label for="searchtext" class="accesshide"><?php p($strsearch) ?></label>
          <input type="text" name="searchtext" id="searchtext" size="30" value="<?php p($searchtext, true) ?>"
-                  onfocus ="document.assignform.add.disabled=true;
-                            document.assignform.remove.disabled=true;
-                            document.assignform.removeselect.selectedIndex=-1;
-                            document.assignform.addselect.selectedIndex=-1;"
+                  onfocus ="getElementById('assignform').add.disabled=true;
+                            getElementById('assignform').remove.disabled=true;
+                            getElementById('assignform').removeselect.selectedIndex=-1;
+                            getElementById('assignform').addselect.selectedIndex=-1;"
                   onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
                                if (keyCode == 13) {
-                                    document.assignform.previoussearch.value=1;
-                                    document.assignform.submit();
+                                    getElementById('assignform').previoussearch.value=1;
+                                    getElementById('assignform').submit();
                                } " />
          <input name="search" id="search" type="submit" value="<?php p($strsearch) ?>" />
          <?php
diff --git a/admin/roles/manage.html b/admin/roles/manage.html
index 7748d8f3ce..7401712c64 100755
--- a/admin/roles/manage.html
+++ b/admin/roles/manage.html
@@ -17,7 +17,7 @@
 <div align="right">
 <a href="manage.php?roleid=<?php p($roleid); ?>&amp;action=duplicate"><?php print_string('duplicaterole'); ?></a>
 </div>
-<form name="rolesform" action="manage.php" method="post">
+<form id="rolesform" action="manage.php" method="post">
 <input type="hidden" name="roleid" value="<?php p($roleid) ?>" />
 <input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
 <input type="hidden" name="action" value="<?php if ($action != 'view') { echo p($action); } ?>" />
diff --git a/admin/roles/manage.php b/admin/roles/manage.php
index 02c37ee3c4..f630aa5ca8 100755
--- a/admin/roles/manage.php
+++ b/admin/roles/manage.php
@@ -326,11 +326,11 @@
         echo '<div align="center" class="selector">';
         if ($action == 'view') {
             echo get_string('selectrole', 'role').': ';
-            echo '<form style="display:inline;" name="switchrole" action="manage.php" method="get">';
+            echo '<form style="display:inline;" id="switchrole" action="manage.php" method="get">';
             echo '<input type="hidden" name="action" value="view" />';
             choose_from_menu ($roleoptions, 'roleid', $roleid, get_string('listallroles', 'role').'...', $script='switchrole.submit()');
             echo '</form>';
-            echo '<form style="display:inline;" name="editrole" action="manage.php" method="get">';
+            echo '<form style="display:inline;" id="editrole" action="manage.php" method="get">';
             echo '<input type="hidden" name="roleid" value="'.$roleid.'" />';
             echo '<input type="hidden" name="action" value="edit" />';
             echo '<input type="submit" value="'.get_string('edit').'" />';
diff --git a/admin/roles/override.html b/admin/roles/override.html
index b03224f1a6..8a9800bb05 100755
--- a/admin/roles/override.html
+++ b/admin/roles/override.html
@@ -5,7 +5,7 @@
     $strprohibit = get_string('prohibit','role');
 ?>
 
-<form name="overrideform" action="override.php" method="post">
+<form id="overrideform" action="override.php" method="post">
     <input type="hidden" name="contextid" value="<?php p($contextid) ?>" />
     <input type="hidden" name="roleid" value="<?php p($roleid) ?>" />
     <input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
diff --git a/admin/search.php b/admin/search.php
index f33028ef8c..c68ef13801 100644
--- a/admin/search.php
+++ b/admin/search.php
@@ -58,7 +58,7 @@ if ($statusmsg != '') {
 
 $resultshtml = search_settings_html(admin_get_root(), $query);
 
-echo '<form action="search.php" method="post" name="adminsettings" id="adminsettings">';
+echo '<form action="search.php" method="post" id="adminsettings">';
 echo '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
 echo '<input type="hidden" name="query" value="' . s($query) . '" />';
 echo '<fieldset>';
diff --git a/admin/settings.php b/admin/settings.php
index 43d6ac6674..9279b9700c 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -115,7 +115,7 @@ if ($statusmsg != '') {
 
 // ---------------------------------------------------------------------------------------------------------------
 
-echo '<form action="settings.php" method="post" name="adminsettings" id="adminsettings">';
+echo '<form action="settings.php" method="post" id="adminsettings">';
 echo '<input type="hidden" name="section" value="' . $PAGE->section . '" />';
 echo '<input type="hidden" name="sesskey" value="' . $USER->sesskey . '" />';
 echo '<input type="hidden" name="return" value="' . $return . '" />';
diff --git a/admin/upgradesettings.php b/admin/upgradesettings.php
index 7bcf6ce44e..3b6482c420 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 '<form action="upgradesettings.php" method="post" name="adminsettings" id="adminsettings">';
+echo '<form action="upgradesettings.php" method="post" id="adminsettings">';
 echo '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
 echo '<fieldset>';
 echo '<div class="clearer"><!-- --></div>';
diff --git a/admin/xmldb/actions/edit_field/edit_field.class.php b/admin/xmldb/actions/edit_field/edit_field.class.php
index 71e0b04f42..bd833613cc 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 = '<form name="form" id="form" action="index.php" method="post">';
+        $o = '<form id="form" action="index.php" method="post">';
         $o.= '    <input type="hidden" name ="dir" value="' . str_replace($CFG->dirroot, '', $dirpath) . '" />';
         $o.= '    <input type="hidden" name ="table" value="' . $tableparam .'" />';
         $o.= '    <input type="hidden" name ="field" value="' . $fieldparam .'" />';
diff --git a/admin/xmldb/actions/edit_index/edit_index.class.php b/admin/xmldb/actions/edit_index/edit_index.class.php
index 5e7a5e7f71..4aaaf8b9fc 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 = '<form name="form" id="form" action="index.php" method="post">';
+        $o = '<form id="form" action="index.php" method="post">';
         $o.= '    <input type="hidden" name ="dir" value="' . str_replace($CFG->dirroot, '', $dirpath) . '" />';
         $o.= '    <input type="hidden" name ="table" value="' . $tableparam .'" />';
         $o.= '    <input type="hidden" name ="index" value="' . $indexparam .'" />';
diff --git a/admin/xmldb/actions/edit_key/edit_key.class.php b/admin/xmldb/actions/edit_key/edit_key.class.php
index 68812de24d..24d316386a 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 = '<form name="form" id="form" action="index.php" method="post">';
+        $o = '<form id="form" action="index.php" method="post">';
         $o.= '    <input type="hidden" name ="dir" value="' . str_replace($CFG->dirroot, '', $dirpath) . '" />';
         $o.= '    <input type="hidden" name ="table" value="' . $tableparam .'" />';
         $o.= '    <input type="hidden" name ="key" value="' . $keyparam .'" />';
diff --git a/admin/xmldb/actions/edit_sentence/edit_sentence.class.php b/admin/xmldb/actions/edit_sentence/edit_sentence.class.php
index 24bf590272..300f192f90 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 = '<form name="form" id="form" action="index.php" method="post">';
+            $o = '<form id="form" action="index.php" method="post">';
             $o.= '    <input type="hidden" name ="dir" value="' . str_replace($CFG->dirroot, '', $dirpath) . '" />';
             $o.= '    <input type="hidden" name ="statement" value="' . $statementparam .'" />';
             $o.= '    <input type="hidden" name ="sentence" value="' . $sentenceparam .'" />';
diff --git a/auth/cas/index_form.html b/auth/cas/index_form.html
index 0cc529d5cd..78ee639482 100644
--- a/auth/cas/index_form.html
+++ b/auth/cas/index_form.html
@@ -15,12 +15,12 @@
         (<?php print_string("cookiesenabled");?>) 
          <?php helpbutton("cookies", get_string("cookiesenabled"))?><br /><?php formerr($errormsg) ?>
       </p>
-      <form action="index.php" method="post" name="login" id="login">
+      <form action="index.php" method="post" id="login">
         <table border="0" align="center" style="font-size: small">
         <tr>
           <td width="100%">
-            <input type="hidden" name="username" value="cas" />
-            <input type="hidden" name="password" value="cas" />
+            <input type="hidden" name="username" id="username" value="cas" />
+            <input type="hidden" name="password" id="password" value="cas" />
             <input type="submit" value="<?php print_string("auth_cas_logincas", "auth") ?>" />
           </td>
         </tr>
@@ -29,7 +29,7 @@
 <?php if ($CFG->guestloginbutton) {  ?>
       <hr width="80%" />
       <p><?php print_string("someallowguest") ?>:</p>
-        <form action="index.php" method="post" name="guestlogin">
+        <form action="index.php" method="post" id="guestlogin">
           <input type="hidden" name="username" value="guest" />
           <input type="hidden" name="password" value="guest" />
           <input type="submit" value="<?php print_string("loginguest") ?>" />
@@ -42,7 +42,7 @@
 ?>
       <hr width="80%" />
       <p><?php print_string("forgotten") ?></p> 
-        <form action="<?php p($changepassword) ?>" method="get" name="changepassword">
+        <form action="<?php p($changepassword) ?>" method="get" id="changepassword">
           <input type="submit" value="<?php p($changebuttonname) ?>" />
         </form>
 <?php } ?>
@@ -56,7 +56,7 @@
                  print_string("loginsteps", "", "signup.php");
 ?>
                  <div align="center">
-                   <form action="signup.php" method="get" name="signup">
+                   <form action="signup.php" method="get" id="signup">
                    <input type="submit" value="<?php print_string("startsignup") ?>" />
                    </form>
                  </div>
@@ -71,7 +71,7 @@
 ?>
 
                  <div align="center">
-                    <form action="signup.php" method="get" name="signup">
+                    <form action="signup.php" method="get" id="signup">
                     <input type="submit" value="<?php print_string("startsignup") ?>" />
                     </form>
                  </div>
diff --git a/backup/backup_check.html b/backup/backup_check.html
index af5e194c38..225ff656eb 100644
--- a/backup/backup_check.html
+++ b/backup/backup_check.html
@@ -35,7 +35,7 @@
     }
 ?>
 
-<form name="form" method="post" action="backup.php">
+<form id="form" method="post" action="backup.php">
 <table cellpadding="5">
 <?php
 
diff --git a/backup/backup_form.html b/backup/backup_form.html
index 534eac496e..354c524c56 100644
--- a/backup/backup_form.html
+++ b/backup/backup_form.html
@@ -113,7 +113,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
 -->
 </script>
 
-<form name="form1" id="form1" method="post" action="backup.php">
+<form id="form1" method="post" action="backup.php">
 <table cellpadding="5">
 <?php
     //Now, check modules and info and show posibilities
diff --git a/backup/restore_form.html b/backup/restore_form.html
index 50094b1a14..87baf98e2a 100644
--- a/backup/restore_form.html
+++ b/backup/restore_form.html
@@ -159,7 +159,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
 -->
 </script>
 
-<form name="form1" id="form1" method="post" action="restore.php">
+<form id="form1" method="post" action="restore.php">
 <table cellpadding="5">
 <?php
 
diff --git a/blocks/loancalc/block_loancalc.php b/blocks/loancalc/block_loancalc.php
index df7ce8c589..4a3c7f3778 100644
--- a/blocks/loancalc/block_loancalc.php
+++ b/blocks/loancalc/block_loancalc.php
@@ -153,7 +153,7 @@ function comp(v) { // general entry point for all cases
 <title></title>
 
 <h1></h1>
-<form method="post" id="vbankform" name="vbankform">
+<form method="post" id="vbankform">
             <table>
                 <tr>
                     <td colspan="2">'.get_string('amountofloan','block_loancalc').'</td>
diff --git a/blocks/login/block_login.php b/blocks/login/block_login.php
index decfe2cd44..2db70cead6 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".'<form class="loginform" name="login" method="post" action="'.$wwwroot.'/login/index.php">';
+            $this->content->text .= "\n".'<form class="loginform" id="login" method="post" action="'.$wwwroot.'/login/index.php">';
 
             $this->content->text .= '<div class="c1"><label for="login_username">'.get_string('username').'</label>: ';
             $this->content->text .= '<input type="text" name="username" id="login_username" value="'.$username.'" /></div>';
diff --git a/blocks/search/block_search.php b/blocks/search/block_search.php
index f06d6c9d07..365ad2f886 100644
--- a/blocks/search/block_search.php
+++ b/blocks/search/block_search.php
@@ -50,7 +50,7 @@
         
         //basic search form
         $this->content->text =
-            '<form name="query" method="get" action="'. $CFG->wwwroot .'/search/query.php"><div>'
+            '<form id="searchquery" method="get" action="'. $CFG->wwwroot .'/search/query.php"><div>'
           . '<label for="block_search_q">'. $label .'</label>'
           . '<input id="block_search_q" type="text" name="query_string" length="50" />'
           . '<input type="submit" value="'.$button.'" />'
diff --git a/blog/preferences.html b/blog/preferences.html
index 95fc363d97..ef22674941 100755
--- a/blog/preferences.html
+++ b/blog/preferences.html
@@ -1,4 +1,4 @@
-<form method="post" action="preferences.php" name="entry" id="entry">
+<form method="post" action="preferences.php" id="entry">
 <table cellpadding="9" cellspacing="0">
 <tr>
     <td><?php print_string('pagesize', 'blog');?>:</td>
diff --git a/calendar/event_delete.html b/calendar/event_delete.html
index 6383d50945..8ebe69fb51 100644
--- a/calendar/event_delete.html
+++ b/calendar/event_delete.html
@@ -1,7 +1,7 @@
 <table style="margin: auto;">
   <tr>
     <td>
-      <form method="get" action="event.php" name="delete">
+      <form method="get" action="event.php" id="delete">
       <p>
       &nbsp;
       <input type="submit" value=" <?php print_string('delete') ?> " />
@@ -18,7 +18,7 @@
     </td>
     <?php if($repeatcount > 1) { ?>
     <td>
-      <form method="get" action="event.php" name="delete">
+      <form method="get" action="event.php" id="delete">
       <p>
       &nbsp;
       <input type="submit" value=" <?php print_string('deleteall') ?> " />
@@ -35,7 +35,7 @@
     </td>
     <?php } ?>
     <td>
-      <form method="get" action="view.php" name="cancel">
+      <form method="get" action="view.php" id="cancel">
       <p>
       &nbsp;
       <input type="submit" value=" <?php print_string('cancel') ?> ">
diff --git a/calendar/event_edit.html b/calendar/event_edit.html
index 3a33f0bf0d..8e612edc82 100644
--- a/calendar/event_edit.html
+++ b/calendar/event_edit.html
@@ -1,4 +1,4 @@
-<form method="post" action="event.php" name="eventform">
+<form method="post" action="event.php" id="eventform">
 <table cellpadding="5" cellspacing="0">
   <tr>
     <td style="vertical-align: top; text-align: right;">
diff --git a/calendar/event_new.html b/calendar/event_new.html
index 92cda132af..47af568465 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);
 ?>
-<form method="post" action="event.php" name="eventform">
+<form method="post" action="event.php" id="eventform">
 <table cellpadding="5">
   <tr>
     <td style="vertical-align: top; text-align: right;">
diff --git a/calendar/preferences.html b/calendar/preferences.html
index e25a17462c..b4e52c07ae 100644
--- a/calendar/preferences.html
+++ b/calendar/preferences.html
@@ -1,4 +1,4 @@
-<form method="post" action="preferences.php" name="form">
+<form method="post" action="preferences.php" id="prefform">
 
 <table class="formtable">
 <tr>
diff --git a/course/category.php b/course/category.php
index 3cfc17795f..d667bf3b95 100644
--- a/course/category.php
+++ b/course/category.php
@@ -274,7 +274,7 @@
         $strrequireskey     = get_string("requireskey");
 
 
-        echo '<form name="movecourses" action="category.php" method="post">';
+        echo '<form id="movecourses" action="category.php" method="post">';
         echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
         echo '<table align="center" border="0" cellspacing="2" cellpadding="4" class="generalbox"><tr>';
         echo '<th scope="col">'.$strcourses.'</th>';
@@ -402,7 +402,7 @@
             echo '<tr><td colspan="3" align="right">';
             echo '<br />';
             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 '<input type="hidden" name="id" value="'.$category->id.'" />';
             echo '</td></tr>';
         }
@@ -430,7 +430,7 @@
 
     if (has_capability('moodle/category:update', $context)) {           /// Print form to rename the category
         $strrename= get_string('rename');
-        echo '<form name="renameform" action="category.php" method="post">';
+        echo '<form id="renameform" action="category.php" method="post">';
         echo '<input type="hidden" name="id" value="'.$category->id.'" />';
         echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
         echo '<input type="text" size="30" name="rename" value="'.s($category->name).'" alt="'.$strrename.'" />';
diff --git a/course/editsection.html b/course/editsection.html
index 913d0b07af..46ec51f170 100644
--- a/course/editsection.html
+++ b/course/editsection.html
@@ -1,5 +1,5 @@
 <center>
-<form name="theform" method="post" action="editsection.php">
+<form id="theform" method="post" action="editsection.php">
 <table cellpadding="5">
 <tr valign="top">
     <td align="right"><p><b><?php print_string("summary") ?>:</b></p>
diff --git a/course/groups-edit.html b/course/groups-edit.html
index b7005b2bd9..6d43f92e53 100755
--- a/course/groups-edit.html
+++ b/course/groups-edit.html
@@ -80,7 +80,7 @@ function groupWindow(selectgroup) {
 //]]>
 </script>
 
-        <form id="rolesform1" name="rolesform1" action="groups.php" method="get">
+        <form id="rolesform1" action="groups.php" method="get">
         <input type="hidden" name="id" value="<?php echo $courseid ?>" />
         <div align="center"><?php echo get_string('currentrole', 'role') ?>: 
             <?php choose_from_menu ($roleoptions, 'roleid', $roleid, '', 'document.getElementById(\'rolesform1\').submit()') ?>
@@ -90,7 +90,7 @@ function groupWindow(selectgroup) {
     <tr align="center" valign="top">
       <td class="generalboxcontent">
         <label for="nonmembers"><?php p($strmemberincourse) ?></label>
-        <form name="form1" id="form1" method="post" action="groups.php">
+        <form id="form1" method="post" action="groups.php">
           <input type="hidden" name="id" value="<?php p($course->id) ?>" />
           <input type="hidden" name="groupid" value="<?php p($selectedgroup) ?>" />
           <input type="hidden" name="sesskey" value="<?php p($sesskey) ?>" />
@@ -124,7 +124,7 @@ function groupWindow(selectgroup) {
       </td>
       <td class="generalboxcontent">
         <label for="groups"><?php p($strgroups) ?></label>
-        <form name="form2" id="form2" method="post" action="groups.php">
+        <form id="form2" method="post" action="groups.php">
           <input type="hidden" name="id" value="<?php p($course->id) ?>" />
           <input type="hidden" name="sesskey" value="<?php p($sesskey) ?>" />
           <input type="hidden" name="roleid" value="<?php p($roleid) ?>" />
@@ -156,7 +156,7 @@ function groupWindow(selectgroup) {
 
       <td class="generalboxcontent">
         <label for="members"><?php p($strgroupmembersselected) ?></label>
-        <form name="form3" id="form3" method="post" action="groups.php">
+        <form id="form3" method="post" action="groups.php">
           <input type="hidden" name="id" value="<?php p($course->id) ?>" />
           <input type="hidden" name="groupid" value="<?php p($selectedgroup) ?>" />
           <input type="hidden" name="sesskey" value="<?php p($sesskey) ?>" />
diff --git a/course/importstudents.html b/course/importstudents.html
index e8664173f5..ab35b54cfd 100644
--- a/course/importstudents.html
+++ b/course/importstudents.html
@@ -1,5 +1,5 @@
 
-<form name="studentform" id="studentform" method="post" action="importstudents.php">
+<form id="studentform" method="post" action="importstudents.php">
 <input type="hidden" name="previoussearch" value="<?php echo $previoussearch ?>" />
 <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
 <input type="hidden" name="id" value="<?php echo $id?>" />
@@ -9,9 +9,9 @@
           <label for="removeselect"><?php echo count($alreadycourses) . " ". $stralreadycourses ?></label>
           <br />
           <select name="removeselect[]" size="20" id="removeselect" multiple
-                  onFocus="document.studentform.add.disabled=true;
-                           document.studentform.remove.disabled=false;
-                           document.studentform.addselect.selectedIndex=-1;">
+                  onFocus="getElementById('studentform').add.disabled=true;
+                           getElementById('studentform').remove.disabled=false;
+                           getElementById('studentform').addselect.selectedIndex=-1;">
           <?php 
             foreach ($alreadycourses as $course) {
                 echo "<option value=\"$course->id\">".course_format_name($course,60)."</option>\n";
@@ -30,9 +30,9 @@
           <label for="addselect"><?php echo $numcourses . " " . $strpotentialcourses ?></label>
           <br />
           <select name="addselect[]" size="20" id="addselect" multiple
-                  onFocus="document.studentform.add.disabled=false;
-                           document.studentform.remove.disabled=true;
-                           document.studentform.removeselect.selectedIndex=-1;">
+                  onFocus="getElementById('studentform').add.disabled=false;
+                           getElementById('studentform').remove.disabled=true;
+                           getElementById('studentform').removeselect.selectedIndex=-1;">
           <?php
   
               if (!empty($searchcourses)) {
@@ -58,14 +58,14 @@
          <br />
          <label for="searchtext" class="accesshide"><?php p($strsearch) ?></label>
          <input type="text" name="searchtext" id="searchtext" size="30" value="<?php p($searchtext, true) ?>" 
-                  onFocus ="document.studentform.add.disabled=true;
-                            document.studentform.remove.disabled=true;
-                            document.studentform.removeselect.selectedIndex=-1;
-                            document.studentform.addselect.selectedIndex=-1;"
+                  onFocus ="getElementById('studentform').add.disabled=true;
+                            getElementById('studentform').remove.disabled=true;
+                            getElementById('studentform').removeselect.selectedIndex=-1;
+                            getElementById('studentform').addselect.selectedIndex=-1;"
                   onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
                                if (keyCode == 13) {
-                                    document.studentform.previoussearch.value=1;
-                                    document.studentform.submit();
+                                    getElementById('studentform').previoussearch.value=1;
+                                    getElementById('studentform').submit();
                                } " />
          <input name="search" id="search" type="submit" value="<?php p($strsearch) ?>" />
          <?php
diff --git a/course/importstudents.php b/course/importstudents.php
index d8682e316a..a49fd179b9 100644
--- a/course/importstudents.php
+++ b/course/importstudents.php
@@ -46,7 +46,7 @@
     print_header("$course->shortname: $strassigncourses",
                  "$site->fullname",
                  "<a href=\"view.php?id=$course->id\">$course->shortname</a> -> $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 8ff237f509..429ce9163b 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 "<center>";
-        echo "<form name=\"addform\" action=\"index.php\" method=\"post\">";
+        echo "<form id=\"addform\" action=\"index.php\" method=\"post\">";
         echo "<input type=\"text\" size=\"30\" alt=\"$straddnewcategory\" name=\"addcategory\" />";
         echo "<input type=\"submit\" value=\"$straddnewcategory\" />";
         echo "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />";
diff --git a/course/lib.php b/course/lib.php
index 59b6d95100..0b6f90cac1 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  = '<form name="coursesearch" action="'.$CFG->wwwroot.'/course/search.php" method="get">';
+        $output  = '<form id="coursesearch" action="'.$CFG->wwwroot.'/course/search.php" method="get">';
         $output .= '<center><p align="center" class="coursesearchbox">';
         $output .= '<input type="text" size="30" name="search" alt="'.s($strsearchcourses).'" value="'.s($value, true).'" />';
         $output .= '<input type="submit" value="'.s($strsearchcourses).'" />';
         $output .= '</p></center></form>';
     } else if ($format == 'short') {
-        $output  = '<form name="coursesearch" action="'.$CFG->wwwroot.'/course/search.php" method="get">';
+        $output  = '<form id="coursesearch" action="'.$CFG->wwwroot.'/course/search.php" method="get">';
         $output .= '<center><p align="center" class="coursesearchbox">';
         $output .= '<input type="text" size="12" name="search" alt="'.s($strsearchcourses).'" value="'.s($value, true).'" />';
         $output .= '<input type="submit" value="'.s($strsearchcourses).'" />';
         $output .= '</p></center></form>';
     } else if ($format == 'navbar') {
-        $output  = '<form name="coursesearch" action="'.$CFG->wwwroot.'/course/search.php" method="get">';
+        $output  = '<form id="coursesearch" action="'.$CFG->wwwroot.'/course/search.php" method="get">';
         $output .= '<table border="0" cellpadding="0" cellspacing="0"><tr><td nowrap="nowrap">';
         $output .= '<input type="text" size="20" name="search" alt="'.s($strsearchcourses).'" value="'.s($value, true).'" />';
         $output .= '<input type="submit" value="'.s($strsearchcourses).'" />';
diff --git a/course/mod_delete.html b/course/mod_delete.html
index 8670c0784d..e6c21eb48e 100644
--- a/course/mod_delete.html
+++ b/course/mod_delete.html
@@ -1,4 +1,4 @@
-<form name="form" method="post" action="<?php echo "$CFG->wwwroot/course/mod.php" ?>">
+<form id="form" method="post" action="<?php echo "$CFG->wwwroot/course/mod.php" ?>">
 
 <input type="hidden" name="mode"         value="delete" />
 <input type="hidden" name="section"      value="<?php p($form->section) ?>" />
diff --git a/course/pending-reject.html b/course/pending-reject.html
index 6c6203e380..5f60042d46 100644
--- a/course/pending-reject.html
+++ b/course/pending-reject.html
@@ -1,4 +1,4 @@
-<form action="pending.php" method="post" name="reject">
+<form action="pending.php" method="post" id="reject">
 <input type="hidden" name="reject" value="<?php p($reject->id); ?>" />
 <textarea name="rejectnotice" rows="10" cols="50"></textarea><br />
 <input type="submit" value="<?php print_string("savechanges");?>" />
diff --git a/course/report/participation/index.php b/course/report/participation/index.php
index 1cf7e1550d..e17e026652 100644
--- a/course/report/participation/index.php
+++ b/course/report/participation/index.php
@@ -328,7 +328,7 @@ function checknos() {
 //]]>
 </script>
 ';
-        echo '<form action="'.$CFG->wwwroot.'/user/action_redir.php" method="post" name="studentsform" onSubmit="return checksubmit(this);">';
+        echo '<form action="'.$CFG->wwwroot.'/user/action_redir.php" method="post" id="studentsform" onSubmit="return checksubmit(this);">';
         echo '<input type="hidden" name="id" value="'.$id.'" />';
         echo '<input type="hidden" name="returnto" value="'.$_SERVER['REQUEST_URI'].'" />';
         echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
diff --git a/course/reset.php b/course/reset.php
index f8d92a5a9e..c405e5af77 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 '<form name="reset" action="reset.php" method="POST">';
+    echo '<form id="reset" action="reset.php" method="POST">';
 
     print_heading(get_string('course'), 'left', 3);
 
diff --git a/course/scales.php b/course/scales.php
index 60b9506a86..9505364dab 100644
--- a/course/scales.php
+++ b/course/scales.php
@@ -177,7 +177,7 @@
             $scale->scale = $form->scalescale;
             $scale->description = $form->description;
         }
-        echo "<form method=\"post\" action=\"scales.php\" name=\"form$scale->id\">";
+        echo "<form method=\"post\" action=\"scales.php\" id=\"form$scale->id\">";
         echo "<table cellpadding=\"9\" cellspacing=\"0\" align=\"center\" class=\"generalbox\">";
         echo "<tr valign=\"top\">";
         if (!empty($errors[$scale->id]->name)) {
diff --git a/course/search.php b/course/search.php
index a3fc8cf7a5..044f28f802 100644
--- a/course/search.php
+++ b/course/search.php
@@ -153,7 +153,7 @@
             }
         } else { // slightly more sophisticated
 
-            echo "<form name=\"movecourses\" action=\"search.php\" method=\"post\">";
+            echo "<form id=\"movecourses\" action=\"search.php\" method=\"post\">";
             echo "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\">";
             echo "<input type=\"hidden\" name=\"search\" value=\"".s($search, true)."\">";
             echo "<input type=\"hidden\" name=\"page\" value=\"$page\">";
@@ -237,7 +237,7 @@
             echo "<br />";
             echo "<input type=\"button\" onclick=\"checkall()\" value=\"$strselectall\" />\n";
             echo "<input type=\"button\" onclick=\"uncheckall()\" value=\"$strdeselectall\" />\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 "</td></tr>";
             echo "</table>";
 
diff --git a/enrol/manual/enrol.html b/enrol/manual/enrol.html
index 1c359f74da..fee7c259cf 100644
--- a/enrol/manual/enrol.html
+++ b/enrol/manual/enrol.html
@@ -13,7 +13,7 @@
       <p align="center"><?php if (! empty($this->errormsg)) {formerr($this->errormsg);} ?></p>
 
 
-      <form name="form" method="post" action="enrol.php">
+      <form method="post" action="enrol.php">
         <table align="center" width="100%">
           <tr>
             <td align="right"><?php print_string("enrolmentkey") ?>:</td>
@@ -41,7 +41,7 @@
     if ($course->guest and !isguest()) {
       print_simple_box_start('center');
 ?>
-      <form name="form" method="post" action="enrol.php">
+      <form method="post" action="enrol.php">
         <table align="center" cellpadding="20">
             <tr>
               <td><?php print_string('allowguests') ?>:&nbsp; </td>
diff --git a/enrol/mnet/allowed_courses.php b/enrol/mnet/allowed_courses.php
index 2407dc930b..b6fb8ca08d 100644
--- a/enrol/mnet/allowed_courses.php
+++ b/enrol/mnet/allowed_courses.php
@@ -111,7 +111,7 @@ print_simple_box_start('center','90%','','20');
 
 ?>
  <div class="allowedcoursesdiv"> 
-  <form name="allowedcoursesform" method="post">
+  <form id="allowedcoursesform" method="post">
     <input type="hidden" name="sesskey" value="<?php echo $sesskey; ?>">
 <?php
 
@@ -135,9 +135,9 @@ if (count($categories) < 1) {
     <tr>
       <td valign="top">
           <select name="removecategories[]" size="20" id="removecategories" multiple
-                  onFocus="document.allowedcoursesform.addcategory.disabled=true;
-                           document.allowedcoursesform.removecategory.disabled=false;
-                           document.allowedcoursesform.addcategories.selectedIndex=-1;" />
+                  onFocus="getElementById('allowedcoursesform').addcategory.disabled=true;
+                           getElementById('allowedcoursesform').removecategory.disabled=false;
+                           getElementById('allowedcoursesform').addcategories.selectedIndex=-1;" />
           <?php
               foreach ($allowedcategories as $category) {
                   echo "<option value=\"$category->id\"> $category->name </option>\n";
@@ -156,9 +156,9 @@ if (count($categories) < 1) {
 
       <td valign="top">
           <select name="addcategories[]" size="20" id="addcategories" multiple
-                  onFocus="document.allowedcoursesform.addcategory.disabled=false;
-                           document.allowedcoursesform.removecategory.disabled=true;
-                           document.allowedcoursesform.removecategories.selectedIndex=-1;">
+                  onFocus="getElementById('allowedcoursesform').addcategory.disabled=false;
+                           getElementById('allowedcoursesform').removecategory.disabled=true;
+                           getElementById('allowedcoursesform').removecategories.selectedIndex=-1;">
           <?php
             foreach ($potentialcategories as $category) {
                 echo "<option value=\"$category->id\"> $category->name </option>\n";
@@ -192,9 +192,9 @@ if (count($courses) < 1) {
     <tr>
       <td valign="top">
           <select name="removecourses[]" size="20" id="removecourses" multiple
-                  onFocus="document.allowedcoursesform.addcourse.disabled=true;
-                           document.allowedcoursesform.removecourse.disabled=false;
-                           document.allowedcoursesform.addcourses.selectedIndex=-1;" />
+                  onFocus="getElementById('allowedcoursesform').addcourse.disabled=true;
+                           getElementById('allowedcoursesform').removecourse.disabled=false;
+                           getElementById('allowedcoursesform').addcourses.selectedIndex=-1;" />
           <?php
               foreach ($allowedcourses as $course) {
                   echo "<option value=\"$course->id\"> $course->shortname </option>\n";
@@ -213,9 +213,9 @@ if (count($courses) < 1) {
 
       <td valign="top">
           <select name="addcourses[]" size="20" id="addcourses" multiple
-                  onFocus="document.allowedcoursesform.addcourse.disabled=false;
-                           document.allowedcoursesform.removecourse.disabled=true;
-                           document.allowedcoursesform.removecourses.selectedIndex=-1;">
+                  onFocus="getElementById('allowedcoursesform').addcourse.disabled=false;
+                           getElementById('allowedcoursesform').removecourse.disabled=true;
+                           getElementById('allowedcoursesform').removecourses.selectedIndex=-1;">
           <?php
             foreach ($potentialcourses as $course) {
                 echo "<option value=\"$course->id\"> $course->shortname </option>\n";
diff --git a/enrol/mnet/remote_enrolment.html b/enrol/mnet/remote_enrolment.html
index 4016c76ffc..99984df12a 100755
--- a/enrol/mnet/remote_enrolment.html
+++ b/enrol/mnet/remote_enrolment.html
@@ -1,5 +1,5 @@
 
-<form name="assignform" id="assignform" method="post" action="">
+<form id="assignform" id="assignform" method="post" action="">
 <input type="hidden" name="previoussearch" value="<?php p($previoussearch) ?>" />
 <input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
 <input type="hidden" name="host" value="<?php p($mnethost->id) ?>" />
@@ -17,9 +17,9 @@
     <tr>
       <td valign="top">
           <select name="removeselect[]" size="20" id="removeselect" multiple
-                  onFocus="document.assignform.add.disabled=true;
-                           document.assignform.remove.disabled=false;
-                           document.assignform.addselect.selectedIndex=-1;" />
+                  onFocus="getElementById('assignform').add.disabled=true;
+                           getElementById('assignform').remove.disabled=false;
+                           getElementById('assignform').addselect.selectedIndex=-1;" />
           <?php
               foreach ($enrolledusers as $enrolleduser) {
                   $fullname = fullname($enrolleduser, true);
@@ -37,9 +37,9 @@
       </td>
       <td valign="top">
           <select name="addselect[]" size="20" id="addselect" multiple
-                  onFocus="document.assignform.add.disabled=false;
-                           document.assignform.remove.disabled=true;
-                           document.assignform.removeselect.selectedIndex=-1;">
+                  onFocus="getElementById('assignform').add.disabled=false;
+                           getElementById('assignform').remove.disabled=true;
+                           getElementById('assignform').removeselect.selectedIndex=-1;">
           <?php
 
               if (!empty($searchtext)) {
@@ -73,14 +73,14 @@
          </select>
          <br />
          <input type="text" name="searchtext" size="30" value="<?php p($searchtext, true) ?>"
-                  onFocus ="document.assignform.add.disabled=true;
-                            document.assignform.remove.disabled=true;
-                            document.assignform.removeselect.selectedIndex=-1;
-                            document.assignform.addselect.selectedIndex=-1;"
+                  onFocus ="getElementById('assignform').add.disabled=true;
+                            getElementById('assignform').remove.disabled=true;
+                            getElementById('assignform').removeselect.selectedIndex=-1;
+                            getElementById('assignform').addselect.selectedIndex=-1;"
                   onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
                                if (keyCode == 13) {
-                                    document.assignform.previoussearch.value=1;
-                                    document.assignform.submit();
+                                    getElementById('assignform').previoussearch.value=1;
+                                    getElementById('assignform').submit();
                                } " />
          <input name="search" id="search" type="submit" value="<?php p($strsearch) ?>" />
          <?php
diff --git a/error/index.php b/error/index.php
index 08fa0c2125..d8633575be 100644
--- a/error/index.php
+++ b/error/index.php
@@ -23,15 +23,15 @@
     $httpreferer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
     $requesturi  = empty($_SERVER['REQUEST_URI'])  ? '' : $_SERVER['REQUEST_URI'];
     
-    print_header($site->fullname .':Error', $site->fullname .': Error 404', '', 'form.text');
+    print_header($site->fullname .':Error', $site->fullname .': Error 404', '', 'text');
     print_simple_box('<p align="center">'. get_string('pagenotexist', 'error'). '<br />'.s($requesturi).'</p>', 'center');
   
 ?>
   
   <center>
   <p><?php echo get_string('pleasereport', 'error'); ?>
-  <p><form action="<?php echo $CFG->wwwroot ?>/error/index.php" name="form" method="post">
-     <textarea rows="3" cols="50" name="text"></textarea><br />
+  <p><form action="<?php echo $CFG->wwwroot ?>/error/index.php" method="post">
+     <textarea rows="3" cols="50" name="text" id="text"></textarea><br />
      <input type="hidden" name="referer" value="<?php p($httpreferer) ?>">
      <input type="hidden" name="requested" value="<?php p($requesturi) ?>">
      <input type="submit" value="<?php echo get_string('sendmessage', 'error'); ?>">
diff --git a/files/index.php b/files/index.php
index 4f3a555fbf..89e7d354bb 100644
--- a/files/index.php
+++ b/files/index.php
@@ -307,7 +307,7 @@
                 html_header($course, $wdir, "form.name");
                 echo "<p>$strrenamefileto:</p>";
                 echo "<table><tr><td>";
-                echo "<form action=\"index.php\" method=\"post\" name=\"form\">";
+                echo "<form action=\"index.php\" method=\"post\">";
                 echo ' <input type="hidden" name="choose" value="'.$choose.'" />';
                 echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
                 echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
@@ -348,7 +348,7 @@
                 html_header($course, $wdir, "form.name");
                 echo "<p>$strcreatefolder:</p>";
                 echo "<table><tr><td>";
-                echo "<form action=\"index.php\" method=\"post\" name=\"form\">";
+                echo "<form action=\"index.php\" method=\"post\">";
                 echo ' <input type="hidden" name="choose" value="'.$choose.'" />';
                 echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
                 echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
@@ -395,7 +395,7 @@
                 print_heading("$streditfile");
 
                 echo "<table><tr><td colspan=\"2\">";
-                echo "<form action=\"index.php\" method=\"post\" name=\"form\">";
+                echo "<form action=\"index.php\" method=\"post\">";
                 echo ' <input type="hidden" name="choose" value="'.$choose.'" />';
                 echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
                 echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
@@ -453,7 +453,7 @@
                     echo "<br />";
                     echo "<p align=\"center\">".get_string("whattocallzip")."</p>";
                     echo "<table><tr><td>";
-                    echo "<form action=\"index.php\" method=\"post\" name=\"form\">";
+                    echo "<form action=\"index.php\" method=\"post\">";
                     echo ' <input type="hidden" name="choose" value="'.$choose.'" />';
                     echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
                     echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
@@ -694,7 +694,7 @@ function displaydir ($wdir) {
     $strfile   = get_string("file");
 
 
-    echo "<form action=\"index.php\" method=\"post\" name=\"dirform\">";
+    echo "<form action=\"index.php\" method=\"post\" id=\"dirform\">";
     echo '<input type="hidden" name="choose" value="'.$choose.'" />';
     echo "<hr width=\"640\" align=\"center\" noshade=\"noshade\" size=\"1\" />";
     echo "<table border=\"0\" cellspacing=\"2\" cellpadding=\"2\" width=\"640\" class=\"files\">";
diff --git a/grade/exceptions.html b/grade/exceptions.html
index 30feacea75..494f43362f 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<username.length;i++) {
-        document.form3['members[]'].options[i].value = userid[i];
-        document.form3['members[]'].options[i].text  = username[i];
+        getElementById('form3')['members[]'].options[i].value = userid[i];
+        getElementById('form3')['members[]'].options[i].text  = username[i];
     }
 
     eval('grade_item_inc=grade_item_inc'+selectgrade_item.value); 
@@ -73,11 +73,11 @@ function updateMembers(selectgrade_item) {
     username = grade_item_inc.username;
     userid = grade_item_inc.userid;
 
-    document.form1['nonmembers[]'].length = username.length;
+    getElementById('form1')['nonmembers[]'].length = username.length;
 
     for (i=0;i<username.length;i++) {
-        document.form1['nonmembers[]'].options[i].value = userid[i];
-        document.form1['nonmembers[]'].options[i].text  = username[i];
+        getElementById('form1')['nonmembers[]'].options[i].value = userid[i];
+        getElementById('form1')['nonmembers[]'].options[i].text  = username[i];
     }
 
     updategrade_item();
@@ -104,7 +104,7 @@ function updateMembers(selectgrade_item) {
     </tr>
     <tr align="center" valign="top">
       <td class="generalboxcontent">
-        <form name="form1" id="form1" method="post" action="exceptions.php">
+        <form id="form1" method="post" action="exceptions.php">
           <input type="hidden" name="id" value="<?php p($course->id) ?>" />
           <input type="hidden" name="grade_itemid" value="<?php p($selectedgrade_item) ?>" />
           <input type="hidden" name="action" value="excepts" />
@@ -125,7 +125,7 @@ function updateMembers(selectgrade_item) {
         </form>
       </td>
       <td class="generalboxcontent">
-        <form name="form2" id="form2" method="post" action="grade_items.php">
+        <form id="form2" method="post" action="grade_items.php">
           <input type="hidden" name="id" value="<?php p($course->id) ?>" />
           <input type="hidden" name="action" value="excepts" />
           <input type="hidden" name="sesskey" value="<?php p($USER->sesskey) ?>"/>
@@ -147,7 +147,7 @@ function updateMembers(selectgrade_item) {
 
 
       <td class="generalboxcontent">
-        <form name="form3" id="form3" method="post" action="exceptions.php">
+        <form id="form3" method="post" action="exceptions.php">
           <input type="hidden" name="id" value="<?php p($course->id) ?>" />
           <input type="hidden" name="grade_itemid" value="<?php p($selectedgrade_item) ?>" />
           <input type="hidden" name="sesskey" value="<?php p($USER->sesskey) ?>"/>
diff --git a/grade/lib.php b/grade/lib.php
index 881d083b7b..68e1574575 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  '<form name="grade_weights" action="./index.php" method="post">';
+        echo  '<form id="grade_weights" action="./index.php" method="post">';
         echo  '<table border="0" cellspacing="2" cellpadding="5" align="center" class="generalbox">';
         echo  '<tr><th colspan="5" class="header" scope="col">'.get_string('setweights','grades');
         helpbutton('weight', get_string('gradeweighthelp','grades'), 'grade');
@@ -2449,7 +2449,7 @@ function grade_set_categories() {
     echo  '<td align="center" class="generaltableheader">'.get_string('maxgrade','grades').'</td>';
     echo  '<td align="center" class="generaltableheader">'.get_string('curveto','grades').'</td>';
     echo  '<td align="center" class="generaltableheader">'.get_string('extracredit','grades').'</td></tr>';
-    echo  '<form name="set_categories" method="post" action="./index.php" >';
+    echo  '<form id="set_categories" method="post" action="./index.php" >';
     echo  '<input type="hidden" name="action" value="assign_categories" />';
     echo  '<input type="hidden" name="id" value="'.$course->id.'" />';
     echo  '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
@@ -2634,7 +2634,7 @@ function grade_add_category_form() {
     /// just a simple text box with submit
     global $course;
     global $USER;
-    echo  '<form name="new_category">';
+    echo  '<form id="new_category">';
     echo  get_string('addcategory','grades').':<input type="text" name="name" size="20" />';
     echo  '<input type="hidden" name="id" value="'.$course->id.'" />';
     echo  '<input type="hidden" name="action" value="insert_category" />';
@@ -2647,7 +2647,7 @@ function grade_delete_category_form() {
     // outputs a form to delete a category
     global $course;
     global $USER;
-    echo  '<form name="delete_category">';
+    echo  '<form id="delete_category">';
     echo  get_string('deletecategory','grades').': <select name="category_id">';
     grade_category_select();
     echo  '</select><input type="hidden" name="id" value="'.$course->id.'" />';
@@ -2733,7 +2733,7 @@ function grade_display_grade_preferences($course, $preferences) {
     print_single_button('index.php', $buttonoptions, $buttonlabel, 'post');
     echo '<br /></center>';
 
-    echo  '<form name="set_grade_preferences" method="post" action="./index.php">';
+    echo  '<form id="set_grade_preferences" method="post" action="./index.php">';
     echo  '<input type="hidden" name="action" value="set_grade_preferences" />';
     echo  '<input type="hidden" name="id" value="'.$course->id.'" />';
     echo  '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
@@ -2882,7 +2882,7 @@ function grade_display_letter_grades() {
         $letters[10]->courseid = $course->id;
     }
 
-    echo '<form name="grade_letter"><input type="hidden" name="id" value="'.$course->id.'" />';
+    echo '<form id="grade_letter"><input type="hidden" name="id" value="'.$course->id.'" />';
     echo '<table border="0" cellspacing="2" cellpadding="5" align="center" class="generalbox"><tr>';
     echo '<th colspan="3" class="header" scope="col">'.get_string('setgradeletters','grades');
     helpbutton('letter', get_string('gradeletterhelp','grades'), 'grade');
diff --git a/lib/rsslib.php b/lib/rsslib.php
index 757ece9ccb..72dd02a0f3 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 = '<table align="center"><tbody><tr><td>'."\n";    
-    $returnstring .= '<form action="'. $CFG->wwwroot .'/blocks/rss_client/block_rss_client_action.php" method="POST" name="block_rss">'."\n";
+    $returnstring .= '<form action="'. $CFG->wwwroot .'/blocks/rss_client/block_rss_client_action.php" method="post" id="block_rss">'."\n";
 
     if ($act == 'rssedit') {
         $returnstring .= $strupdatefeed; 
@@ -508,7 +508,7 @@ function rss_get_form($act='none', $url='', $rssid='', $preferredtitle='', $shar
     $returnstring .= '<input type="hidden" name="user" value="'. $USER->id .'" />'."\n";
     $returnstring .= '<br /><input type="submit" value="';
     $validatestring = "<a href=\"#\" 
-onClick=\"window.open('http://feedvalidator.org/check.cgi?url='+document.block_rss.elements['url'].value,'validate','width=640,height=480,scrollbars=yes,status=yes,resizable=yes');return true;\">". get_string('validatefeed', 'block_rss_client')."</a>";
+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')."</a>";
 
     if ($act == 'rssedit') {
         $returnstring .= $stredit;
diff --git a/lib/speller/controls.html b/lib/speller/controls.html
index 95e85ad085..1e7ed5737d 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() {
 
 <body class="controlWindowBody" onLoad="init_spell();">
 
-<form name="spellcheck">
+<form id="spellcheck">
 
 <table border="0" cellpadding="0" cellspacing="0" border="0">
 <tr>
diff --git a/message/search.html b/message/search.html
index e0a3118d53..f37fd95fcb 100644
--- a/message/search.html
+++ b/message/search.html
@@ -1,4 +1,4 @@
-<form name="personsearch" action="index.php" method="post">
+<form id="personsearch" action="index.php" method="post">
 <input type="hidden" name="tab" value="search" />
 
 
diff --git a/message/send.php b/message/send.php
index 4da717a3e0..989925d13b 100644
--- a/message/send.php
+++ b/message/send.php
@@ -87,7 +87,7 @@
 
     echo '<body class="message course-1" id="message-send">';
     echo '<center>';
-    echo '<form name="editing" method="post" action="send.php">';
+    echo '<form id="editing" method="post" action="send.php">';
     echo '<input type="hidden" name="id" value="'.$user->id.'" />';
     echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
 
diff --git a/message/settings.html b/message/settings.html
index c2aad9fc6d..1c0ddcec9b 100644
--- a/message/settings.html
+++ b/message/settings.html
@@ -1,4 +1,4 @@
-<form name="message_settings" action="index.php" method="post">
+<form id="message_settings" action="index.php" method="post">
 <input type="hidden" name="tab" value="settings" />
 
 
diff --git a/mod/assignment/config.html b/mod/assignment/config.html
index 54bd74f736..f239c8aadf 100644
--- a/mod/assignment/config.html
+++ b/mod/assignment/config.html
@@ -1,4 +1,4 @@
-<form method="post" action="module.php" name="form">
+<form method="post" action="module.php" id="form">
 <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
 
 <table cellpadding="9" cellspacing="0" >
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index ed2edba39b..65f75ad51e 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 '</td>';
         echo '<td class="content">';
-        echo '<form name="submitform" action="submissions.php" method="post">';
+        echo '<form id="submitform" action="submissions.php" method="post">';
         echo '<input type="hidden" name="offset" value="'.++$offset.'">';
         echo '<input type="hidden" name="userid" value="'.$userid.'" />';
         echo '<input type="hidden" name="id" value="'.$this->cm->id.'" />';
@@ -1186,7 +1186,7 @@ class assignment_base {
         
         /// Print quickgrade form around the table
         if ($quickgrade){
-            echo '<form action="submissions.php" name="fastg" method="post">';
+            echo '<form action="submissions.php" id="fastg" method="post">';
             echo '<input type="hidden" name="id" value="'.$this->cm->id.'">';
             echo '<input type="hidden" name="mode" value="fastgrade">';
             echo '<input type="hidden" name="page" value="'.$page.'">';
@@ -1203,7 +1203,7 @@ class assignment_base {
         
         /// Mini form for setting user preference
         echo '<br />';
-        echo '<form name="options" action="submissions.php?id='.$this->cm->id.'" method="post">';
+        echo '<form id="options" action="submissions.php?id='.$this->cm->id.'" method="post">';
         echo '<input type="hidden" id="updatepref" name="updatepref" value="1" />';
         echo '<table id="optiontable" align="center">';
         echo '<tr align="right"><td>';
diff --git a/mod/assignment/type/common.html b/mod/assignment/type/common.html
index bb15b6ed28..5ef072f7d4 100644
--- a/mod/assignment/type/common.html
+++ b/mod/assignment/type/common.html
@@ -1,4 +1,4 @@
-<form name="form" method="post" action="<?php p($action) ?>">
+<form id="form" method="post" action="<?php p($action) ?>">
 
 <?php
    $form->sesskey = sesskey();
diff --git a/mod/chat/config.html b/mod/chat/config.html
index 8d262c10f7..b37b7af5ba 100644
--- a/mod/chat/config.html
+++ b/mod/chat/config.html
@@ -1,4 +1,4 @@
-<form method="post" action="module.php" name="form">
+<form method="post" action="module.php" id="form">
 <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
 <table cellpadding="9" cellspacing="0" >
diff --git a/mod/chat/gui_header_js/chatinput.php b/mod/chat/gui_header_js/chatinput.php
index 5ef4bb8ddb..208e6352c8 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 @@
     <?php
 
     $meta = ob_get_clean();
-    print_header('', '', '', 'inputForm.chat_message', $meta, false);
+    print_header('', '', '', 'input_chat_message', $meta, false);
 
 ?>
-    <form action="../empty.php" method="post" target="empty" name="inputForm"
+    <form action="../empty.php" method="post" target="empty" id="inputForm"
           onsubmit="return empty_field_and_submit()">
         &gt;&gt;<input type="text" id="input_chat_message" name="chat_message" size="60" value="" />
         <?php helpbutton('chatting', get_string('helpchatting', 'chat'), 'chat', true, false); ?>
     </form>
 
-    <form action="insert.php" method="post" target="empty" name="sendForm">
+    <form action="insert.php" method="post" target="empty" id="sendForm">
         <input type="hidden" name="chat_sid" value="<?php echo $chat_sid ?>" />
         <input type="hidden" name="chat_message" />
     </form>
diff --git a/mod/choice/view.php b/mod/choice/view.php
index 265d64aa3e..491d9fa1d2 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 '<form name="form" method="post" action="view.php">';        
+        echo '<form id="form" method="post" action="view.php">';        
 
         choice_show_form($choice, $USER, $cm);
         
diff --git a/mod/data/config.html b/mod/data/config.html
index baca72ff46..090d6e5d4a 100644
--- a/mod/data/config.html
+++ b/mod/data/config.html
@@ -1,4 +1,4 @@
-<form method="post" action="module.php" name="form">
+<form method="post" action="module.php" id="form">
 <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
 <table cellpadding="9" cellspacing="0" >
diff --git a/mod/data/field.php b/mod/data/field.php
index 3a5ea41f92..a4669b41b7 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 '<div class="sortdefault" align="center">';
-            echo '<form name="sortdefault" action="'.$CFG->wwwroot.'/mod/data/field.php" method="get">';
+            echo '<form id="sortdefault" action="'.$CFG->wwwroot.'/mod/data/field.php" method="get">';
             echo '<input type="hidden" name="d" value="'.$data->id.'" />';
             echo '<input type="hidden" name="mode" value="sort" />';
             echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 1d478d43b3..5bda765d48 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 '<form name="editfield" action="'.$CFG->wwwroot.'/mod/data/field.php" method="post">'."\n";
+        echo '<form id="editfield" action="'.$CFG->wwwroot.'/mod/data/field.php" method="post">'."\n";
         echo '<input type="hidden" name="d" value="'.$this->data->id.'" />'."\n";
         if (empty($this->field->id)) {
             echo '<input type="hidden" name="mode" value="add" />'."\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 '<br /><div class="datapreferences" align="center">';
-    echo '<form name="options" action="view.php" method="get">';
+    echo '<form id="options" action="view.php" method="get">';
     echo '<input type="hidden" name="d" value="'.$data->id.'" />';
     echo '<label for="pref_perpage">'.get_string('pagesize','data').'</label> ';
     $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 '<div class="ratings" align="center">';
-            echo '<form name="form" method="post" action="rate.php">';
+            echo '<form id="form" method="post" action="rate.php">';
 
             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 6c773f16e4..f6e2d2a0a9 100644
--- a/mod/data/preset.php
+++ b/mod/data/preset.php
@@ -319,7 +319,7 @@ echo '<tr><td><label for="fromfile">'.$strfromfile.'</label>';
 helpbutton('importfromfile', '', 'data');
 echo '</td><td>';
 
-echo '<form name="uploadpreset" method="post" action="preset.php">';
+echo '<form id="uploadpreset" method="post" action="preset.php">';
 echo '<input type="hidden" name="d" value="'.$data->id.'" />';
 echo '<input type="hidden" name="action" value="importzip" />';
 echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
@@ -333,7 +333,7 @@ echo '<tr valign="top"><td><label>'.$strusestandard.'</label>';
 helpbutton('usepreset', '', 'data');
 echo '</td><td>';
 
-echo '<form name="presets" method="post" action="preset.php" >';
+echo '<form id="presets" method="post" action="preset.php" >';
 echo '<input type="hidden" name="d" value="'.$data->id.'" />';
 echo '<input type="hidden" name="action" value="importpreset" />';
 echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
diff --git a/mod/data/templates.php b/mod/data/templates.php
index c9471cf341..86d846dce5 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 '<form name="tempform" action="templates.php?d='.$data->id.'&amp;mode='.$mode.'" method="post">';
+    echo '<form id="tempform" action="templates.php?d='.$data->id.'&amp;mode='.$mode.'" method="post">';
     echo '<input name="sesskey" value="'.sesskey().'" type="hidden" />';
     // Print button to autogen all forms, if all templates are empty
 
diff --git a/mod/forum/config.html b/mod/forum/config.html
index e5933f9b30..738eb59add 100644
--- a/mod/forum/config.html
+++ b/mod/forum/config.html
@@ -1,4 +1,4 @@
-<form method="post" action="module.php" name="form">
+<form method="post" action="module.php" id="form">
 <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
 
 <table cellpadding="9" cellspacing="0" >
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 93d2fdbb5f..28e5fcc8b0 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 '<div class="singlebutton forumaddnew">';
-        echo "<form name=\"newdiscussionform\" method=\"get\" action=\"$CFG->wwwroot/mod/forum/post.php\">";
+        echo "<form id=\"newdiscussionform\" method=\"get\" action=\"$CFG->wwwroot/mod/forum/post.php\">";
         echo "<input type=\"hidden\" name=\"forum\" value=\"$forum->id\" />";
         echo '<input type="submit" value="';
         echo ($forum->type == 'news') ? get_string('addanewtopic', 'forum')
@@ -3352,7 +3352,7 @@ function forum_print_discussion($course, $forum, $discussion, $post, $mode, $can
             $ratings->allow = $canrate;
 
             if ($ratings->allow) {
-                echo '<form name="form" method="post" action="rate.php">';
+                echo '<form id="form" method="post" action="rate.php">';
                 echo '<input type="hidden" name="id" value="'.$course->id.'" />';
                 echo '<input type="hidden" name="forumid" value="'.$forum->id.'" />';
             }
diff --git a/mod/forum/prune.html b/mod/forum/prune.html
index da09e93c20..383b3a9b73 100644
--- a/mod/forum/prune.html
+++ b/mod/forum/prune.html
@@ -1,4 +1,4 @@
-<form name="prune" method="get" action="post.php">
+<form id="pruneform" method="get" action="post.php">
 <table border="0" cellpadding="5">
 <tr valign="top">
     <td align="right"><b><?php print_string("discussionname", "forum"); ?>:</b></td>
diff --git a/mod/forum/subscriber.html b/mod/forum/subscriber.html
index 9417bbeb70..3eb59d1a59 100644
--- a/mod/forum/subscriber.html
+++ b/mod/forum/subscriber.html
@@ -1,5 +1,5 @@
 
-<form name="subscriberform" id="subscriberform" method="post" action="subscribers.php">
+<form id="subscriberform" method="post" action="subscribers.php">
 <input type="hidden" name="previoussearch" value="<?php echo $previoussearch ?>" />
 <input type="hidden" name="id" value="<?php echo $id?>" />
   <table align="center" border="0" cellpadding="5" cellspacing="0">
@@ -15,9 +15,9 @@
     <tr>
       <td valign="top">
           <select name="removeselect[]" size="20" id="removeselect" multiple
-                  onFocus="document.subscriberform.add.disabled=true;
-                           document.subscriberform.remove.disabled=false;
-                           document.subscriberform.addselect.selectedIndex=-1;">
+                  onFocus="getElementById('subscriberform').add.disabled=true;
+                           getElementById('subscriberform').remove.disabled=false;
+                           getElementById('subscriberform').addselect.selectedIndex=-1;">
           <?php 
               foreach ($subscribers as $subscriber) {
                   $fullname = fullname($subscriber, true);
@@ -35,9 +35,9 @@
       </td>
       <td valign="top">
           <select name="addselect[]" size="20" id="addselect" multiple
-                  onFocus="document.subscriberform.add.disabled=false;
-                           document.subscriberform.remove.disabled=true;
-                           document.subscriberform.removeselect.selectedIndex=-1;">
+                  onFocus="getElementById('subscriberform').add.disabled=false;
+                           getElementById('subscriberform').remove.disabled=true;
+                           getElementById('subscriberform').removeselect.selectedIndex=-1;">
           <?php
               if (!empty($searchusers)) {
                   echo "<optgroup label=\"$strsearchresults (" . count($searchusers) . ")\">\n";
@@ -57,14 +57,14 @@
          </select>
          <br />
          <input type="text" name="searchtext" size="30" value="<?php echo $searchtext ?>" 
-                  onFocus ="document.subscriberform.add.disabled=true;
-                            document.subscriberform.remove.disabled=true;
-                            document.subscriberform.removeselect.selectedIndex=-1;
-                            document.subscriberform.addselect.selectedIndex=-1;"
+                  onFocus ="getElementById('subscriberform').add.disabled=true;
+                            getElementById('subscriberform').remove.disabled=true;
+                            getElementById('subscriberform').removeselect.selectedIndex=-1;
+                            getElementById('subscriberform').addselect.selectedIndex=-1;"
                   onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
                                if (keyCode == 13) {
-                                    document.subscriberform.previoussearch.value=1;
-                                    document.subscriberform.submit();
+                                    getElementById('subscriberform').previoussearch.value=1;
+                                    getElementById('subscriberform').submit();
                                } " />
          <input name="search" id="search" type="submit" value="<?php p($strsearch) ?>" />
          <?php
diff --git a/mod/glossary/config.html b/mod/glossary/config.html
index 9c539429d0..76ab50342a 100644
--- a/mod/glossary/config.html
+++ b/mod/glossary/config.html
@@ -2,7 +2,7 @@
     $yes = get_string("yes");
     $no  = get_string("no");
 ?>
-<form method="post" action="module.php" name="form">
+<form method="post" action="module.php" id="form">
 <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
 <table cellpadding=9 cellspacing=0 >
diff --git a/mod/glossary/editcategories.html b/mod/glossary/editcategories.html
index 60efd60c29..fc55d27ac7 100644
--- a/mod/glossary/editcategories.html
+++ b/mod/glossary/editcategories.html
@@ -3,7 +3,7 @@
     require_once("../../config.php");
 ?>
 <center>
-<form name="form" method="post" action="editcategories.php">
+<form id="form" method="post" action="editcategories.php">
 <table  class="generalbox" cellpadding="5">
 <tr valign="top">
     <td align="right"><b><?php echo get_string("name") ?>:</b></td>
diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php
index a81114deff..ff8e38cb80 100644
--- a/mod/glossary/editcategories.php
+++ b/mod/glossary/editcategories.php
@@ -106,7 +106,7 @@
                 echo "<p>";
                 print_string("areyousuredelete","glossary");
 ?>
-                <form name="form" method="post" action="editcategories.php">
+                <form id="form" method="post" action="editcategories.php">
 
                 <input type="hidden" name="id"          value="<?php p($cm->id) ?>" />
                 <input type="hidden" name="action"      value="delete" />
@@ -173,7 +173,7 @@
 
 <div align="center">
 
-<form name="theform" method="post" action="editcategories.php">
+<form method="post" action="editcategories.php">
 <table width="40%" class="generalbox" cellpadding="5">
         <tr>
           <td width="90%" align="center"><b>
diff --git a/mod/glossary/formats.php b/mod/glossary/formats.php
index 7820f16765..8033ac1854 100644
--- a/mod/glossary/formats.php
+++ b/mod/glossary/formats.php
@@ -66,7 +66,7 @@
     $yes = get_string("yes");
     $no  = get_string("no");
 
-    echo '<form method="post" action="formats.php" name="form">';
+    echo '<form method="post" action="formats.php" id="form">';
     echo '<table width="90%" align="center" class="generalbox">';
     ?>
     <tr>
diff --git a/mod/glossary/import.html b/mod/glossary/import.html
index bbd5202088..b3864e36fd 100644
--- a/mod/glossary/import.html
+++ b/mod/glossary/import.html
@@ -1,4 +1,4 @@
-<form method="post" action="import.php" name="form" enctype="multipart/form-data">
+<form method="post" action="import.php" enctype="multipart/form-data">
 <table border="0" cellpadding="3" cellspacing="3" width="100%">
 <tr>
     <td align="right" valign="top" width="30%"><b><?php print_string("filetoimport","glossary") ?>:<br />
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index e8dea1308d..88aac4fea9 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -328,7 +328,7 @@
                 $ratings->allow = true;
             }
 
-            echo "<form name=\"form\" method=\"post\" action=\"rate.php\">";
+            echo "<form method=\"post\" action=\"rate.php\">";
             echo "<input type=\"hidden\" name=\"id\" value=\"$course->id\" />";
         }
 
diff --git a/mod/hotpot/config.html b/mod/hotpot/config.html
index a783402612..eb8189edcf 100644
--- a/mod/hotpot/config.html
+++ b/mod/hotpot/config.html
@@ -1,4 +1,4 @@
-<form method="post" action="module.php" name="form">
+<form method="post" action="module.php" id="form">
 <INPUT type="hidden" name="sesskey" value="<?PHP print isset($USER->sesskey) ? $USER->sesskey : '' ?>">
 
 <TABLE cellpadding="9" cellspacing="0">
diff --git a/mod/hotpot/lib.php b/mod/hotpot/lib.php
index e540b9b60d..462207a084 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 = '<form action="'.$CFG->wwwroot.'/mod/hotpot/attempt.php" method="POST" name="'.$form_name.'" '.$CFG->frametarget.'">'.$replace.'</form>';
+            $replace = '<form action="'.$CFG->wwwroot.'/mod/hotpot/attempt.php" method="post" name="'.$form_name.'" '.$CFG->frametarget.'">'.$replace.'</form>';
         }
         if ($center) {
             $replace = '<div style="margin-left:auto; margin-right:auto; text-align: center;">'.$replace.'</div>';
diff --git a/mod/hotpot/report/overview/report.php b/mod/hotpot/report/overview/report.php
index a2bcee5182..f0e87b85a1 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 .= '<form method="post" action="report.php" name="deleteform" onsubmit="'."return deletecheck('".$strdeletecheck."', 'selection')".'">'."\n";
+			$table->start .= '<form method="post" action="report.php" id="deleteform" onsubmit="'."return deletecheck('".$strdeletecheck."', 'selection')".'">'."\n";
 			$table->start .= '<input type="hidden" name="del" value="selection">'."\n";
 			$table->start .= '<input type="hidden" name="id" value="'.$cm->id.'">'."\n";
 			$table->finish = '<center>'."\n";
 			$table->finish .= '<input type="submit" value="'.get_string("deleteselected").'">&nbsp;'."\n";
 			if ($abandoned) {
-				$table->finish .= '<input type=button value="'.get_string('deleteabandoned', 'hotpot').'" onClick="if(deletecheck('."'".addslashes(get_string('deleteabandonedcheck', 'hotpot', $abandoned))."', 'abandoned', true".'))document.deleteform.submit();">'."\n";
+				$table->finish .= '<input type=button value="'.get_string('deleteabandoned', 'hotpot').'" onClick="if(deletecheck('."'".addslashes(get_string('deleteabandonedcheck', 'hotpot', $abandoned))."', 'abandoned', true".')) getElementById(\'deleteform\').submit();">'."\n";
 			}
-			$table->finish .= '<input type=button value="'.get_string("deleteall").'" onClick="if(deletecheck('."'".addslashes($strdeletecheck)."', 'all', true".'))document.deleteform.submit();">'."\n";
+			$table->finish .= '<input type=button value="'.get_string("deleteall").'" onClick="if(deletecheck('."'".addslashes($strdeletecheck)."', 'all', true".'))getElementById(\'deleteform\').submit();">'."\n";
 			$table->finish .= '</center>'."\n";
 			$table->finish .= '</form>'."\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 7ca9bc0d42..8eb89e2160 100644
--- a/mod/hotpot/view.php
+++ b/mod/hotpot/view.php
@@ -75,7 +75,7 @@
                 print_simple_box_end();
                 print "<br />\n";
             }
-            print '<form name="passwordform" method="post" action="view.php?id='.$cm->id.'">'."\n";
+            print '<form id="passwordform" method="post" action="view.php?id='.$cm->id.'">'."\n";
             print_simple_box_start($boxalign, $boxwidth);
             print '<div align="center">';
             print get_string('requirepasswordmessage', 'quiz').'<br /><br />';
diff --git a/mod/journal/edit.html b/mod/journal/edit.html
index 024dcf4195..3f2bc1f4af 100644
--- a/mod/journal/edit.html
+++ b/mod/journal/edit.html
@@ -1,4 +1,4 @@
-<form name="theform" method="post" action="edit.php">
+<form id="theform" method="post" action="edit.php">
 <table cellpadding="10" cellspacing="0" class="generalbox">
   <tr><td align="right">
      <?php
diff --git a/mod/lams/config.html b/mod/lams/config.html
index 435f86c5e6..d2177fc317 100644
--- a/mod/lams/config.html
+++ b/mod/lams/config.html
@@ -1,4 +1,4 @@
-<form method="post" action="module.php" name="form">
+<form method="post" action="module.php" id="form">
 <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
 <table cellpadding="9" cellspacing="0">
diff --git a/mod/lesson/action/addbranchtable.php b/mod/lesson/action/addbranchtable.php
index 3f3fe13fa2..931978344b 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");
     ?>
-    <form name="form" method="post" action="lesson.php">
+    <form id="form" method="post" action="lesson.php">
     <input type="hidden" name="id" value="<?PHP echo $cm->id ?>" />
     <input type="hidden" name="action" value="insertpage" />
     <input type="hidden" name="pageid" value="<?PHP echo $pageid ?>" />
diff --git a/mod/lesson/action/addpage.php b/mod/lesson/action/addpage.php
index 3f7ba74e25..a5d6ec9e48 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");
     ?>
-    <form name="form" method="post" action="lesson.php">
+    <form id="form" method="post" action="lesson.php">
     <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
     <input type="hidden" name="action" value="insertpage" />
     <input type="hidden" name="pageid" value="<?php echo $pageid ?>" />
diff --git a/mod/lesson/action/continue.html b/mod/lesson/action/continue.html
index 59ef293d42..88746acfff 100644
--- a/mod/lesson/action/continue.html
+++ b/mod/lesson/action/continue.html
@@ -38,7 +38,7 @@
 
 <?php if (isset($USER->modattempts[$lesson->id])) { // User is modifying attempts - save button and some instructions ?>
 
-            <form name="endoflesson" method ="post" action="<?php echo $CFG->wwwroot ?>/mod/lesson/view.php">
+            <form id="endoflesson" method ="post" action="<?php echo $CFG->wwwroot ?>/mod/lesson/view.php">
             <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
             <input type="hidden" name="pageid" value="<?php echo LESSON_EOL; ?>" />
     
@@ -60,7 +60,7 @@
 
 <?php if ($lesson->review && !$correctanswer && !$noanswer && !$isessayquestion) { // Review button back ?>
     
-            <form name="reviewback" method ="post" action="<?php echo $CFG->wwwroot ?>/mod/lesson/view.php">
+            <form id="reviewback" method ="post" action="<?php echo $CFG->wwwroot ?>/mod/lesson/view.php">
             <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
             <input type="hidden" name="pageid" value="<?php echo $pageid; ?>" />
     
diff --git a/mod/lesson/action/editpage.php b/mod/lesson/action/editpage.php
index 10efe0ef55..da4f303da0 100644
--- a/mod/lesson/action/editpage.php
+++ b/mod/lesson/action/editpage.php
@@ -53,7 +53,7 @@
     }
     // give teacher a proforma
     ?>
-    <form name="editpage" method="post" action="lesson.php">
+    <form id="editpage" method="post" action="lesson.php">
     <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
     <input type="hidden" name="action" value="updatepage" />
     <input type="hidden" name="pageid" value="<?php echo $pageid ?>" />
@@ -68,7 +68,7 @@
                 echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."<br />";
                 lesson_qtype_menu($LESSON_QUESTION_TYPE, $page->qtype, 
                                   "lesson.php?id=$cm->id&amp;action=editpage&amp;pageid=$page->id",
-                                  "document.editpage.redisplay.value=1;document.editpage.submit();");
+                                  "getElementById('editpage').redisplay.value=1;getElementById('editpage').submit();");
                 echo "<p><b><label for=\"qoption\">".get_string('multianswer', 'lesson').":</label></b> \n";
                 if ($page->qoption) {
                     echo "<input type=\"checkbox\" id=\"qoption\" name=\"qoption\" value=\"1\" checked=\"checked\" />";
@@ -83,7 +83,7 @@
                 echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."<br />";
                 lesson_qtype_menu($LESSON_QUESTION_TYPE, $page->qtype, 
                                   "lesson.php?id=$cm->id&amp;action=editpage&amp;pageid=$page->id",
-                                  "document.editpage.redisplay.value=1;document.editpage.submit();");
+                                  "getElementById('editpage').redisplay.value=1;getElementById('editpage').submit();");
                 echo "<p><b><label for=\"qoption\">".get_string('casesensitive', 'lesson').":</label></b> \n";
                 if ($page->qoption) {
                     echo "<input type=\"checkbox\" id=\"qoption\" name=\"qoption\" value=\"1\" checked=\"checked\" />";
@@ -101,7 +101,7 @@
                 echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."<br />";
                 lesson_qtype_menu($LESSON_QUESTION_TYPE, $page->qtype, 
                                   "lesson.php?id=$cm->id&amp;action=editpage&amp;pageid=$page->id",
-                                  "document.editpage.redisplay.value=1;document.editpage.submit();");
+                                  "getElementById('editpage').redisplay.value=1;getElementById('editpage').submit();");
                 break;
         }
     ?>
@@ -473,7 +473,7 @@
     ?>
     </table><br />
     <input type="button" value="<?php print_string("redisplaypage", "lesson") ?>" 
-        onClick="document.editpage.redisplay.value=1;document.editpage.submit();" />
+        onClick="getElementById('editpage').redisplay.value=1;getElementById('editpage').submit();" />
     <input type="submit" value="<?php  print_string("savepage", "lesson") ?>" />
     <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
     </center>
diff --git a/mod/lesson/essay.php b/mod/lesson/essay.php
index 3a5235d246..6cbbcb9c2c 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 '<div class="grade">
-                  <form name="essaygrade" method="post" action="'.$CFG->wwwroot.'/mod/lesson/essay.php">
+                  <form id="essaygrade" method="post" action="'.$CFG->wwwroot.'/mod/lesson/essay.php">
                   <input type="hidden" name="id" value="'.$cm->id.'" />
                   <input type="hidden" name="mode" value="update" />
                   <input type="hidden" name="attemptid" value="'.$attemptid.'" />
diff --git a/mod/lesson/highscores.php b/mod/lesson/highscores.php
index 5a7c4e7ed6..fc85a60429 100644
--- a/mod/lesson/highscores.php
+++ b/mod/lesson/highscores.php
@@ -139,7 +139,7 @@
         case 'add':
             print_simple_box_start('center');
             echo '<div align="center">
-                 <form name="nickname" method ="post" action="'.$CFG->wwwroot.'/mod/lesson/highscores.php">
+                 <form id="nickname" method ="post" action="'.$CFG->wwwroot.'/mod/lesson/highscores.php">
                  <input type="hidden" name="id" value="'.$cm->id.'" />
                  <input type="hidden" name="mode" value="save" />
                  <input type="hidden" name="sesskey" value="'.sesskey().'" />';
diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php
index 1cad858c56..bdc744eb03 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 "<form name=\"theform\" enctype=\"multipart/form-data\" method=\"post\">";
+    echo "<form id=\"theform\" enctype=\"multipart/form-data\" method=\"post\">";
     echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n";
     echo "<input type=\"hidden\" name=\"pageid\" value=\"$pageid\" />\n";
     echo "<table cellpadding=\"5\">";
diff --git a/mod/lesson/report.php b/mod/lesson/report.php
index e41b9b7a1c..0f3543af35 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  "<form id=\"theform\" name=\"theform\" method=\"post\" action=\"report.php\">\n
+            echo  "<form id=\"theform\" method=\"post\" action=\"report.php\">\n
                    <input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />\n
                    <input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n
                    <input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n";
diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index fe94dc6cab..217219b797 100644
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -61,7 +61,7 @@
                 lesson_print_header($cm, $course, $lesson);
                 echo "<div class=\"password-form\">\n";
                 print_simple_box_start('center');
-                echo '<form name="password" method="post" action="'.$CFG->wwwroot.'/mod/lesson/view.php">' . "\n";
+                echo '<form id="password" method="post" action="'.$CFG->wwwroot.'/mod/lesson/view.php">' . "\n";
                 echo '<input type="hidden" name="id" value="'. $cm->id .'" />' . "\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 "<form name=\"answerform\" method =\"post\" action=\"lesson.php\">";
+            echo "<form id=\"answerform\" method =\"post\" action=\"lesson.php\">";
             echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />";
             echo "<input type=\"hidden\" name=\"action\" value=\"continue\" />";
             echo "<input type=\"hidden\" name=\"pageid\" value=\"$pageid\" />";
@@ -685,7 +685,7 @@
                             $class = 'standardbutton';
                         }
                         // Each button must have its own form inorder for it to work with JavaScript turned off
-                        $button  = "<form name=\"answerform$i\" method=\"post\" action=\"$CFG->wwwroot/mod/lesson/lesson.php\">\n".
+                        $button  = "<form id=\"answerform$i\" method=\"post\" action=\"$CFG->wwwroot/mod/lesson/lesson.php\">\n".
                                    "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n".
                                    "<input type=\"hidden\" name=\"action\" value=\"continue\" />\n".
                                    "<input type=\"hidden\" name=\"pageid\" value=\"$pageid\" />\n".
@@ -747,7 +747,7 @@
             echo "</form>\n"; 
         } else {
             // a page without answers - find the next (logical) page
-            echo "<form name=\"pageform\" method =\"post\" action=\"$CFG->wwwroot/mod/lesson/view.php\">\n";
+            echo "<form id=\"pageform\" method =\"post\" action=\"$CFG->wwwroot/mod/lesson/view.php\">\n";
             echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n";
             if ($lesson->nextpagedefault) {
                 // in Flash Card mode...
diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
index d9c2966fb6..90a40bf0af 100644
--- a/mod/quiz/attempt.php
+++ b/mod/quiz/attempt.php
@@ -140,7 +140,7 @@
             }
             echo "<br />\n";
 
-            echo "<form name=\"passwordform\" method=\"post\" action=\"attempt.php?id=$cm->id\" autocomplete=\"off\">\n";
+            echo "<form id=\"passwordform\" method=\"post\" action=\"attempt.php?id=$cm->id\" autocomplete=\"off\">\n";
             print_simple_box_start("center");
 
             echo "<div align=\"center\">\n";
@@ -472,7 +472,7 @@
         ?>
         <script type="text/javascript">
         //<![CDATA[
-            document.write("<form name=\"responseform\" id=\"responseform\" method=\"post\" action=\"attempt.php\" autocomplete=\"off\">\n");
+            document.write("<form id=\"responseform\" method=\"post\" action=\"attempt.php\" autocomplete=\"off\">\n");
         //]]>
         </script>
         <noscript>
@@ -480,7 +480,7 @@
         </noscript>
         <?php
     } else {
-        echo "<form name=\"responseform\" id=\"responseform\" method=\"post\" action=\"attempt.php\" autocomplete=\"off\">\n";
+        echo "<form id=\"responseform\" method=\"post\" action=\"attempt.php\" autocomplete=\"off\">\n";
     }
 
     // Add a hidden field with the quiz id
@@ -493,7 +493,7 @@
         <script type="text/javascript">
         //<![CDATA[
         function navigate(page) {
-            var ourForm = document.forms['responseform']; 
+            var ourForm = getElementById('responseform'); 
             ourForm.page.value=page;
             if (ourForm.onsubmit) {
                 ourForm.onsubmit();
diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index f4a4069980..5cfc20dc10 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -313,14 +313,14 @@ function quiz_print_question_list($quiz, $allowdelete=true, $showbreaks=true, $r
     echo "</form>\n";
 
 /// Form to choose to show pagebreaks and to repaginate quiz
-    echo '<form method="post" action="edit.php" name="showbreaks">';
+    echo '<form method="post" action="edit.php" id="showbreaks">';
     echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
     echo '<input type="hidden" name="showbreaks" value="0" />';
     echo '<input type="checkbox" name="showbreaks" value="1"';
     if ($showbreaks) {
         echo ' checked="checked"';
     }
-    echo ' onchange="document.showbreaks.submit(); return true;" />';
+    echo ' onchange="getElementById(\'showbreaks\').submit(); return true;" />';
     print_string('showbreaks', 'quiz');
 
     if ($showbreaks) {
@@ -339,7 +339,7 @@ function quiz_print_question_list($quiz, $allowdelete=true, $showbreaks=true, $r
     if ($reordertool) {
         echo ' checked="checked"';
     }
-    echo ' onchange="document.showbreaks.submit(); return true;" />';
+    echo ' onchange="getElementById(\'showbreaks\').submit(); return true;" />';
     print_string('reordertool', 'quiz');
     echo ' ';
     helpbutton('reorderingtool', get_string('reorderingtool', 'quiz'), 'quiz');
diff --git a/mod/quiz/jstimer.php b/mod/quiz/jstimer.php
index ffb6e2b50e..942fe8f7b9 100644
--- a/mod/quiz/jstimer.php
+++ b/mod/quiz/jstimer.php
@@ -32,7 +32,7 @@ var ec_quiz_finish = ec_page_start + <?php echo ($timerstartvalue * 1000); ?>;
     </tr>
     <tr>
         <td id="QuizTimer" class="generaltablecell" align="center" width="100%">
-        <form name="clock"><input onfocus="blur()" type="text" name="time"
+        <form id="clock"><input onfocus="blur()" type="text" id="time"
         style="background-color: transparent; border: none; width: 70%; font-family: sans-serif; font-size: 14pt; font-weight: bold; text-align: center;" />
         </form>
         </td>
diff --git a/mod/quiz/report/analysis/report.php b/mod/quiz/report/analysis/report.php
index be0b52d771..a093a3c15f 100644
--- a/mod/quiz/report/analysis/report.php
+++ b/mod/quiz/report/analysis/report.php
@@ -357,7 +357,7 @@ class quiz_report extends quiz_default_report {
     function print_options_form($quiz, $cm, $attempts, $lowlimit=0, $pagesize=10) {
         global $CFG, $USER;
         echo '<div class="controls">';
-        echo '<form id="options" name="options" action="report.php" method="post">';
+        echo '<form id="options" action="report.php" method="post">';
         echo '<p class="quiz-report-options">'.get_string('analysisoptions', 'quiz').': </p>';
         echo '<input type="hidden" name="id" value="'.$cm->id.'" />';
         echo '<input type="hidden" name="q" value="'.$quiz->id.'" />';
diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index 58e21fbcc3..777db51f7f 100644
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -562,7 +562,7 @@ class quiz_report extends quiz_default_report {
         }
         // Print display options
         echo '<div class="controls">';
-        echo '<form id="options" name="options" action="report.php" method="post">';
+        echo '<form id="options" action="report.php" method="post">';
         echo '<p>'.get_string('displayoptions', 'quiz').': </p>';
         echo '<input type="hidden" name="id" value="'.$cm->id.'" />';
         echo '<input type="hidden" name="q" value="'.$quiz->id.'" />';
diff --git a/mod/scorm/config.html b/mod/scorm/config.html
index 423c52398c..4504904a5c 100755
--- a/mod/scorm/config.html
+++ b/mod/scorm/config.html
@@ -7,7 +7,7 @@
     }
 ?>
 
-<form method="post" action="module.php" name="form">
+<form method="post" action="module.php" id="form">
 <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
 <table cellpadding="9" cellspacing="0" >
diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index ba4eba024d..3ff3bd3bf4 100755
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -534,7 +534,7 @@ function scorm_view_display ($user, $scorm, $action, $cm, $boxwidth='') {
  ?>
             <div class='center'>
                 <?php print_string('organizations','scorm') ?>
-                <form name='changeorg' method='post' action='<?php echo $action ?>'>
+                <form id='changeorg' method='post' action='<?php echo $action ?>'>
                     <?php choose_from_menu($orgs, 'organization', "$organization", '','submit()') ?>
                 </form>
             </div>
@@ -561,7 +561,7 @@ function scorm_view_display ($user, $scorm, $action, $cm, $boxwidth='') {
     print_simple_box_end();
 ?>
             <div class="center">
-                <form name="theform" method="post" action="<?php echo $CFG->wwwroot ?>/mod/scorm/player.php?id=<?php echo $cm->id ?>"<?php echo $scorm->popup == 1?' target="newwin"':'' ?>>
+                <form id="theform" method="post" action="<?php echo $CFG->wwwroot ?>/mod/scorm/player.php?id=<?php echo $cm->id ?>"<?php echo $scorm->popup == 1?' target="newwin"':'' ?>>
               <?php
                   if ($scorm->hidebrowse == 0) {
                       print_string("mode","scorm");
diff --git a/mod/survey/mod.html b/mod/survey/mod.html
index 94cb351a0c..9fffc9efd8 100644
--- a/mod/survey/mod.html
+++ b/mod/survey/mod.html
@@ -11,7 +11,7 @@
     $nohtmleditorneeded = true;
 ?>
 
-<form name="form" method="post" action="../mod/survey/details.php">
+<form id="form" method="post" action="../mod/survey/details.php">
 <table cellpadding="5">
 <tr valign="top">
     <td align="right"><b><?php  print_string("surveyname", "survey") ?>:</b></td>
diff --git a/mod/survey/report.php b/mod/survey/report.php
index f5ff99419e..21f5056dc0 100644
--- a/mod/survey/report.php
+++ b/mod/survey/report.php
@@ -394,7 +394,7 @@
          }
          echo "<hr noshade=\"noshade\" size=\"1\" />";
          echo "<center>";
-         echo "<form action=\"report.php\" method=\"post\" name=\"form\">";
+         echo "<form action=\"report.php\" method=\"post\">";
          echo "<h3>$strnotes:</h3>";
          echo "<blockquote>";
          echo "<textarea name=\"notes\" rows=\"10\" cols=\"60\">";
diff --git a/mod/survey/view.php b/mod/survey/view.php
index cd0c93b58d..910c6fc575 100644
--- a/mod/survey/view.php
+++ b/mod/survey/view.php
@@ -103,7 +103,7 @@
 //  Start the survey form
     add_to_log($course->id, "survey", "view form", "view.php?id=$cm->id", $survey->id, $cm->id);
 
-    echo "<form name=\"form\" method=\"post\" action=\"save.php\">";
+    echo "<form method=\"post\" action=\"save.php\">";
     echo "<input type=\"hidden\" name=\"id\" value=\"$id\" />";
 
     print_simple_box(format_text($survey->intro), 'center', '70%', '', 5, 'generalbox', 'intro');
diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php
index 5e5b7e2bca..710baf935e 100644
--- a/mod/wiki/admin.php
+++ b/mod/wiki/admin.php
@@ -268,7 +268,7 @@
         }
         echo '<tr><td colspan="2">';
 
-        echo '<form name="otherwikis" action="'.$CFG->wwwroot.'/mod/wiki/admin.php">';
+        echo '<form id="otherwikis" action="'.$CFG->wwwroot.'/mod/wiki/admin.php">';
         echo '<table border="0" cellpadding="0" cellspacing="0" width="100%"><tr>';
         echo '<td class="sideblockheading">&nbsp;'
             .$WIKI_TYPES[$wiki->wtype].' '
@@ -277,7 +277,7 @@
 
         echo '<td class="sideblockheading" align="right">'
             .get_string('otherwikis', 'wiki').':&nbsp;&nbsp;';
-        $script = 'self.location=document.otherwikis.wikiselect.options[document.otherwikis.wikiselect.selectedIndex].value';
+        $script = 'self.location=getElementById(\'otherwikis\').wikiselect.options[getElementById(\'otherwikis\').wikiselect.selectedIndex].value';
 
         /// Add Admin-Action
         reset($wiki_list);
diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index 6f54b6562c..5b0f303842 100644
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -1087,7 +1087,7 @@ function wiki_get_owner(&$wiki_entry) {
 function wiki_print_search_form($cmid, $search="", $userid, $groupid, $return=false) {
     global $CFG;
     # TODO: Add Group and User !!!
-    $output = "<form name=\"search\" action=\"$CFG->wwwroot/mod/wiki/view.php\">";
+    $output = "<form id=\"search\" action=\"$CFG->wwwroot/mod/wiki/view.php\">";
     $output .= "<font size=\"-1\">";
     $output .= "<input value=\"".get_string("searchwiki", "wiki").":\" type=\"submit\" />";
     $output .= "<input name=\"id\" type=\"hidden\" value=\"$cmid\" />";
diff --git a/mod/wiki/mod.html b/mod/wiki/mod.html
index 55d049724a..a9000ba34f 100644
--- a/mod/wiki/mod.html
+++ b/mod/wiki/mod.html
@@ -60,7 +60,7 @@
     }
 ?>
 
-<form name="form" method="post" action="mod.php">
+<form id="form" method="post" action="mod.php">
 <center>
 <table cellpadding="5">
 <tr valign="top">
diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index ec49059fac..0be2571796 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -300,7 +300,7 @@
         }
         echo '<tr><td colspan="2">';
 
-        echo '<form name="otherwikis" action="'.$CFG->wwwroot.'/mod/wiki/view.php">';
+        echo '<form id="otherwikis" action="'.$CFG->wwwroot.'/mod/wiki/view.php">';
         echo '<table border="0" cellpadding="0" cellspacing="0" width="100%"><tr>';
         echo '<td class="sideblockheading">&nbsp;'
             .$WIKI_TYPES[$wiki->wtype].' '
@@ -309,7 +309,7 @@
 
         echo '<td class="sideblockheading" align="right">'
             .get_string('otherwikis', 'wiki').':&nbsp;&nbsp;';
-        $script = 'self.location=document.otherwikis.wikiselect.options[document.otherwikis.wikiselect.selectedIndex].value';
+        $script = 'self.location=getElementById(\'otherwikis\').wikiselect.options[getElementById(\'otherwikis\').wikiselect.selectedIndex].value';
         choose_from_menu($wiki_list, "wikiselect", $selected, "choose", $script);
         echo '</td>';
         echo '</tr></table>';
diff --git a/mod/workshop/assessment_grading_form.html b/mod/workshop/assessment_grading_form.html
index dc9546fd66..b8d5f7e3d7 100644
--- a/mod/workshop/assessment_grading_form.html
+++ b/mod/workshop/assessment_grading_form.html
@@ -3,7 +3,7 @@
         $assessment->teachercomment = '';
     }
 ?>
-<form name="gradingform" action="assessments.php" method="post">
+<form id="gradingform" action="assessments.php" method="post">
   <input type="hidden" name="action" value="updategrading" />
   <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
   <input type="hidden" name="redirect" value="<?php echo $redirect ?>" />
diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php
index 3bc78c2340..ca674fc5ba 100644
--- a/mod/workshop/assessments.php
+++ b/mod/workshop/assessments.php
@@ -93,7 +93,7 @@
             error("Submission not found");
         }
         ?>
-        <form name="commentform" action="assessments.php" method="post">
+        <form id="commentform" action="assessments.php" method="post">
         <input type="hidden" name="action" value="insertcomment" />
         <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
         <input type="hidden" name="aid" value="<?php echo $aid ?>" />
diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php
index 4a9a134b9d..f2cd55f03f 100644
--- a/mod/workshop/locallib.php
+++ b/mod/workshop/locallib.php
@@ -2048,7 +2048,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
     // now print the grading form with the grading grade if any
     // FORM is needed for Mozilla browsers, else radio bttons are not checked
         ?>
-    <form name="assessmentform" method="post" action="assessments.php">
+    <form id="assessmentform" method="post" action="assessments.php">
     <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
     <input type="hidden" name="aid" value="<?php echo $assessment->id ?>" />
     <input type="hidden" name="action" value="updateassessment" />
diff --git a/mod/workshop/mod.html b/mod/workshop/mod.html
index 1fbedee619..0137ac879e 100644
--- a/mod/workshop/mod.html
+++ b/mod/workshop/mod.html
@@ -83,7 +83,7 @@
     }
 ?>
 
-<form name="form" method="post" action="mod.php">
+<form id="form" method="post" action="mod.php">
 <table cellpadding="5">
 <tr valign="top">
     <td align="right"><b><?php  print_string("title", "workshop") ?>:</b></td>
diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php
index cf842c9324..f324209a34 100644
--- a/mod/workshop/submissions.php
+++ b/mod/workshop/submissions.php
@@ -73,7 +73,7 @@
         $submission = get_record("workshop_submissions", "id", $sid);
         print_heading(get_string("amendtitle", "workshop"));
         ?>
-        <form name="amendtitleform" action="submissions.php" method="post">
+        <form id="amendtitleform" action="submissions.php" method="post">
         <input type="hidden" name="action" value="adminupdatetitle" />
         <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
         <input type="hidden" name="sid" value="<?php echo $sid ?>" />
diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index 42ea478b7a..57359e0469 100644
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -155,7 +155,7 @@
 
             if (!$correctpass) {
                 print_simple_box_start("center");
-                echo "<form name=\"password\" method=\"post\" action=\"view.php\">\n";
+                echo "<form id=\"password\" method=\"post\" action=\"view.php\">\n";
                 echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n";
                 echo "<table cellpadding=\"7px\">";
                 if (isset($_POST['userpassword'])) {
diff --git a/search/query.php b/search/query.php
index 6667201e90..a24db4c3fa 100644
--- a/search/query.php
+++ b/search/query.php
@@ -150,7 +150,7 @@
   }
 ?>
 
-<form name="query" method="get" action="query.php">
+<form id="query" method="get" action="query.php">
   <?php if (!$advanced) { ?>
     <input type="text" name="query_string" length="50" value="<?php print stripslashes(htmlentities($query_string)) ?>" />
     &nbsp;<input type="submit" value="Search" /> &nbsp;
diff --git a/sso/hive/expired.php b/sso/hive/expired.php
index af4c20105f..ef0d9b3145 100644
--- a/sso/hive/expired.php
+++ b/sso/hive/expired.php
@@ -12,7 +12,7 @@
     print_header();
     notify('Your session has expired. Please log in again.'); 
 ?>
-      <form action="login.php" method="post" name="login" id="login">
+      <form action="login.php" method="post" id="login">
         <table border="0" align="center">
         <tr>
           <td width="80%">
diff --git a/user/edit.html b/user/edit.html
index 4b9fc4ae56..b0679213f2 100644
--- a/user/edit.html
+++ b/user/edit.html
@@ -22,7 +22,7 @@
     }
 ?>
 
-<form method="post" name="form" enctype="multipart/form-data" action="edit.php">
+<form method="post" name="editform" enctype="multipart/form-data" action="edit.php">
 <table class="formtable">
 <?php
 if (has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
diff --git a/user/edit.php b/user/edit.php
index e38fb92dcb..04df9fcd93 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -385,7 +385,7 @@
             if (isset($authplugin->config->{$configvariable})) {
                 if ( $authplugin->config->{$configvariable} === 'locked'
                     or ($authplugin->config->{$configvariable} === 'unlockedifempty' and !empty($user->$field))) {
-                   echo "eval('document.form.$field.disabled=true');\n";
+                   echo "eval('getElementById('editform').$field.disabled=true');\n";
                 }
             }
         }
diff --git a/user/extendenrol.php b/user/extendenrol.php
index 8aa6046555..304922264f 100644
--- a/user/extendenrol.php
+++ b/user/extendenrol.php
@@ -56,7 +56,7 @@ for ($i=1; $i<=365; $i++) {
 }
 
 print_heading(get_string('extendenrol'));
-echo "<form method=\"post\" action=\"extendenrol.php\" name=\"form\">\n";
+echo "<form method=\"post\" action=\"extendenrol.php\">\n";
 echo '<input type="hidden" name="id" value="'.$course->id.'" />';
 echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
 $table->head  = array (get_string('fullname'), get_string('enrolmentstart'), get_string('enrolmentend'), get_string('extendperiod'));
diff --git a/user/index.php b/user/index.php
index f37eccdf41..5b4487f969 100644
--- a/user/index.php
+++ b/user/index.php
@@ -458,7 +458,7 @@
         //]]>
         </script>
             ';
-        echo '<form action="action_redir.php" method="post" name="participantsform" onSubmit="return checksubmit(this);">';
+        echo '<form action="action_redir.php" method="post" id="participantsform" onSubmit="return checksubmit(this);">';
         echo '<input type="hidden" name="returnto" value="'.$_SERVER['REQUEST_URI'].'" />';
         echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
     }
diff --git a/user/message.html b/user/message.html
index ca3619c120..b56eb4de08 100644
--- a/user/message.html
+++ b/user/message.html
@@ -1,4 +1,4 @@
-<form name="theform" method="post" action="messageselect.php">
+<form id="theform" method="post" action="messageselect.php">
 <input type="hidden" name="id" value="<?php p($id) ?>" />
 <input type="hidden" name="returnto" value="<?php p($returnto) ?>" />
 <input type="hidden" name="deluser" value="" />