From 6e8d663f667d817f354adc62f747aca0959dabdc Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Tue, 31 Aug 2004 09:18:43 +0000
Subject: [PATCH] Merged from stable

---
 login/confirm.php                                         | 4 ++--
 mod/quiz/questiontypes/datasetdependent/abstractqtype.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/login/confirm.php b/login/confirm.php
index cbc3e391bc..b3461cec9d 100644
--- a/login/confirm.php
+++ b/login/confirm.php
@@ -5,7 +5,7 @@
 
     if (isset($_GET['p']) and isset($_GET['s']) ) {     #  p = user.secret   s = user.username
 
-        $user = get_user_info_from_db("username", "$s");
+        $user = get_user_info_from_db("username", $_GET['s']);
 
         if (!empty($user)) {
 
@@ -18,7 +18,7 @@
                 exit;
             }
 
-            if ($user->secret == $p) {   // They have provided the secret key to get in
+            if ($user->secret == $_GET['p']) {   // They have provided the secret key to get in
 
                 if (!set_field("user", "confirmed", 1, "id", $user->id)) {
                     error("Could not confirm this user!");
diff --git a/mod/quiz/questiontypes/datasetdependent/abstractqtype.php b/mod/quiz/questiontypes/datasetdependent/abstractqtype.php
index a1aaa821ff..662b8be8fb 100644
--- a/mod/quiz/questiontypes/datasetdependent/abstractqtype.php
+++ b/mod/quiz/questiontypes/datasetdependent/abstractqtype.php
@@ -403,7 +403,7 @@ class quiz_dataset_dependent_questiontype extends quiz_default_questiontype {
     function create_virtual_nameprefix($nameprefix, $datasetinput) {
     // This default implementation is sometimes overridden
         if (!ereg('([0-9]+)' . $this->name() . '$', $nameprefix, $regs)) {
-            error("Malformed nameprefix $nameprefix");
+            error("Wrongly formatted nameprefix $nameprefix");
         }
         $virtualqtype = $this->get_virtual_qtype();
         return $nameprefix . $regs[1] . $virtualqtype->name();
@@ -412,7 +412,7 @@ class quiz_dataset_dependent_questiontype extends quiz_default_questiontype {
     function extract_response($rawresponse, $nameprefix) {
         if (!ereg('^dataset([;:0-9A-Za-z+/=]+)-(.*)$',
                 $rawresponse->answer, $regs)) {
-            error ("Malformated raw response answer $rawresponse->answer");
+            error ("Wrongly formatted raw response answer $rawresponse->answer");
         }
         
         // Truncate raw response to fit the virtual qtype
-- 
2.39.5