Moodle import - fix multiple/unique question import BT#18172

main/inc/lib/MoodleImport.php

@@ -267,14 +267,9 @@ class MoodleImport
                         $questionsValues = $this->readMainQuestionsXml($questionsXml, $question['questionid']);
                         $moduleValues['question_instances'][$index] = $questionsValues;
                         // Set Question Type from Moodle XML element <qtype>
-                        $qType = $moduleValues['question_instances'][$index]['qtype'];
-                        // Add the matched chamilo question type to the array
-                        $moduleValues['question_instances'][$index]['chamilo_qtype'] =
-                            $this->matchMoodleChamiloQuestionTypes($qType);
-                        $questionInstance = Question::getInstance(
-                            $moduleValues['question_instances'][$index]['chamilo_qtype']
-                        );
-
+                        $qType = $questionsValues['qtype'];
+                        $questionType = $this->matchMoodleChamiloQuestionTypes($questionsValues);
+                        $questionInstance = Question::getInstance($questionType);
                         if (empty($questionInstance)) {
                             continue;
                         }
@@ -282,8 +277,8 @@ class MoodleImport
                             error_log('question: '.$question['questionid']);
                         }
 
-                        $questionInstance->updateTitle($moduleValues['question_instances'][$index]['name']);
-                        $questionText = $moduleValues['question_instances'][$index]['questiontext'];
+                        $questionInstance->updateTitle($questionsValues['name']);
+                        $questionText = $questionsValues['questiontext'];
 
                         // Replace the path from @@PLUGINFILE@@ to a correct chamilo path
                         $questionText = str_replace(
@@ -608,7 +603,7 @@ class MoodleImport
             $questionType = '';
             foreach ($question->childNodes as $item) {
                 $currentItem[$item->nodeName] = $item->nodeValue;
-                if ($item->nodeName == 'qtype') {
+                if ('qtype' === $item->nodeName) {
                     $questionType = $item->nodeValue;
                 }
 
@@ -619,11 +614,10 @@ class MoodleImport
                 $answer = $item->getElementsByTagName($this->getQuestionTypeAnswersTag($questionType));
                 $currentItem['plugin_qtype_'.$questionType.'_question'] = [];
                 for ($i = 0; $i <= $answer->length - 1; $i++) {
-                    $currentItem['plugin_qtype_'.$questionType.'_question'][$i]['answerid'] =
-                        $answer->item($i)->getAttribute('id');
+                    $label = 'plugin_qtype_'.$questionType.'_question';
+                    $currentItem[$label][$i]['answerid'] = $answer->item($i)->getAttribute('id');
                     foreach ($answer->item($i)->childNodes as $properties) {
-                        $currentItem['plugin_qtype_'.$questionType.'_question'][$i][$properties->nodeName] =
-                            $properties->nodeValue;
+                        $currentItem[$label][$i][$properties->nodeName] = $properties->nodeValue;
                     }
                 }
 
@@ -631,8 +625,7 @@ class MoodleImport
                 for ($i = 0; $i <= $typeValues->length - 1; $i++) {
                     foreach ($typeValues->item($i)->childNodes as $properties) {
                         $currentItem[$questionType.'_values'][$properties->nodeName] = $properties->nodeValue;
-
-                        if ($properties->nodeName != 'sequence') {
+                        if ($properties->nodeName !== 'sequence') {
                             continue;
                         }
 
@@ -689,12 +682,24 @@ class MoodleImport
     }
 
     /**
-     * @param string $moodleQuestionType
+     * @param array Result of readMainQuestionsXml
      *
      * @return int Chamilo question type
      */
-    public function matchMoodleChamiloQuestionTypes($moodleQuestionType)
+    public function matchMoodleChamiloQuestionTypes($questionsValues)
     {
+        $moodleQuestionType = $questionsValues['qtype'];
+        $questionOptions = $moodleQuestionType.'_values';
+        // Check <single> located in <plugin_qtype_multichoice_question><multichoice><single><single>
+        if (
+            'multichoice' === $moodleQuestionType &&
+            isset($questionsValues[$questionOptions]) &&
+            isset($questionsValues[$questionOptions]['single']) &&
+            1 === (int) $questionsValues[$questionOptions]['single']
+        ) {
+            return UNIQUE_ANSWER;
+        }
+
         switch ($moodleQuestionType) {
             case 'multichoice':
                 return MULTIPLE_ANSWER;