Merged from stable

diff --git a/login/confirm.php b/login/confirm.php
index cbc3e391bc0c4a6490034babce8bd889993eac90..b3461cec9dfd6d8e30da368594bce78caae73994 100644 (file)
--- 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 a1aaa821ff5ac369c57fff2b2823274f98fb3787..662b8be8fbb1a8d97f4d86fd5e0bd110a74baad7 100644 (file)
--- 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