HotPot module: differentiate between "guesses-correct" (JCloze) and "guess-correct...

diff --git a/mod/hotpot/template/v6.php b/mod/hotpot/template/v6.php
index f77cf72a1fea8155127cebfbd9546b2da4b971d1..114821319c9845aa0dc684ac31cb73f2040eb8bf 100644 (file)
--- a/mod/hotpot/template/v6.php
+++ b/mod/hotpot/template/v6.php
@@ -227,7 +227,7 @@ class hotpot_xml_quiz_template extends hotpot_xml_template_default {
             }
 
             // convert to comma delimited string
-            $this->PreloadImageList = empty($list) ? '' : "'".implode(',', $list)."'";
+            $this->PreloadImageList = empty($list) ? '' : "'".implode("','", $list)."'";
         }
         return $this->PreloadImageList;
     }
@@ -1064,10 +1064,20 @@ class hotpot_xml_quiz_template extends hotpot_xml_template_default {
         }
     }
     function v6_expand_Correct() {
-        return $this->js_value('hotpot-config-file,'.$this->parent->quiztype.',guesses-correct');
+        if ($this->parent->quiztype=='jcloze') {
+            $tag = 'guesses-correct';
+        } else {
+            $tag = 'guess-correct';
+        }
+        return $this->js_value('hotpot-config-file,'.$this->parent->quiztype.','.$tag);
     }
     function v6_expand_Incorrect() {
-        return $this->js_value('hotpot-config-file,'.$this->parent->quiztype.',guesses-incorrect');
+        if ($this->parent->quiztype=='jcloze') {
+            $tag = 'guesses-incorrect';
+        } else {
+            $tag = 'guess-incorrect';
+        }
+        return $this->js_value('hotpot-config-file,'.$this->parent->quiztype.','.$tag);
     }
     function v6_expand_GiveHint() {
         return $this->js_value('hotpot-config-file,'.$this->parent->quiztype.',next-correct-letter');