From ab0a8ff22cd5e50a500dc06a64633b67e4114618 Mon Sep 17 00:00:00 2001
From: tjhunt <tjhunt>
Date: Fri, 27 Apr 2007 08:33:11 +0000
Subject: [PATCH] MDL-9608 - Work around Firefox putting the user's password in
 the quiz password field. Merged from MOODLE_18_STABLE.

---
 mod/quiz/lib.php      |  5 +++++
 mod/quiz/mod_form.php | 17 ++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index f9aba2922b..cbdf9bf109 100644
--- 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 b273451d12..a7122f9cd7 100644
--- 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){
-- 
2.39.5