From: moodler <moodler>
Date: Fri, 24 Jan 2003 07:48:54 +0000 (+0000)
Subject: Robustness fixes
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=54d0590b47901299514ffa41e23a7f648be7344d;p=moodle.git

Robustness fixes
---

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 5a68d45a03..f2ea641bb8 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -969,7 +969,7 @@ function quiz_save_attempt($quiz, $questions, $result, $attemptnum) {
         $response->attempt = $attempt->id;
         $response->question = $question->id;
         $response->grade = $result->grades[$question->id];
-        if ($question->answer) {
+        if (!empty($question->answer)) {
             $response->answer = implode(",",$question->answer);
         } else {
             $response->answer = "";
@@ -1064,7 +1064,7 @@ function quiz_grade_attempt_results($quiz, $questions) {
                     if ($answer->fraction > 0) {
                         $correct[$answer->id] = true;
                     }
-                    if ($question->answer) {
+                    if (!empty($question->answer)) {
                         foreach ($question->answer as $questionanswer) {
                             if ($questionanswer == $answer->id) {
                                 if ($answer->single) {
diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html
index 139311f5c2..ed70d9b5a9 100644
--- a/mod/quiz/mod.html
+++ b/mod/quiz/mod.html
@@ -17,7 +17,7 @@
         $form->timeclose = "";
     }
     if (empty($form->attempts)) {
-        $form->attempts = "";
+        $form->attempts = "0";
     }
     if (empty($form->grademethod)) {
         $form->grademethod = "";
diff --git a/mod/quiz/multichoice.html b/mod/quiz/multichoice.html
index 9a1bc4b455..0b95a1409b 100644
--- a/mod/quiz/multichoice.html
+++ b/mod/quiz/multichoice.html
@@ -29,7 +29,7 @@
 <TR valign=top>
     <TD align=right><P><B><? print_string("imagedisplay", "quiz") ?>:</B></P></TD>
     <TD>
-    <?  if (!$images) {
+    <?  if (empty($images)) {
             print_string("noimagesyet");
         } else {
             choose_from_menu($images, "image", "$question->image", get_string("none"),"","");
diff --git a/mod/quiz/question.php b/mod/quiz/question.php
index 75ddc40fc7..1732c2ddba 100644
--- a/mod/quiz/question.php
+++ b/mod/quiz/question.php
@@ -99,7 +99,11 @@
         // First, save the basic question itself
         $question->name         = $form->name;
         $question->questiontext = $form->questiontext;
-        $question->image        = $form->image;
+        if (empty($form->image)) {
+            $question->image = "";
+        } else {
+            $question->image = $form->image;
+        }
         $question->category     = $form->category;
 
         if (!$err = formcheck($question)) {
@@ -127,7 +131,7 @@
     
                     // Insert all the new answers
                     foreach ($form->answer as $key => $formanswer) {
-                        if ($formanswer) {
+                        if ($formanswer != "") {
                             unset($answer);
                             $answer->answer   = $formanswer;
                             $answer->question = $question->id;
@@ -198,7 +202,7 @@
     
                     // Insert all the new answers
                     foreach ($form->answer as $key => $formanswer) {
-                        if ($formanswer) {
+                        if ($formanswer != "") {
                             unset($answer);
                             $answer->answer   = $formanswer;
                             $answer->question = $question->id;
diff --git a/mod/quiz/shortanswer.html b/mod/quiz/shortanswer.html
index 063b883cfe..03fcd78160 100644
--- a/mod/quiz/shortanswer.html
+++ b/mod/quiz/shortanswer.html
@@ -29,7 +29,7 @@
 <TR valign=top>
     <TD align=right><P><B><? print_string("imagedisplay", "quiz") ?>:</B></P></TD>
     <TD>
-    <?  if (!$images) {
+    <?  if (empty($images)) {
             print_string("noimagesyet");
         } else {
             choose_from_menu($images, "image", "$question->image", get_string("none"),"","");
diff --git a/mod/quiz/truefalse.html b/mod/quiz/truefalse.html
index bc43738288..cf87b47feb 100644
--- a/mod/quiz/truefalse.html
+++ b/mod/quiz/truefalse.html
@@ -29,7 +29,7 @@
 <TR valign=top>
     <TD align=right><P><B><? print_string("imagedisplay", "quiz") ?>:</B></P></TD>
     <TD>
-    <?  if (!$images) {
+    <?  if (empty($images)) {
             print_string("noimagesyet");
         } else {
             choose_from_menu($images, "image", "$question->image", get_string("none"),"","");