MDL-9608 - Work around Firefox putting the user's password in the quiz password field...

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index f9aba2922b697d89cfba9c22c829da87d96ad014..cbdf9bf109c710ff5895d1186bb81ed5c64507b7 100644 (file)
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -485,6 +485,11 @@ function quiz_process_options(&$quiz) {
     }
     $quiz->timelimit = round($quiz->timelimit);
 
+    // Password field - different in form to stop browsers that remember passwords
+    // getting confused.
+    $quiz->password = $quiz->quizpassword;
+    unset($quiz->quizpassword);
+
     // Quiz feedback
     if (isset($quiz->feedbacktext)) {
         // Clean up the boundary text.

diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
index b273451d123fce8b9c3b9f0aadf6e985921cf99b..a7122f9cd7db94da8d6890ed342d0210058d6c1c 100644 (file)
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -191,11 +191,11 @@ class mod_quiz_mod_form extends moodleform_mod {
                $mform->setAdvanced('popup', $CFG->quiz_fix_popup);
         $mform->setDefault('popup', $CFG->quiz_popup);
 
-        $mform->addElement('passwordreveal', 'password', get_string("requirepassword", "quiz"));
-               $mform->setType('password', PARAM_TEXT);
-               $mform->setHelpButton('password', array("requirepassword", get_string("requirepassword", "quiz"), "quiz"));
-               $mform->setAdvanced('password', $CFG->quiz_fix_password);
-        $mform->setDefault('password', $CFG->quiz_password);
+        $mform->addElement('passwordreveal', 'quizpassword', get_string("requirepassword", "quiz"));
+               $mform->setType('quizpassword', PARAM_TEXT);
+               $mform->setHelpButton('quizpassword', array("requirepassword", get_string("requirepassword", "quiz"), "quiz"));
+               $mform->setAdvanced('quizpassword', $CFG->quiz_fix_password);
+        $mform->setDefault('quizpassword', $CFG->quiz_password);
 
                $mform->addElement('text', 'subnet', get_string("requiresubnet", "quiz"));
                $mform->setType('subnet', PARAM_TEXT);
@@ -285,6 +285,13 @@ class mod_quiz_mod_form extends moodleform_mod {
             $default_values['adaptive'] = $default_values['optionflags'] & QUESTION_ADAPTIVE;
             unset($default_values['optionflags']);
         }
+
+        // Password field - different in form to stop browsers that remember passwords
+        // getting confused.
+               if (isset($default_values['password'])) {
+            $default_values['quizpassword'] = $default_values['password'];
+            unset($default_values['password']);
+        }
        }
 
        function validation($data){