From d4cd676cc6eaab1f1c44d5cc628172ae981b0ab4 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 30 Dec 2015 08:53:38 +0100
Subject: [PATCH] Fix category see BT#10052

---
 main/exercice/upload_exercise.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/main/exercice/upload_exercise.php b/main/exercice/upload_exercise.php
index adbb449892..5ac64c5237 100755
--- a/main/exercice/upload_exercise.php
+++ b/main/exercice/upload_exercise.php
@@ -181,7 +181,6 @@ function lp_upload_quiz_action_handling() {
     $questionTypeList = array();
     $questionTypeIndex = array();
     $categoryList = array();
-    $categoryIndex = array();
 
     // Reading all the first column items sequentially to create breakpoints
     for ($i = 1; $i <= $data->sheets[0]['numRows']; $i++) {
@@ -204,8 +203,6 @@ function lp_upload_quiz_action_handling() {
             $noNegativeScoreIndex[] = $i;
         } elseif ($data->sheets[0]['cells'][$i][1] == 'QuestionType') {
             $questionTypeIndex[] = $i;
-        } elseif ($data->sheets[0]['cells'][$i][1] == 'Category') {
-            $categoryIndex[] = $i;
         }
     }
 
@@ -249,6 +246,10 @@ function lp_upload_quiz_action_handling() {
                 if (isset($myData[1]) && $myData[1] == 'QuestionType') {
                     $questionTypeList[$k] = $myData[3];
                 }
+
+                if (isset($myData[1]) && $myData[1] == 'Category') {
+                    $categoryList[$k] = $myData[2];
+                }
             }
 
             if (!isset($questionTypeList[$k])) {
@@ -272,10 +273,6 @@ function lp_upload_quiz_action_handling() {
             //a complete line where 1st column is 'EnrichQuestion'
             $question_description[$m] = $column_data;
             $m++;
-        } elseif (in_array($i, $categoryIndex)) {
-            //a complete line where 1st column is 'Category'
-            $categoryList[$n] = $column_data;
-            $n++;
         } elseif (in_array($i, $noNegativeScoreIndex)) {
             //a complete line where 1st column is 'NoNegativeScore'
             $noNegativeScoreList[$z - 1] = $column_data;
@@ -346,9 +343,9 @@ function lp_upload_quiz_action_handling() {
                 $description = isset($question_description[$i][2]) ? $question_description[$i][2] : '';
 
                 $categoryId = null;
-                if (isset($categoryList[$i]) && isset($categoryList[$i][2]) && !empty($categoryList[$i][2])) {
-                    $categoryName = $categoryList[$i][2];
-                    $categoryId = TestCategory::get_category_id_for_title($categoryName, $courseId);
+                if (isset($categoryList[$i]) && !empty($categoryList[$i])) {
+                    $categoryName = $categoryList[$i];
+                    $categoryId = Testcategory::get_category_id_for_title($categoryName, $courseId);
                     if (empty($categoryId)) {
                         $category = new TestCategory(null, $categoryName, '');
                         $categoryId = $category->addCategoryInBDD();