chamilo / chamilo-lms

main/exercise/overview.php

Indentation +1 added lines, -1 removed lines

@@ -249,7 +249,7 @@
             break;
         case RESULT_DISABLE_SHOW_SCORE_ONLY:
             if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) {
-               $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'));
+                $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'));
             }
             else {
                 $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'), get_lang('Details'));

main/exercise/TestCategory.php

Indentation +486 added lines, -486 removed lines

@@ -13,11 +13,11 @@ 
     public $name;
     public $description;
 
-	/**
-	 * Constructor of the class Category
-	 * If you give an in_id and no in_name, you get info concerning the category of id=in_id
-	 * otherwise, you've got an category objet avec your in_id, in_name, in_descr
-	 *
+    /**
+     * Constructor of the class Category
+     * If you give an in_id and no in_name, you get info concerning the category of id=in_id
+     * otherwise, you've got an category objet avec your in_id, in_name, in_descr
+     *
      * @param int    $id
      * @param string $name
      * @param string $description
@@ -61,9 +61,9 @@ 
         }
     }
 
-	/**
+    /**
      * add TestCategory in the database if name doesn't already exists
-	 */
+     */
     public function addCategoryInBDD()
     {
         $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
@@ -108,12 +108,12 @@ 
 
             return false;
         }
-	}
+    }
 
-	/**
+    /**
      * Removes the category from the database
      * if there were question in this category, the link between question and category is removed
-	 */
+     */
     public function removeCategory()
     {
         $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
@@ -143,11 +143,11 @@ 
 
             return true;
         }
-	}
+    }
 
-	/**
+    /**
      * Modify category name or description of category with id=in_id
-	 */
+     */
     public function modifyCategory()
     {
         $table = Database :: get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
@@ -175,40 +175,40 @@ 
 
             return true;
         }
-	}
+    }
 
-	/**
+    /**
      * Gets the number of question of category id=in_id
-	 */
+     */
     public function getCategoryQuestionsNumber()
     {
-		$table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
-		$in_id = intval($this->id);
-		$sql = "SELECT count(*) AS nb
+        $table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
+        $in_id = intval($this->id);
+        $sql = "SELECT count(*) AS nb
 		        FROM $table
 		        WHERE category_id=$in_id AND c_id=".api_get_course_int_id();
-		$res = Database::query($sql);
-		$row = Database::fetch_array($res);
+        $res = Database::query($sql);
+        $row = Database::fetch_array($res);
 
-		return $row['nb'];
-	}
+        return $row['nb'];
+    }
 
     /**
      * @param string $in_color
      */
     public function display($in_color="#E0EBF5")
     {
-		echo "<textarea style='background-color:$in_color; width:60%; height:100px;'>";
-		print_r($this);
-		echo "</textarea>";
-	}
+        echo "<textarea style='background-color:$in_color; width:60%; height:100px;'>";
+        print_r($this);
+        echo "</textarea>";
+    }
 
-	/**
+    /**
      * Return an array of all Category objects in the database
-	 * If in_field=="" Return an array of all category objects in the database
-	 * Otherwise, return an array of all in_field value
-	 * in the database (in_field = id or name or description)
-	 */
+     * If in_field=="" Return an array of all category objects in the database
+     * Otherwise, return an array of all in_field value
+     * in the database (in_field = id or name or description)
+     */
     public static function getCategoryListInfo($in_field = "", $courseId = "")
     {
         if (empty($courseId) || $courseId=="") {
@@ -239,8 +239,8 @@ 
             }
         }
 
-		return $tabres;
-	}
+        return $tabres;
+    }
 
     /**
      * Return the TestCategory id for question with question_id = $questionId
@@ -251,210 +251,210 @@ 
      *
      * @return int
      */
-	public static function getCategoryForQuestion($questionId, $courseId ="")
+    public static function getCategoryForQuestion($questionId, $courseId ="")
     {
-		$result = 0;
+        $result = 0;
         if (empty($courseId) || $courseId == "") {
             $courseId = api_get_course_int_id();
         }
-		$table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
+        $table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
         $questionId = intval($questionId);
-		$sql = "SELECT category_id
+        $sql = "SELECT category_id
 		        FROM $table
 		        WHERE question_id = $questionId AND c_id = $courseId";
-		$res = Database::query($sql);
-		if (Database::num_rows($res) > 0) {
+        $res = Database::query($sql);
+        if (Database::num_rows($res) > 0) {
             $data = Database::fetch_array($res);
-			$result = $data['category_id'];
-		}
+            $result = $data['category_id'];
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * true if question id has a category
-	 */
-	public static function isQuestionHasCategory($questionId)
+    /**
+     * true if question id has a category
+     */
+    public static function isQuestionHasCategory($questionId)
     {
-		if (TestCategory::getCategoryForQuestion($questionId) > 0) {
-			return true;
-		}
-		return false;
-	}
+        if (TestCategory::getCategoryForQuestion($questionId) > 0) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
+    /**
 	 Return the category name for question with question_id = $questionId
 	 In this version, a question has only 1 category.
 	 Return the category id, "" if none
-	 */
+     */
     public static function getCategoryNameForQuestion(
         $questionId,
         $courseId = ""
     ) {
-		if (empty($courseId) || $courseId=="") {
-			$courseId = api_get_course_int_id();
-		}
-		$catid = TestCategory::getCategoryForQuestion($questionId, $courseId);
-		$result = "";	// result
-		$table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
-		$catid = intval($catid);
-		$sql = "SELECT title FROM $table
+        if (empty($courseId) || $courseId=="") {
+            $courseId = api_get_course_int_id();
+        }
+        $catid = TestCategory::getCategoryForQuestion($questionId, $courseId);
+        $result = "";	// result
+        $table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
+        $catid = intval($catid);
+        $sql = "SELECT title FROM $table
 		        WHERE id = $catid  AND c_id = $courseId";
-		$res = Database::query($sql);
-		$data = Database::fetch_array($res);
-		if (Database::num_rows($res) > 0) {
-			$result = $data['title'];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Return the list of differents categories ID for a test in the current course
-	 * input : test_id
-	 * return : array of category id (integer)
-	 * hubert.borderiou 07-04-2011
-	 * @param int $exerciseId
-	 */
-	public static function getListOfCategoriesIDForTest($exerciseId)
+        $res = Database::query($sql);
+        $data = Database::fetch_array($res);
+        if (Database::num_rows($res) > 0) {
+            $result = $data['title'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Return the list of differents categories ID for a test in the current course
+     * input : test_id
+     * return : array of category id (integer)
+     * hubert.borderiou 07-04-2011
+     * @param int $exerciseId
+     */
+    public static function getListOfCategoriesIDForTest($exerciseId)
     {
-		// parcourir les questions d'un test, recup les categories uniques dans un tableau
-		$exercise = new Exercise();
-		$exercise->read($exerciseId, false);
-		$categoriesInExercise = $exercise->getQuestionWithCategories();
-		// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
-		$categories = array();
+        // parcourir les questions d'un test, recup les categories uniques dans un tableau
+        $exercise = new Exercise();
+        $exercise->read($exerciseId, false);
+        $categoriesInExercise = $exercise->getQuestionWithCategories();
+        // the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
+        $categories = array();
         if (!empty($categoriesInExercise)) {
-			foreach ($categoriesInExercise as $category) {
-				//$category['id'] = $category['iid'];
-				$categories[$category['id']] = $category;
-			}
-		}
-
-		return $categories;
-	}
-
-	/**
-	 * @param Exercise $exercise_obj
-	 * @return array
-	 */
-	public static function getListOfCategoriesIDForTestObject(Exercise $exercise_obj)
-	{
-		// parcourir les questions d'un test, recup les categories uniques dans un tableau
-		$categories_in_exercise = array();
-		// $question_list = $exercise_obj->getQuestionList();
-		$question_list = $exercise_obj->getQuestionOrderedListByName();
-
-		// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
-		foreach ($question_list as $questionInfo) {
-			$question_id = $questionInfo['question_id'];
-			$category_list = self::getCategoryForQuestion($question_id);
-			if (is_numeric($category_list)) {
-				$category_list = array($category_list);
-			}
-
-			if (!empty($category_list)) {
-				$categories_in_exercise = array_merge($categories_in_exercise, $category_list);
-			}
-		}
-		if (!empty($categories_in_exercise)) {
-			$categories_in_exercise = array_unique(array_filter($categories_in_exercise));
-		}
-		return $categories_in_exercise;
-	}
-
-	/**
-	 * Return the list of differents categories NAME for a test
-	 * @param int exercise id
-	 * @param bool
-	 * @return integer of string
-	 *
+            foreach ($categoriesInExercise as $category) {
+                //$category['id'] = $category['iid'];
+                $categories[$category['id']] = $category;
+            }
+        }
+
+        return $categories;
+    }
+
+    /**
+     * @param Exercise $exercise_obj
+     * @return array
+     */
+    public static function getListOfCategoriesIDForTestObject(Exercise $exercise_obj)
+    {
+        // parcourir les questions d'un test, recup les categories uniques dans un tableau
+        $categories_in_exercise = array();
+        // $question_list = $exercise_obj->getQuestionList();
+        $question_list = $exercise_obj->getQuestionOrderedListByName();
+
+        // the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
+        foreach ($question_list as $questionInfo) {
+            $question_id = $questionInfo['question_id'];
+            $category_list = self::getCategoryForQuestion($question_id);
+            if (is_numeric($category_list)) {
+                $category_list = array($category_list);
+            }
+
+            if (!empty($category_list)) {
+                $categories_in_exercise = array_merge($categories_in_exercise, $category_list);
+            }
+        }
+        if (!empty($categories_in_exercise)) {
+            $categories_in_exercise = array_unique(array_filter($categories_in_exercise));
+        }
+        return $categories_in_exercise;
+    }
+
+    /**
+     * Return the list of differents categories NAME for a test
+     * @param int exercise id
+     * @param bool
+     * @return integer of string
+     *
      * @author function rewrote by jmontoya
-	 */
-	public static function getListOfCategoriesNameForTest($exercise_id, $grouped_by_category = true)
+     */
+    public static function getListOfCategoriesNameForTest($exercise_id, $grouped_by_category = true)
     {
-		$result = array();
-		$categories = self::getListOfCategoriesIDForTest($exercise_id, $grouped_by_category);
+        $result = array();
+        $categories = self::getListOfCategoriesIDForTest($exercise_id, $grouped_by_category);
 
-		foreach ($categories as $catInfo) {
-			$categoryId = $catInfo['id'];
-			if (!empty($categoryId)) {
-				$result[$categoryId] = array(
+        foreach ($categories as $catInfo) {
+            $categoryId = $catInfo['id'];
+            if (!empty($categoryId)) {
+                $result[$categoryId] = array(
                     'title' => $catInfo['title'],
                     //'parent_id' =>  $catInfo['parent_id'],
-					'parent_id' => '',
+                    'parent_id' => '',
                     'c_id' => $catInfo['c_id']
                 );
-		}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @param Exercise $exercise_obj
-	 * @return array
-	 */
-	public static function getListOfCategoriesForTest(Exercise $exercise_obj)
-	{
-		$result = array();
-		$categories = self::getListOfCategoriesIDForTestObject($exercise_obj);
-		foreach ($categories as $cat_id) {
-			$cat = new TestCategory($cat_id);
-			$cat = (array)$cat;
-			$cat['iid'] = $cat['id'];
-			$cat['title'] = $cat['name'];
-			$result[$cat['id']] = $cat;
-		}
-		return $result;
-	}
-
-	/**
-	 * return the number of differents categories for a test
-	 * input : test_id
-	 * return : integer
-	 * hubert.borderiou 07-04-2011
-	 */
-	public static function getNumberOfCategoriesForTest($id)
+        }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param Exercise $exercise_obj
+     * @return array
+     */
+    public static function getListOfCategoriesForTest(Exercise $exercise_obj)
+    {
+        $result = array();
+        $categories = self::getListOfCategoriesIDForTestObject($exercise_obj);
+        foreach ($categories as $cat_id) {
+            $cat = new TestCategory($cat_id);
+            $cat = (array)$cat;
+            $cat['iid'] = $cat['id'];
+            $cat['title'] = $cat['name'];
+            $result[$cat['id']] = $cat;
+        }
+        return $result;
+    }
+
+    /**
+     * return the number of differents categories for a test
+     * input : test_id
+     * return : integer
+     * hubert.borderiou 07-04-2011
+     */
+    public static function getNumberOfCategoriesForTest($id)
     {
-		return count(TestCategory::getListOfCategoriesIDForTest($id));
-	}
+        return count(TestCategory::getListOfCategoriesIDForTest($id));
+    }
 
-	/**
-	 * return the number of question of a category id in a test
-	 * @param int $exerciseId
+    /**
+     * return the number of question of a category id in a test
+     * @param int $exerciseId
      * @param int $categoryId
      *
-	 * @return integer
+     * @return integer
      *
-	 * @author hubert.borderiou 07-04-2011
-	 */
-	public static function getNumberOfQuestionsInCategoryForTest($exerciseId, $categoryId)
+     * @author hubert.borderiou 07-04-2011
+     */
+    public static function getNumberOfQuestionsInCategoryForTest($exerciseId, $categoryId)
     {
-		$nbCatResult = 0;
-		$quiz = new Exercise();
-		$quiz->read($exerciseId);
-		$tabQuestionList = $quiz->selectQuestionList();
-		// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ? ? ?
-		for ($i=1; $i <= count($tabQuestionList); $i++) {
-			if (TestCategory::getCategoryForQuestion($tabQuestionList[$i]) == $categoryId) {
-				$nbCatResult++;
-			}
-		}
-
-		return $nbCatResult;
-	}
-
-	/**
-	 * return the number of question for a test using random by category
-	 * input  : test_id, number of random question (min 1)
-	 * hubert.borderiou 07-04-2011
-	 * question without categories are not counted
-	 */
-	public static function getNumberOfQuestionRandomByCategory($exerciseId, $in_nbrandom)
+        $nbCatResult = 0;
+        $quiz = new Exercise();
+        $quiz->read($exerciseId);
+        $tabQuestionList = $quiz->selectQuestionList();
+        // the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ? ? ?
+        for ($i=1; $i <= count($tabQuestionList); $i++) {
+            if (TestCategory::getCategoryForQuestion($tabQuestionList[$i]) == $categoryId) {
+                $nbCatResult++;
+            }
+        }
+
+        return $nbCatResult;
+    }
+
+    /**
+     * return the number of question for a test using random by category
+     * input  : test_id, number of random question (min 1)
+     * hubert.borderiou 07-04-2011
+     * question without categories are not counted
+     */
+    public static function getNumberOfQuestionRandomByCategory($exerciseId, $in_nbrandom)
     {
-		$nbquestionresult = 0;
-		$tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
+        $nbquestionresult = 0;
+        $tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
 
         foreach ($tabcatid as $category) {
             if (empty($category['id'])) {
@@ -470,30 +470,30 @@ 
             }
         }
 
-		return $nbquestionresult;
-	}
+        return $nbquestionresult;
+    }
 
-	/**
-	 * Return an array (id=>name)
-	 * tabresult[0] = get_lang('NoCategory');
+    /**
+     * Return an array (id=>name)
+     * tabresult[0] = get_lang('NoCategory');
      *
      * @param int $courseId
      *
      * @return array
-	 *
-	 */
+     *
+     */
     public static function getCategoriesIdAndName($courseId = "")
     {
-		if (empty($courseId)) {
-			$courseId = api_get_course_int_id();
-		}
-	 	$tabcatobject = TestCategory::getCategoryListInfo("", $courseId);
-	 	$tabresult = array("0"=>get_lang('NoCategorySelected'));
-	 	for ($i=0; $i < count($tabcatobject); $i++) {
-	 		$tabresult[$tabcatobject[$i]->id] = $tabcatobject[$i]->name;
-	 	}
-	 	return $tabresult;
-	}
+        if (empty($courseId)) {
+            $courseId = api_get_course_int_id();
+        }
+            $tabcatobject = TestCategory::getCategoryListInfo("", $courseId);
+            $tabresult = array("0"=>get_lang('NoCategorySelected'));
+            for ($i=0; $i < count($tabcatobject); $i++) {
+                $tabresult[$tabcatobject[$i]->id] = $tabcatobject[$i]->name;
+            }
+            return $tabresult;
+    }
 
     /**
      * Returns an array of question ids for each category
@@ -502,10 +502,10 @@ 
      * @param int exercise
      * @param array $check_in_question_list
      * @param array $categoriesAddedInExercise
-    *
-    * @param int $exerciseId
-    * @return array
-    */
+     *
+     * @param int $exerciseId
+     * @return array
+     */
     static function getQuestionsByCat(
         $exerciseId,
         $check_in_question_list = array(),
@@ -583,28 +583,28 @@ 
         }
 
         return $categories;
-	}
+    }
 
-	/**
-	 * return a tab of $in_number random elements of $in_tab
-	 */
+    /**
+     * return a tab of $in_number random elements of $in_tab
+     */
     public static function getNElementsFromArray($in_tab, $in_number)
     {
-		$tabres = $in_tab;
-		shuffle($tabres);
-		if ($in_number < count($tabres)) {
-			$tabres = array_slice($tabres, 0, $in_number);
-		}
-		return $tabres;
-	}
-
-	/**
-	 * display the category
-	 */
-	public static function displayCategoryAndTitle($questionId, $in_display_category_name = 1)
+        $tabres = $in_tab;
+        shuffle($tabres);
+        if ($in_number < count($tabres)) {
+            $tabres = array_slice($tabres, 0, $in_number);
+        }
+        return $tabres;
+    }
+
+    /**
+     * display the category
+     */
+    public static function displayCategoryAndTitle($questionId, $in_display_category_name = 1)
     {
         echo self::returnCategoryAndTitle($questionId, $in_display_category_name);
-	}
+    }
 
     /**
      * @param int $questionId
@@ -620,90 +620,90 @@ 
             $in_display_category_name = $objExercise->display_category_name;
         }
         $content = null;
-		if (TestCategory::getCategoryNameForQuestion($questionId) != "" && ($in_display_category_name == 1 || !$is_student)) {
+        if (TestCategory::getCategoryNameForQuestion($questionId) != "" && ($in_display_category_name == 1 || !$is_student)) {
             $content .= '<div class="page-header">';
             $content .= '<h4>'.get_lang('Category').": ".TestCategory::getCategoryNameForQuestion($questionId).'</h4>';
             $content .= "</div>";
-		}
+        }
         return $content;
-	}
+    }
 
     /**
-    * Display signs [+] and/or (>0) after question title if question has options
-    * scoreAlwaysPositive and/or uncheckedMayScore
-    */
+     * Display signs [+] and/or (>0) after question title if question has options
+     * scoreAlwaysPositive and/or uncheckedMayScore
+     */
     public function displayQuestionOption($in_objQuestion)
     {
-		if ($in_objQuestion->type == MULTIPLE_ANSWER && $in_objQuestion->scoreAlwaysPositive) {
-			echo "<span style='font-size:75%'> (>0)</span>";
-		}
-		if ($in_objQuestion->type == MULTIPLE_ANSWER && $in_objQuestion->uncheckedMayScore) {
-			echo "<span style='font-size:75%'> [+]</span>";
-		}
-	}
-
-	/**
-	 * sortTabByBracketLabel ($tabCategoryQuestions)
-	 * key of $tabCategoryQuestions are the category id (0 for not in a category)
-	 * value is the array of question id of this category
-	 * Sort question by Category
-	*/
+        if ($in_objQuestion->type == MULTIPLE_ANSWER && $in_objQuestion->scoreAlwaysPositive) {
+            echo "<span style='font-size:75%'> (>0)</span>";
+        }
+        if ($in_objQuestion->type == MULTIPLE_ANSWER && $in_objQuestion->uncheckedMayScore) {
+            echo "<span style='font-size:75%'> [+]</span>";
+        }
+    }
+
+    /**
+     * sortTabByBracketLabel ($tabCategoryQuestions)
+     * key of $tabCategoryQuestions are the category id (0 for not in a category)
+     * value is the array of question id of this category
+     * Sort question by Category
+     */
     public static function sortTabByBracketLabel($in_tab)
     {
-		$tabResult = array();
-		$tabCatName = array();	// tab of category name
-		while (list($cat_id, $tabquestion) = each($in_tab)) {
-			$catTitle = new TestCategory($cat_id);
-			$tabCatName[$cat_id] = $catTitle->name;
-		}
-		reset($in_tab);
-		// sort table by value, keeping keys as they are
-		asort($tabCatName);
-		// keys of $tabCatName are keys order for $in_tab
-		while (list($key, $val) = each($tabCatName)) {
-			$tabResult[$key] = $in_tab[$key];
-		}
-		return $tabResult;
-	}
+        $tabResult = array();
+        $tabCatName = array();	// tab of category name
+        while (list($cat_id, $tabquestion) = each($in_tab)) {
+            $catTitle = new TestCategory($cat_id);
+            $tabCatName[$cat_id] = $catTitle->name;
+        }
+        reset($in_tab);
+        // sort table by value, keeping keys as they are
+        asort($tabCatName);
+        // keys of $tabCatName are keys order for $in_tab
+        while (list($key, $val) = each($tabCatName)) {
+            $tabResult[$key] = $in_tab[$key];
+        }
+        return $tabResult;
+    }
 
     /**
-	 * return total score for test exe_id for all question in the category $in_cat_id for user
-	 * If no question for this category, return ""
-	 */
-	public static function getCatScoreForExeidForUserid($in_cat_id, $in_exe_id, $in_user_id)
-	{
-		$tbl_track_attempt		= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-		$tbl_question_rel_category = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
-		$in_cat_id = intval($in_cat_id);
-		$in_exe_id = intval($in_exe_id);
-		$in_user_id = intval($in_user_id);
-
-		$query = "SELECT DISTINCT
+     * return total score for test exe_id for all question in the category $in_cat_id for user
+     * If no question for this category, return ""
+     */
+    public static function getCatScoreForExeidForUserid($in_cat_id, $in_exe_id, $in_user_id)
+    {
+        $tbl_track_attempt		= Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+        $tbl_question_rel_category = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
+        $in_cat_id = intval($in_cat_id);
+        $in_exe_id = intval($in_exe_id);
+        $in_user_id = intval($in_user_id);
+
+        $query = "SELECT DISTINCT
 		            marks, exe_id, user_id, ta.question_id, category_id
                   FROM $tbl_track_attempt ta , $tbl_question_rel_category qrc
                   WHERE
                     ta.question_id=qrc.question_id AND
                     qrc.category_id=$in_cat_id AND
                     exe_id=$in_exe_id AND user_id=$in_user_id";
-		$res = Database::query($query);
-		$totalcatscore = "";
-		while ($data = Database::fetch_array($res)) {
-			$totalcatscore += $data['marks'];
-		}
-		return $totalcatscore;
-	}
-
-	/**
+        $res = Database::query($query);
+        $totalcatscore = "";
+        while ($data = Database::fetch_array($res)) {
+            $totalcatscore += $data['marks'];
+        }
+        return $totalcatscore;
+    }
+
+    /**
      * return the number max of question in a category
      * count the number of questions in all categories, and return the max
      * @param int $exerciseId
      * @author - hubert borderiou
-    */
+     */
     public static function getNumberMaxQuestionByCat($exerciseId)
     {
         $res_num_max = 0;
         // foreach question
-		$tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
+        $tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
 
         foreach ($tabcatid as $category) {
             if (empty($category['id'])) {
@@ -775,34 +775,34 @@ 
     }
 
     /**
-	 * @return array
-	 */
-	function get_all_categories()
-	{
-		$table = Database::get_course_table(TABLE_QUIZ_CATEGORY);
-		$sql = "SELECT * FROM $table ORDER BY title ASC";
-		$res = Database::query($sql);
-		while ($row = Database::fetch_array($res,'ASSOC')) {
-			$array[] = $row;
-		}
-		return $array;
-	}
-
-	/**
-	 * @param Exercise $exercise
-	 * @param int $course_id
-	 * @param string $order
-	 * @param bool $shuffle
-	 * @param bool $excludeCategoryWithNoQuestions
-	 * @return array|bool
-	 */
-	public function getCategoryExerciseTree(
-		$exercise,
-		$course_id,
-		$order = null,
-		$shuffle = false,
-		$excludeCategoryWithNoQuestions = true
-	) {
+     * @return array
+     */
+    function get_all_categories()
+    {
+        $table = Database::get_course_table(TABLE_QUIZ_CATEGORY);
+        $sql = "SELECT * FROM $table ORDER BY title ASC";
+        $res = Database::query($sql);
+        while ($row = Database::fetch_array($res,'ASSOC')) {
+            $array[] = $row;
+        }
+        return $array;
+    }
+
+    /**
+     * @param Exercise $exercise
+     * @param int $course_id
+     * @param string $order
+     * @param bool $shuffle
+     * @param bool $excludeCategoryWithNoQuestions
+     * @return array|bool
+     */
+    public function getCategoryExerciseTree(
+        $exercise,
+        $course_id,
+        $order = null,
+        $shuffle = false,
+        $excludeCategoryWithNoQuestions = true
+    ) {
         if (empty($exercise)) {
             return array();
         }
@@ -812,165 +812,165 @@ 
         }
 
         $course_id = intval($course_id);
-		$table = Database::get_course_table(TABLE_QUIZ_REL_CATEGORY);
+        $table = Database::get_course_table(TABLE_QUIZ_REL_CATEGORY);
         $categoryTable = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
-		$sql = "SELECT * FROM $table qc
+        $sql = "SELECT * FROM $table qc
               	LEFT JOIN $categoryTable c
                 ON (qc.c_id = c.c_id AND c.id = qc.category_id)
                 WHERE qc.c_id = $course_id AND exercise_id = {$exercise->id} ";
 
-		if (!empty($order)) {
-			$sql .= "ORDER BY $order";
-		}
-
-		$categories = array();
-
-		$result = Database::query($sql);
-		if (Database::num_rows($result)) {
-			while ($row = Database::fetch_array($result, 'ASSOC')) {
-				if ($excludeCategoryWithNoQuestions) {
-					if ($row['count_questions'] == 0) {
-						continue;
-					}
-				}
-				if (empty($row['title']) && empty($row['category_id'])) {
-					$row['title'] = get_lang('NoCategory');
-				}
+        if (!empty($order)) {
+            $sql .= "ORDER BY $order";
+        }
+
+        $categories = array();
+
+        $result = Database::query($sql);
+        if (Database::num_rows($result)) {
+            while ($row = Database::fetch_array($result, 'ASSOC')) {
+                if ($excludeCategoryWithNoQuestions) {
+                    if ($row['count_questions'] == 0) {
+                        continue;
+                    }
+                }
+                if (empty($row['title']) && empty($row['category_id'])) {
+                    $row['title'] = get_lang('NoCategory');
+                }
                 $categories[$row['category_id']] = $row;
-			}
-		}
-
-		if ($shuffle) {
-			shuffle_assoc($categories);
-		}
-
-		return $categories;
-	}
-
-	public function getForm(& $form, $action = 'new')
-	{
-		switch($action) {
-			case 'new':
-				$header = get_lang('AddACategory');
-				$submit = get_lang('AddTestCategory');
-				break;
-			case 'edit':
-				$header = get_lang('EditCategory');
-				$submit = get_lang('ModifyCategory');
-				break;
-		}
-
-		// settting the form elements
-		$form->addElement('header', $header);
-		$form->addElement('hidden', 'category_id');
-		$form->addElement('text', 'category_name', get_lang('CategoryName'), array('class' => 'span6'));
-		$form->add_html_editor('category_description', get_lang('CategoryDescription'), false, false, array('ToolbarSet' => 'test_category', 'Width' => '90%', 'Height' => '200'));
-		$category_parent_list = array();
-
-		$options = array(
-				'1' => get_lang('Visible'),
-				'0' => get_lang('Hidden')
-		);
-		$form->addElement('select', 'visibility', get_lang('Visibility'), $options);
-		$script = null;
-		if (!empty($this->parent_id)) {
-			$parent_cat = new TestCategory($this->parent_id);
-			$category_parent_list = array($parent_cat->id => $parent_cat->name);
-			$script .= '<script>$(function() { $("#parent_id").trigger("addItem",[{"title": "'.$parent_cat->name.'", "value": "'.$parent_cat->id.'"}]); });</script>';
-		}
-		$form->addElement('html', $script);
-
-		$form->addElement('select', 'parent_id', get_lang('Parent'), $category_parent_list, array('id' => 'parent_id'));
-		$form->addElement('style_submit_button', 'SubmitNote', $submit, 'class="add"');
-
-		// setting the defaults
-		$defaults = array();
-		$defaults["category_id"] = $this->id;
-		$defaults["category_name"] = $this->name;
-		$defaults["category_description"] = $this->description;
-		$defaults["parent_id"] = $this->parent_id;
-		$defaults["visibility"] = $this->visibility;
-		$form->setDefaults($defaults);
-
-		// setting the rules
-		$form->addRule('category_name', get_lang('ThisFieldIsRequired'), 'required');
-	}
-
-	/**
-	 * Returns the category form.
-	 * @param Exercise $exercise_obj
-	 * @return string
-	 */
-	public function returnCategoryForm(Exercise $exercise_obj)
-	{
-		$categories = $this->getListOfCategoriesForTest($exercise_obj);
-
-		$saved_categories = $exercise_obj->get_categories_in_exercise();
-		$return = null;
-
-		if (!empty($categories)) {
-			$nbQuestionsTotal = $exercise_obj->getNumberQuestionExerciseCategory();
-			$exercise_obj->setCategoriesGrouping(true);
-			$real_question_count = count($exercise_obj->getQuestionList());
-
-			$warning = null;
-			if ($nbQuestionsTotal != $real_question_count) {
-				$warning = Display::return_message(get_lang('CheckThatYouHaveEnoughQuestionsInYourCategories'), 'warning');
-			}
-
-			$return .= $warning;
-			$return .= '<table class="data_table">';
-			$return .= '<tr>';
-			$return .= '<th height="24">' . get_lang('Categories') . '</th>';
-			$return .= '<th width="70" height="24">' . get_lang('Number') . '</th></tr>';
-
-			$emptyCategory = array(
-				'id' => '0',
-				'name' => get_lang('NoCategory'),
-				'description' => '',
-				'iid' => '0',
-				'title' => get_lang('NoCategory')
-			);
-
-			$categories[] = $emptyCategory;
-
-			foreach ($categories as $category) {
-				$cat_id = $category['iid'];
-				$return .= '<tr>';
-				$return .= '<td>';
-				//$return .= Display::div(isset($category['parent_path']) ? $category['parent_path'] : '');
-				$return .= Display::div($category['name']);
-				$return .= '</td>';
-				$return .= '<td>';
-				$value = isset($saved_categories) && isset($saved_categories[$cat_id]) ? $saved_categories[$cat_id]['count_questions'] : -1;
-				$return .= '<input name="category['.$cat_id.']" value="' .$value.'" />';
-				$return .= '</td>';
-				$return .= '</tr>';
-			}
-
-			$return .= '</table>';
-			$return .= get_lang('ZeroMeansNoQuestionWillBeSelectedMinusOneMeansThatAllQuestionsWillBeSelected');
-			return $return;
-		}
-	}
-
-	/**
-	 * Sorts an array
-	 * @param $array
-	 * @return mixed
-	 */
-	public function sort_tree_array($array)
-	{
-		foreach ($array as $key => $row) {
-			$parent[$key] = $row['parent_id'];
-		}
-		if (count($array) > 0) {
-			array_multisort($parent, SORT_ASC, $array);
-		}
-		return $array;
-	}
-
-	/**
+            }
+        }
+
+        if ($shuffle) {
+            shuffle_assoc($categories);
+        }
+
+        return $categories;
+    }
+
+    public function getForm(& $form, $action = 'new')
+    {
+        switch($action) {
+            case 'new':
+                $header = get_lang('AddACategory');
+                $submit = get_lang('AddTestCategory');
+                break;
+            case 'edit':
+                $header = get_lang('EditCategory');
+                $submit = get_lang('ModifyCategory');
+                break;
+        }
+
+        // settting the form elements
+        $form->addElement('header', $header);
+        $form->addElement('hidden', 'category_id');
+        $form->addElement('text', 'category_name', get_lang('CategoryName'), array('class' => 'span6'));
+        $form->add_html_editor('category_description', get_lang('CategoryDescription'), false, false, array('ToolbarSet' => 'test_category', 'Width' => '90%', 'Height' => '200'));
+        $category_parent_list = array();
+
+        $options = array(
+                '1' => get_lang('Visible'),
+                '0' => get_lang('Hidden')
+        );
+        $form->addElement('select', 'visibility', get_lang('Visibility'), $options);
+        $script = null;
+        if (!empty($this->parent_id)) {
+            $parent_cat = new TestCategory($this->parent_id);
+            $category_parent_list = array($parent_cat->id => $parent_cat->name);
+            $script .= '<script>$(function() { $("#parent_id").trigger("addItem",[{"title": "'.$parent_cat->name.'", "value": "'.$parent_cat->id.'"}]); });</script>';
+        }
+        $form->addElement('html', $script);
+
+        $form->addElement('select', 'parent_id', get_lang('Parent'), $category_parent_list, array('id' => 'parent_id'));
+        $form->addElement('style_submit_button', 'SubmitNote', $submit, 'class="add"');
+
+        // setting the defaults
+        $defaults = array();
+        $defaults["category_id"] = $this->id;
+        $defaults["category_name"] = $this->name;
+        $defaults["category_description"] = $this->description;
+        $defaults["parent_id"] = $this->parent_id;
+        $defaults["visibility"] = $this->visibility;
+        $form->setDefaults($defaults);
+
+        // setting the rules
+        $form->addRule('category_name', get_lang('ThisFieldIsRequired'), 'required');
+    }
+
+    /**
+     * Returns the category form.
+     * @param Exercise $exercise_obj
+     * @return string
+     */
+    public function returnCategoryForm(Exercise $exercise_obj)
+    {
+        $categories = $this->getListOfCategoriesForTest($exercise_obj);
+
+        $saved_categories = $exercise_obj->get_categories_in_exercise();
+        $return = null;
+
+        if (!empty($categories)) {
+            $nbQuestionsTotal = $exercise_obj->getNumberQuestionExerciseCategory();
+            $exercise_obj->setCategoriesGrouping(true);
+            $real_question_count = count($exercise_obj->getQuestionList());
+
+            $warning = null;
+            if ($nbQuestionsTotal != $real_question_count) {
+                $warning = Display::return_message(get_lang('CheckThatYouHaveEnoughQuestionsInYourCategories'), 'warning');
+            }
+
+            $return .= $warning;
+            $return .= '<table class="data_table">';
+            $return .= '<tr>';
+            $return .= '<th height="24">' . get_lang('Categories') . '</th>';
+            $return .= '<th width="70" height="24">' . get_lang('Number') . '</th></tr>';
+
+            $emptyCategory = array(
+                'id' => '0',
+                'name' => get_lang('NoCategory'),
+                'description' => '',
+                'iid' => '0',
+                'title' => get_lang('NoCategory')
+            );
+
+            $categories[] = $emptyCategory;
+
+            foreach ($categories as $category) {
+                $cat_id = $category['iid'];
+                $return .= '<tr>';
+                $return .= '<td>';
+                //$return .= Display::div(isset($category['parent_path']) ? $category['parent_path'] : '');
+                $return .= Display::div($category['name']);
+                $return .= '</td>';
+                $return .= '<td>';
+                $value = isset($saved_categories) && isset($saved_categories[$cat_id]) ? $saved_categories[$cat_id]['count_questions'] : -1;
+                $return .= '<input name="category['.$cat_id.']" value="' .$value.'" />';
+                $return .= '</td>';
+                $return .= '</tr>';
+            }
+
+            $return .= '</table>';
+            $return .= get_lang('ZeroMeansNoQuestionWillBeSelectedMinusOneMeansThatAllQuestionsWillBeSelected');
+            return $return;
+        }
+    }
+
+    /**
+     * Sorts an array
+     * @param $array
+     * @return mixed
+     */
+    public function sort_tree_array($array)
+    {
+        foreach ($array as $key => $row) {
+            $parent[$key] = $row['parent_id'];
+        }
+        if (count($array) > 0) {
+            array_multisort($parent, SORT_ASC, $array);
+        }
+        return $array;
+    }
+
+    /**
      * Return true if a category already exists with the same name
      * @param string $in_name
      *
@@ -1016,8 +1016,8 @@ 
      * @param int $categoryId
      * @param int $questionId
      * @param int $courseId
-	 *
-	 * @return string|false
+     *
+     * @return string|false
      */
     public static function add_category_for_question_id($categoryId, $questionId, $courseId)
     {
@@ -1025,18 +1025,18 @@ 
         // if question doesn't have a category
         // @todo change for 1.10 when a question can have several categories
         if (TestCategory::getCategoryForQuestion($questionId, $courseId) == 0 &&
-			$questionId > 0 &&
-			$courseId > 0
+            $questionId > 0 &&
+            $courseId > 0
         ) {
             $sql = "INSERT INTO $table (c_id, question_id, category_id)
                     VALUES (".intval($courseId).", ".intval($questionId).", ".intval($categoryId).")";
             Database::query($sql);
-			$id = Database::insert_id();
+            $id = Database::insert_id();
 
-			return $id;
+            return $id;
         }
 
-		return false;
+        return false;
     }
 
     /**

main/exercise/hotpotatoes_exercise_result.class.php

Indentation +137 added lines, -137 removed lines

@@ -14,15 +14,15 @@ 
     //stores the results
     private $results = array();
 
-	/**
-	 * Gets the results of all students (or just one student if access is limited)
-	 * @param	string		The document path (for HotPotatoes retrieval)
-	 * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
-	 * @param string $document_path
-	 */
-	public function getExercisesReporting($document_path, $hotpotato_name)
+    /**
+     * Gets the results of all students (or just one student if access is limited)
+     * @param	string		The document path (for HotPotatoes retrieval)
+     * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
+     * @param string $document_path
+     */
+    public function getExercisesReporting($document_path, $hotpotato_name)
     {
-		$return = array();
+        $return = array();
         $TBL_USER = Database::get_main_table(TABLE_MAIN_USER);
         $TBL_TRACK_HOTPOTATOES	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 
@@ -34,7 +34,7 @@ 
         $hotpotato_name  = Database::escape_string($hotpotato_name);
 
         if (!empty($exercise_id)) {
-          $session_id_and .= " AND exe_exo_id = $exercise_id ";
+            $session_id_and .= " AND exe_exo_id = $exercise_id ";
         }
 
         if (empty($user_id)) {
@@ -111,25 +111,25 @@ 
         $this->results = $return;
 
         return true;
-	}
+    }
 
 
-	/**
-	 * Exports the complete report as a CSV file
-	 * @param	string		Document path inside the document tool
-	 * @param	integer		Optional user ID
-	 * @param	boolean		Whether to include user fields or not
-	 * @return	boolean		False on error
-	 */
-	public function exportCompleteReportCSV($document_path='', $hotpotato_name)
+    /**
+     * Exports the complete report as a CSV file
+     * @param	string		Document path inside the document tool
+     * @param	integer		Optional user ID
+     * @param	boolean		Whether to include user fields or not
+     * @return	boolean		False on error
+     */
+    public function exportCompleteReportCSV($document_path='', $hotpotato_name)
     {
-		global $charset;
-		$this->getExercisesReporting($document_path, $hotpotato_name);
-		$filename = 'exercise_results_'.date('YmdGis').'.csv';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
-		}
-		$data = '';
+        global $charset;
+        $this->getExercisesReporting($document_path, $hotpotato_name);
+        $filename = 'exercise_results_'.date('YmdGis').'.csv';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
+        }
+        $data = '';
 
         if (api_is_western_name_order()) {
             if(!empty($this->results[0]['first_name'])) {
@@ -148,7 +148,7 @@ 
         }
         $data .= get_lang('Email').';';
 
-		/*if ($export_user_fields) {
+        /*if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
 			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 			$num = count($extra_user_fields);
@@ -157,25 +157,25 @@ 
 			}
 		}*/
 
-		$data .= get_lang('Title').';';
-		$data .= get_lang('StartDate').';';
-		$data .= get_lang('Score').';';
-		$data .= get_lang('Total').';';
-		$data .= "\n";
+        $data .= get_lang('Title').';';
+        $data .= get_lang('StartDate').';';
+        $data .= get_lang('Score').';';
+        $data .= get_lang('Total').';';
+        $data .= "\n";
 
-		//results
-		foreach($this->results as $row) {
+        //results
+        foreach($this->results as $row) {
             if (api_is_western_name_order()) {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
             } else {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
             }
 
             $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
 
-			/*if ($export_user_fields) {
+            /*if ($export_user_fields) {
 				//show user fields data, if any, for this user
 				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
 				foreach($user_fields_values as $value) {
@@ -183,40 +183,40 @@ 
 				}
 			}*/
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['exe_date']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
-			$data .= "\n";
-		}
-
-		//output the results
-		$len = strlen($data);
-		header('Content-type: application/octet-stream');
-		header('Content-Type: application/force-download');
-		header('Content-length: '.$len);
-		if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-			header('Content-Disposition: filename= '.$filename);
-		} else {
-			header('Content-Disposition: attachment; filename= '.$filename);
-		}
-		if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
-			header('Pragma: ');
-			header('Cache-Control: ');
-			header('Cache-Control: public'); // IE cannot download from sessions without a cache
-		}
-		header('Content-Description: '.$filename);
-		header('Content-transfer-encoding: binary');
-		// @todo add this utf-8 header for all csv files
-		echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
-		echo $data;
-		return true;
-	}
-
-	/**
-	 * Exports the complete report as an XLS file
-	 * @return	boolean		False on error
-	 */
+            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n",'  ',$row['exe_date']).';';
+            $data .= str_replace("\r\n",'  ',$row['result']).';';
+            $data .= str_replace("\r\n",'  ',$row['max']).';';
+            $data .= "\n";
+        }
+
+        //output the results
+        $len = strlen($data);
+        header('Content-type: application/octet-stream');
+        header('Content-Type: application/force-download');
+        header('Content-length: '.$len);
+        if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
+            header('Content-Disposition: filename= '.$filename);
+        } else {
+            header('Content-Disposition: attachment; filename= '.$filename);
+        }
+        if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
+            header('Pragma: ');
+            header('Cache-Control: ');
+            header('Cache-Control: public'); // IE cannot download from sessions without a cache
+        }
+        header('Content-Description: '.$filename);
+        header('Content-transfer-encoding: binary');
+        // @todo add this utf-8 header for all csv files
+        echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
+        echo $data;
+        return true;
+    }
+
+    /**
+     * Exports the complete report as an XLS file
+     * @return	boolean		False on error
+     */
     public function exportCompleteReportXLS(
         $document_path = '',
         $user_id = null,
@@ -225,37 +225,37 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		global $charset;
-		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
-		$filename = 'exercise_results_'.api_get_local_time().'.xls';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
-		}
+        global $charset;
+        $this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
+        $filename = 'exercise_results_'.api_get_local_time().'.xls';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
+        }
 
         $spreadsheet = new PHPExcel();
         $spreadsheet->setActiveSheetIndex(0);
         $worksheet = $spreadsheet->getActiveSheet();
 
 
-		$line = 0;
-		$column = 0; //skip the first column (row titles)
+        $line = 0;
+        $column = 0; //skip the first column (row titles)
 
-		// check if exists column 'user'
-		$with_column_user = false;
-		foreach ($this->results as $result) {
-			if (!empty($result['last_name']) && !empty($result['first_name'])) {
-				$with_column_user = true;
-				break;
-			}
-		}
+        // check if exists column 'user'
+        $with_column_user = false;
+        foreach ($this->results as $result) {
+            if (!empty($result['last_name']) && !empty($result['first_name'])) {
+                $with_column_user = true;
+                break;
+            }
+        }
 
-		if ($with_column_user) {
-		    $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
-		    $column++;
+        if ($with_column_user) {
+            $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
+            $column++;
 
             if (api_is_western_name_order()) {
-    			$worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
-    			$column++;
+                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
+                $column++;
                 $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('LastName'));
                 $column++;
             } else {
@@ -264,36 +264,36 @@ 
                 $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
                 $column++;
             }
-		}
+        }
 
-		if ($export_user_fields) {
-			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+        if ($export_user_fields) {
+            //show user fields section with a big th colspan that spans over all fields
+            $extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 
-			//show the fields names for user fields
-			foreach ($extra_user_fields as $field) {
-				$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
-				$column++;
-			}
-		}
+            //show the fields names for user fields
+            foreach ($extra_user_fields as $field) {
+                $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
+                $column++;
+            }
+        }
 
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('EndDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
-		$column++;
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
+        $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Status'));
-		$line++;
+        $line++;
 
-		foreach ($this->results as $row) {
-			$column = 0;
+        foreach ($this->results as $row) {
+            $column = 0;
 
             if ($with_column_user) {
                 $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
@@ -310,38 +310,38 @@ 
                     $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
                 }
-			}
+            }
 
-			if ($export_user_fields) {
-				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
-					$column++;
-				}
-			}
+            if ($export_user_fields) {
+                //show user fields data, if any, for this user
+                $user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
+                foreach($user_fields_values as $value) {
+                    $worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+                    $column++;
+                }
+            }
 
-			$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['start_date']);
+            $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['start_date']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['end_date']);
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['end_date']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['duration']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['duration']);
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
-			$column++;
             $worksheet->SetCellValueByColumnAndRow($line,$column,$row['status']);
-			$line++;
-		}
+            $line++;
+        }
 
         $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
         $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
         $writer->save($file);
         DocumentManager::file_send_for_download($file, true, $filename);
 
-		return true;
-	}
+        return true;
+    }
 }

main/exercise/exercise_reminder.php

Indentation +3 added lines, -3 removed lines

@@ -223,10 +223,10 @@
 
     $counter++;
     if ($objExercise->type == ONE_PER_PAGE) {
-       $question_title = Display::url($counter.'. '.cut($objQuestionTmp->selectTitle(), 40), $url);
-       $question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40);
+        $question_title = Display::url($counter.'. '.cut($objQuestionTmp->selectTitle(), 40), $url);
+        $question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40);
     } else {
-       $question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40);
+        $question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40);
     }
     //Check if the question doesn't have an answer
     if (!in_array($questionId, $exercise_result)) {

main/exercise/hotpotatoes.lib.php

Indentation +1 added lines, -1 removed lines

@@ -344,7 +344,7 @@
                     if (is_dir($full_name)) {
                         $filelist[] = $file;
                     }
-               }
+                }
             }
         }
     }

main/exercise/answer.class.php

Indentation +322 added lines, -322 removed lines

@@ -157,12 +157,12 @@ 
         return [];
     }
 
-     /**
-     * returns all answer ids from this question Id
-     *
-     * @author Yoselyn Castillo
-     * @return array - $id (answer ids)
-     */
+        /**
+         * returns all answer ids from this question Id
+         *
+         * @author Yoselyn Castillo
+         * @return array - $id (answer ids)
+         */
     public function selectAnswerId()
     {
         $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
@@ -182,7 +182,7 @@ 
         }
 
         return $id;
-	}
+    }
 
     /**
      * Reads answer information from the data base ordered by parameter
@@ -193,23 +193,23 @@ 
      */
     public function readOrderedBy($field, $order='ASC')
     {
-		$field = Database::escape_string($field);
-		if (empty($field)) {
-			$field = 'position';
-		}
+        $field = Database::escape_string($field);
+        if (empty($field)) {
+            $field = 'position';
+        }
 
-		if ($order != 'ASC' && $order!='DESC') {
-			$order = 'ASC';
-		}
+        if ($order != 'ASC' && $order!='DESC') {
+            $order = 'ASC';
+        }
 
-		$TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
-		$TBL_QUIZ = Database::get_course_table(TABLE_QUIZ_QUESTION);
-		$questionId = intval($this->questionId);
+        $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
+        $TBL_QUIZ = Database::get_course_table(TABLE_QUIZ_QUESTION);
+        $questionId = intval($this->questionId);
 
-		$sql = "SELECT type FROM $TBL_QUIZ
+        $sql = "SELECT type FROM $TBL_QUIZ
 		        WHERE c_id = {$this->course_id} AND id = $questionId";
-		$result_question = Database::query($sql);
-		$questionType = Database::fetch_array($result_question);
+        $result_question = Database::query($sql);
+        $questionType = Database::fetch_array($result_question);
 
         if ($questionType['type'] == DRAGGABLE) {
             // Random is done by submit.js.tpl
@@ -218,7 +218,7 @@ 
             return true;
         }
 
-		$sql = "SELECT
+        $sql = "SELECT
 		            answer,
 		            correct,
 		            comment,
@@ -234,16 +234,16 @@ 
                     c_id = {$this->course_id} AND
                     question_id='".$questionId."'
                 ORDER BY $field $order";
-		$result=Database::query($sql);
-
-		$i = 1;
-		// while a record is found
-		$doubt_data = null;
-		while ($object = Database::fetch_object($result)) {
-		    if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && $object->position == 666) {
-		        $doubt_data = $object;
+        $result=Database::query($sql);
+
+        $i = 1;
+        // while a record is found
+        $doubt_data = null;
+        while ($object = Database::fetch_object($result)) {
+            if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && $object->position == 666) {
+                $doubt_data = $object;
                 continue;
-		    }
+            }
             $this->answer[$i] = $object->answer;
             $this->correct[$i] = $object->correct;
             $this->comment[$i] = $object->comment;
@@ -255,9 +255,9 @@ 
             $this->autoId[$i] = $object->id_auto;
             $this->iid[$i] = $object->iid;
             $i++;
-		}
+        }
 
-		if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && !empty($doubt_data)) {
+        if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && !empty($doubt_data)) {
             $this->answer[$i] = $doubt_data->answer;
             $this->correct[$i] = $doubt_data->correct;
             $this->comment[$i] = $doubt_data->comment;
@@ -269,88 +269,88 @@ 
             $this->autoId[$i] = $doubt_data->id_auto;
             $this->iid[$i] = $doubt_data->iid;
             $i++;
-	    }
+        }
         $this->nbrAnswers = $i-1;
-	}
-
-	/**
-	 * returns the autoincrement id identificator
-	 *
-	 * @author Juan Carlos Ra�a
-	 * @return integer - answer num
-	 */
+    }
+
+    /**
+     * returns the autoincrement id identificator
+     *
+     * @author Juan Carlos Ra�a
+     * @return integer - answer num
+     */
     public function selectAutoId($id)
     {
-		return isset($this->autoId[$id]) ? $this->autoId[$id] : 0;
-	}
-
-	/**
-	 * returns the number of answers in this question
-	 *
-	 * @author Olivier Brouckaert
-	 * @return integer - number of answers
-	 */
-	public function selectNbrAnswers()
+        return isset($this->autoId[$id]) ? $this->autoId[$id] : 0;
+    }
+
+    /**
+     * returns the number of answers in this question
+     *
+     * @author Olivier Brouckaert
+     * @return integer - number of answers
+     */
+    public function selectNbrAnswers()
+    {
+        return $this->nbrAnswers;
+    }
+
+    /**
+     * returns the question ID which the answers belong to
+     *
+     * @author Olivier Brouckaert
+     * @return integer - the question ID
+     */
+    public function selectQuestionId()
     {
-		return $this->nbrAnswers;
-	}
-
-	/**
-	 * returns the question ID which the answers belong to
-	 *
-	 * @author Olivier Brouckaert
-	 * @return integer - the question ID
-	 */
-	public function selectQuestionId()
+        return $this->questionId;
+    }
+
+    /**
+     * returns the question ID of the destination question
+     *
+     * @author Julio Montoya
+     * @param integer $id
+     * @return integer - the question ID
+     */
+    public function selectDestination($id)
     {
-		return $this->questionId;
-	}
-
-	/**
-	 * returns the question ID of the destination question
-	 *
-	 * @author Julio Montoya
-	 * @param integer $id
-	 * @return integer - the question ID
-	 */
-	public function selectDestination($id)
+        return isset($this->destination[$id]) ? $this->destination[$id] : null;
+    }
+
+    /**
+     * returns the answer title
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return string - answer title
+     */
+    public function selectAnswer($id)
     {
-		return isset($this->destination[$id]) ? $this->destination[$id] : null;
-	}
+        return isset($this->answer[$id]) ? $this->answer[$id] : null;
+    }
 
     /**
-	 * returns the answer title
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return string - answer title
-	 */
-	public function selectAnswer($id)
-	{
-		return isset($this->answer[$id]) ? $this->answer[$id] : null;
-	}
-
-	/**
-	 * return array answer by id else return a bool
-	 * @param integer $auto_id
-	 */
-	public function selectAnswerByAutoId($auto_id)
-	{
-		$TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
-
-		$auto_id = intval($auto_id);
-		$sql = "SELECT id, answer, id_auto FROM $TBL_ANSWER
+     * return array answer by id else return a bool
+     * @param integer $auto_id
+     */
+    public function selectAnswerByAutoId($auto_id)
+    {
+        $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
+
+        $auto_id = intval($auto_id);
+        $sql = "SELECT id, answer, id_auto FROM $TBL_ANSWER
 				WHERE c_id = {$this->course_id} AND id_auto='$auto_id'";
-		$rs = Database::query($sql);
+        $rs = Database::query($sql);
 
-		if (Database::num_rows($rs) > 0) {
-			$row = Database::fetch_array($rs, 'ASSOC');
+        if (Database::num_rows($rs) > 0) {
+            $row = Database::fetch_array($rs, 'ASSOC');
 
-			return $row;
-		}
+            return $row;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * returns the answer title from an answer's position
@@ -359,18 +359,18 @@ 
      * @param - integer $id - answer ID
      * @return bool - answer title
      */
-	public function selectAnswerIdByPosition($pos)
-	{
-		foreach ($this->position as $k => $v) {
-			if ($v != $pos) {
-				continue;
-			}
+    public function selectAnswerIdByPosition($pos)
+    {
+        foreach ($this->position as $k => $v) {
+            if ($v != $pos) {
+                continue;
+            }
 
-			return $k;
-		}
+            return $k;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * Returns a list of answers
@@ -379,18 +379,18 @@ 
      * of (id, answer, comment, grade) and grade=weighting
      */
     public function getAnswersList($decode = false)
-     {
-	 	$list = array();
-         for ($i = 1; $i <= $this->nbrAnswers; $i++) {
-             if (!empty($this->answer[$i])) {
-
-	 			//Avoid problems when parsing elements with accents
-	 			if ($decode) {
-	        		$this->answer[$i] 	= api_html_entity_decode($this->answer[$i], ENT_QUOTES, api_get_system_encoding());
-	        		$this->comment[$i]	= api_html_entity_decode($this->comment[$i], ENT_QUOTES, api_get_system_encoding());
-	 			}
-
-	 			$list[] = array(
+        {
+            $list = array();
+            for ($i = 1; $i <= $this->nbrAnswers; $i++) {
+                if (!empty($this->answer[$i])) {
+
+                    //Avoid problems when parsing elements with accents
+                    if ($decode) {
+                    $this->answer[$i] 	= api_html_entity_decode($this->answer[$i], ENT_QUOTES, api_get_system_encoding());
+                    $this->comment[$i]	= api_html_entity_decode($this->comment[$i], ENT_QUOTES, api_get_system_encoding());
+                    }
+
+                    $list[] = array(
                     'id' => $i,
                     'answer' => $this->answer[$i],
                     'comment' => $this->comment[$i],
@@ -399,137 +399,137 @@ 
                     'hotspot_type' => $this->hotspot_type[$i],
                     'correct' => $this->correct[$i],
                     'destination' => $this->destination[$i]
-				);
+                );
+            }
             }
-	 	}
 
-	 	return $list;
-	 }
+            return $list;
+        }
 
-	/**
-	 * Returns a list of grades
-	 * @author Yannick Warnier <ywarnier@beeznest.org>
-	 * @return array	List of grades where grade=weighting (?)
-	 */
+    /**
+     * Returns a list of grades
+     * @author Yannick Warnier <ywarnier@beeznest.org>
+     * @return array	List of grades where grade=weighting (?)
+     */
     public function getGradesList()
-     {
-	 	$list = array();
-	 	for ($i = 0; $i<$this->nbrAnswers;$i++){
-	 		if(!empty($this->answer[$i])){
-	 			$list[$i] = $this->weighting[$i];
-	 		}
-	 	}
-	 	return $list;
-	 }
-
-	 /**
-	  * Returns the question type
-	  * @author	Yannick Warnier <ywarnier@beeznest.org>
-	  * @return	integer	The type of the question this answer is bound to
-	  */
+        {
+            $list = array();
+            for ($i = 0; $i<$this->nbrAnswers;$i++){
+                if(!empty($this->answer[$i])){
+                    $list[$i] = $this->weighting[$i];
+                }
+            }
+            return $list;
+        }
+
+        /**
+         * Returns the question type
+         * @author	Yannick Warnier <ywarnier@beeznest.org>
+         * @return	integer	The type of the question this answer is bound to
+         */
     public function getQuestionType()
-     {
-	 	$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
-	 	$sql = "SELECT type FROM $TBL_QUESTIONS
+        {
+            $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
+            $sql = "SELECT type FROM $TBL_QUESTIONS
 	 	        WHERE c_id = {$this->course_id} AND id = '".$this->questionId."'";
-	 	$res = Database::query($sql);
-	 	if (Database::num_rows($res)<=0){
-	 		return null;
-	 	}
-	 	$row = Database::fetch_array($res);
-
-	 	return $row['type'];
-	 }
-
-
-	/**
-	 * tells if answer is correct or not
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return integer - 0 if bad answer, not 0 if good answer
-	 */
+            $res = Database::query($sql);
+            if (Database::num_rows($res)<=0){
+                return null;
+            }
+            $row = Database::fetch_array($res);
+
+            return $row['type'];
+        }
+
+
+    /**
+     * tells if answer is correct or not
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return integer - 0 if bad answer, not 0 if good answer
+     */
     public function isCorrect($id)
-	{
-		return isset($this->correct[$id]) ? $this->correct[$id] : null;
-	}
-
-	/**
-	 * returns answer comment
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return string - answer comment
-	 */
+    {
+        return isset($this->correct[$id]) ? $this->correct[$id] : null;
+    }
+
+    /**
+     * returns answer comment
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return string - answer comment
+     */
     public function selectComment($id)
-	{
+    {
         return isset($this->comment[$id]) ? $this->comment[$id] : null;
-	}
-
-	/**
-	 * returns answer weighting
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @param integer $id
-	 * @return integer - answer weighting
-	 */
+    }
+
+    /**
+     * returns answer weighting
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @param integer $id
+     * @return integer - answer weighting
+     */
     public function selectWeighting($id)
-	{
-		return isset($this->weighting[$id]) ? $this->weighting[$id] : null;
-	}
-
-	/**
-	 * returns answer position
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return integer - answer position
-	 */
-	function selectPosition($id)
-	{
-		return isset($this->position[$id]) ? $this->position[$id] : null;
-	}
-
-	/**
-	 * returns answer hotspot coordinates
-	 *
-	 * @author	Olivier Brouckaert
-	 * @param	integer	Answer ID
-	 * @param integer $id
-	 * @return	integer	Answer position
-	 */
+    {
+        return isset($this->weighting[$id]) ? $this->weighting[$id] : null;
+    }
+
+    /**
+     * returns answer position
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return integer - answer position
+     */
+    function selectPosition($id)
+    {
+        return isset($this->position[$id]) ? $this->position[$id] : null;
+    }
+
+    /**
+     * returns answer hotspot coordinates
+     *
+     * @author	Olivier Brouckaert
+     * @param	integer	Answer ID
+     * @param integer $id
+     * @return	integer	Answer position
+     */
     public function selectHotspotCoordinates($id)
-	{
-		return isset($this->hotspot_coordinates[$id]) ? $this->hotspot_coordinates[$id] : null;
-	}
-
-	/**
-	 * returns answer hotspot type
-	 *
-	 * @author	Toon Keppens
-	 * @param	integer		Answer ID
-	 * @param integer $id
-	 * @return	integer		Answer position
-	 */
+    {
+        return isset($this->hotspot_coordinates[$id]) ? $this->hotspot_coordinates[$id] : null;
+    }
+
+    /**
+     * returns answer hotspot type
+     *
+     * @author	Toon Keppens
+     * @param	integer		Answer ID
+     * @param integer $id
+     * @return	integer		Answer position
+     */
     public function selectHotspotType($id)
-	{
-		return isset($this->hotspot_type[$id]) ? $this->hotspot_type[$id] : null;
-	}
-
-	/**
-	 * Creates a new answer
-	 *
-	 * @author Olivier Brouckaert
-	 * @param string 	$answer answer title
-	 * @param integer 	$correct 0 if bad answer, not 0 if good answer
-	 * @param string 	$comment answer comment
-	 * @param integer 	$weighting answer weighting
-	 * @param integer 	$position answer position
-	 * @param array    $new_hotspot_coordinates Coordinates for hotspot exercises (optional)
-	 * @param integer	$new_hotspot_type Type for hotspot exercises (optional)
+    {
+        return isset($this->hotspot_type[$id]) ? $this->hotspot_type[$id] : null;
+    }
+
+    /**
+     * Creates a new answer
+     *
+     * @author Olivier Brouckaert
+     * @param string 	$answer answer title
+     * @param integer 	$correct 0 if bad answer, not 0 if good answer
+     * @param string 	$comment answer comment
+     * @param integer 	$weighting answer weighting
+     * @param integer 	$position answer position
+     * @param array    $new_hotspot_coordinates Coordinates for hotspot exercises (optional)
+     * @param integer	$new_hotspot_type Type for hotspot exercises (optional)
      * @param string   $destination
-	 */
+     */
     public function createAnswer(
         $answer,
         $correct,
@@ -540,7 +540,7 @@ 
         $new_hotspot_type = null,
         $destination = ''
     ) {
-		$this->new_nbrAnswers++;
+        $this->new_nbrAnswers++;
         $id = $this->new_nbrAnswers;
         $this->new_answer[$id] = $answer;
         $this->new_correct[$id] = $correct;
@@ -550,7 +550,7 @@ 
         $this->new_hotspot_coordinates[$id] = $new_hotspot_coordinates;
         $this->new_hotspot_type[$id] = $new_hotspot_type;
         $this->new_destination[$id] = $destination;
-	}
+    }
 
     /**
      * Updates an answer
@@ -591,31 +591,31 @@ 
         ];
 
         Database::update($answerTable, $params, ['iid = ?' => intval($iid)]);
-	}
+    }
 
-	/**
-	 * Records answers into the data base
-	 *
-	 * @author Olivier Brouckaert
-	 */
+    /**
+     * Records answers into the data base
+     *
+     * @author Olivier Brouckaert
+     */
     public function save()
     {
-		$answerTable = Database::get_course_table(TABLE_QUIZ_ANSWER);
-		$questionId = intval($this->questionId);
+        $answerTable = Database::get_course_table(TABLE_QUIZ_ANSWER);
+        $questionId = intval($this->questionId);
 
-		$c_id = $this->course['real_id'];
+        $c_id = $this->course['real_id'];
         $correctList = [];
         $answerList = [];
 
-		for ($i=1; $i <= $this->new_nbrAnswers; $i++) {
-			$answer = $this->new_answer[$i];
-			$correct = $this->new_correct[$i];
-			$comment = $this->new_comment[$i];
-			$weighting = $this->new_weighting[$i];
-			$position = $this->new_position[$i];
-			$hotspot_coordinates = $this->new_hotspot_coordinates[$i];
-			$hotspot_type = $this->new_hotspot_type[$i];
-			$destination = $this->new_destination[$i];
+        for ($i=1; $i <= $this->new_nbrAnswers; $i++) {
+            $answer = $this->new_answer[$i];
+            $correct = $this->new_correct[$i];
+            $comment = $this->new_comment[$i];
+            $weighting = $this->new_weighting[$i];
+            $position = $this->new_position[$i];
+            $hotspot_coordinates = $this->new_hotspot_coordinates[$i];
+            $hotspot_type = $this->new_hotspot_type[$i];
+            $destination = $this->new_destination[$i];
             $autoId = $this->selectAutoId($i);
             $iid = isset($this->iid[$i]) ? $this->iid[$i] : 0;
 
@@ -714,37 +714,37 @@ 
             }
         }
 
-		// moves $new_* arrays
-		$this->answer = $this->new_answer;
-		$this->correct = $this->new_correct;
-		$this->comment = $this->new_comment;
-		$this->weighting = $this->new_weighting;
-		$this->position = $this->new_position;
-		$this->hotspot_coordinates = $this->new_hotspot_coordinates;
-		$this->hotspot_type = $this->new_hotspot_type;
-
-		$this->nbrAnswers = $this->new_nbrAnswers;
-		$this->destination = $this->new_destination;
-		// clears $new_* arrays
-
-		$this->cancel();
-	}
-
-	/**
-	 * Duplicates answers by copying them into another question
-	 *
-	 * @author Olivier Brouckaert
-	 * @param  int question id
+        // moves $new_* arrays
+        $this->answer = $this->new_answer;
+        $this->correct = $this->new_correct;
+        $this->comment = $this->new_comment;
+        $this->weighting = $this->new_weighting;
+        $this->position = $this->new_position;
+        $this->hotspot_coordinates = $this->new_hotspot_coordinates;
+        $this->hotspot_type = $this->new_hotspot_type;
+
+        $this->nbrAnswers = $this->new_nbrAnswers;
+        $this->destination = $this->new_destination;
+        // clears $new_* arrays
+
+        $this->cancel();
+    }
+
+    /**
+     * Duplicates answers by copying them into another question
+     *
+     * @author Olivier Brouckaert
+     * @param  int question id
      * @param  array destination course info (result of the function api_get_course_info() )
      * @param string $newQuestionId
-	 */
+     */
     public function duplicate($newQuestionId, $course_info = null)
     {
         if (empty($course_info)) {
             $course_info = $this->course;
         }
 
-		$TBL_REPONSES = Database :: get_course_table(TABLE_QUIZ_ANSWER);
+        $TBL_REPONSES = Database :: get_course_table(TABLE_QUIZ_ANSWER);
         $fixed_list = array();
 
         if (self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE ||
@@ -758,7 +758,7 @@ 
 
             if (!empty($origin_options)) {
                 foreach ($origin_options as $item) {
-            	   $new_option_list[] = $item['id'];
+                    $new_option_list[] = $item['id'];
                 }
             }
 
@@ -772,12 +772,12 @@ 
             }
         }
 
-		// if at least one answer
-		if ($this->nbrAnswers) {
-			// inserts new answers into data base
-			$c_id = $course_info['real_id'];
+        // if at least one answer
+        if ($this->nbrAnswers) {
+            // inserts new answers into data base
+            $c_id = $course_info['real_id'];
 
-			for ($i=1;$i <= $this->nbrAnswers;$i++) {
+            for ($i=1;$i <= $this->nbrAnswers;$i++) {
                 if ($this->course['id'] != $course_info['id']) {
                     $this->answer[$i] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                         $this->answer[$i],
@@ -791,8 +791,8 @@ 
                     );
                 }
 
-				$answer = $this->answer[$i];
-				$correct = $this->correct[$i];
+                $answer = $this->answer[$i];
+                $correct = $this->correct[$i];
 
                 if (self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE ||
                     self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE
@@ -800,12 +800,12 @@ 
                     $correct = $fixed_list[intval($correct)];
                 }
 
-				$comment = $this->comment[$i];
-				$weighting = $this->weighting[$i];
-				$position = $this->position[$i];
-				$hotspot_coordinates = $this->hotspot_coordinates[$i];
-				$hotspot_type = $this->hotspot_type[$i];
-				$destination = $this->destination[$i];
+                $comment = $this->comment[$i];
+                $weighting = $this->weighting[$i];
+                $position = $this->position[$i];
+                $hotspot_coordinates = $this->hotspot_coordinates[$i];
+                $hotspot_type = $this->hotspot_type[$i];
+                $destination = $this->destination[$i];
 
                 $params = [
                     'c_id' => $c_id,
@@ -825,9 +825,9 @@ 
                     $sql = "UPDATE $TBL_REPONSES SET id = iid, id_auto = iid WHERE iid = $id";
                     Database::query($sql);
                 }
-			}
+            }
         }
-	}
+    }
 
     /**
      * Get the necessary JavaScript for some answers
@@ -845,25 +845,25 @@ 
             </script>";
     }
 
-	/**
-	 * Check if a answer is correct by an answer auto id
-	 * @param $needle int The answer auto id
-	 * @return bool
-	 */
-	public function isCorrectByAutoId($needle)
-	{
-		$key = 0;
-
-		foreach ($this->autoId as $autoIdKey => $autoId) {
-			if ($autoId == $needle) {
-				$key = $autoIdKey;
-			}
-		}
-
-		if (!$key) {
-			return false;
-		}
-
-		return $this->isCorrect($key) ? true : false;
-	}
+    /**
+     * Check if a answer is correct by an answer auto id
+     * @param $needle int The answer auto id
+     * @return bool
+     */
+    public function isCorrectByAutoId($needle)
+    {
+        $key = 0;
+
+        foreach ($this->autoId as $autoIdKey => $autoId) {
+            if ($autoId == $needle) {
+                $key = $autoIdKey;
+            }
+        }
+
+        if (!$key) {
+            return false;
+        }
+
+        return $this->isCorrect($key) ? true : false;
+    }
 }

main/exercise/hotspot_savescore.inc.php

Indentation +6 added lines, -6 removed lines

@@ -17,15 +17,15 @@
 $answerOrderId = count($_SESSION['exerciseResult'][$questionId]['ids'])+1;
 if ($_GET['answerId'] == "0") // click is NOT on a hotspot
 {
-	$hit = 0;
-	$answerId = NULL;
+    $hit = 0;
+    $answerId = NULL;
 }
 else // user clicked ON a hotspot
 {
-	$hit = 1;
-	$answerId = api_substr($_GET['answerId'],22,2);
-	// Save into session
-	$_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
+    $hit = 1;
+    $answerId = api_substr($_GET['answerId'],22,2);
+    // Save into session
+    $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
 }
 //round-up the coordinates
 $coords = explode('/',$coordinates);

main/exercise/multiple_answer_true_false.class.php

Indentation +19 added lines, -19 removed lines

@@ -241,13 +241,13 @@ 
     }
 
     /**
-	 * abstract function which creates the form to create / edit the answers of the question
-	 * @param FormValidator $form
-	 */
+     * abstract function which creates the form to create / edit the answers of the question
+     * @param FormValidator $form
+     */
     public function processAnswersCreation($form)
     {
-		$questionWeighting = $nbrGoodAnswers = 0;
-		$objAnswer = new Answer($this->id);
+        $questionWeighting = $nbrGoodAnswers = 0;
+        $objAnswer = new Answer($this->id);
         $nb_answers = $form->getSubmitValue('nb_answers');
         //$options_count    = $form->getSubmitValue('options_count');
         $course_id = api_get_course_int_id();
@@ -269,7 +269,7 @@ 
                     $course_id,
                     $i
                 );
-               $correct[$i] = $last_id;
+                $correct[$i] = $last_id;
             }
         }
 
@@ -280,7 +280,7 @@ 
 
         $sorted_by_position = array();
         foreach ($new_options as $item) {
-        	$sorted_by_position[$item['position']] = $item;
+            $sorted_by_position[$item['position']] = $item;
         }
 
         /* Saving quiz_question.extra values that has the correct scores of
@@ -293,7 +293,7 @@ 
         }
         $this->setExtra(implode(':', $extra_values));
 
-		for ($i = 1; $i <= $nb_answers; $i++) {
+        for ($i = 1; $i <= $nb_answers; $i++) {
             $answer = trim($form->getSubmitValue('answer['.$i.']'));
             $comment = trim($form->getSubmitValue('comment['.$i.']'));
             $goodAnswer = trim($form->getSubmitValue('correct['.$i.']'));
@@ -302,18 +302,18 @@ 
                 // change the default values from the form 1 and 2 by the correct "option id" registered
                 $goodAnswer = $sorted_by_position[$goodAnswer]['id'];
             }
-    	    $questionWeighting += $extra_values[0]; //By default 0 has the correct answers
+            $questionWeighting += $extra_values[0]; //By default 0 has the correct answers
 
-        	$objAnswer->createAnswer($answer, $goodAnswer, $comment,'',$i);
+            $objAnswer->createAnswer($answer, $goodAnswer, $comment,'',$i);
         }
 
-    	// saves the answers into the data base
+        // saves the answers into the data base
         $objAnswer->save();
 
         // sets the total weighting of the question
         $this->updateWeighting($questionWeighting);
         $this->save();
-	}
+    }
 
     /**
      * @param int $feedback_type
@@ -324,17 +324,17 @@ 
     function return_header($feedback_type = null, $counter = null, $score = null)
     {
         $header = parent::return_header($feedback_type, $counter, $score);
-  	    $header .= '<table class="'.$this->question_table_class .'">
+            $header .= '<table class="'.$this->question_table_class .'">
 		<tr>
 			<th>'.get_lang("Choice").'</th>
 			<th>'. get_lang("ExpectedChoice").'</th>
 			<th>'. get_lang("Answer").'</th>';
-			if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
-				$header .= '<th>'.get_lang("Comment").'</th>';
-			} else {
-				$header .= '<th>&nbsp;</th>';
-			}
+            if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
+                $header .= '<th>'.get_lang("Comment").'</th>';
+            } else {
+                $header .= '<th>&nbsp;</th>';
+            }
         $header .= '</tr>';
         return $header;
-	}
+    }
 }

main/exercise/hotspot_save.inc.php

Indentation +16 added lines, -16 removed lines

@@ -15,24 +15,24 @@
 $answerId 	= intval($_GET['answerId']);
 
 if ($_GET['type'] == "square" || $_GET['type'] == "circle") {
-	$hotspot_type = $_GET['type'];
-	$hotspot_coordinates = $_GET['x'].";".$_GET['y']."|".$_GET['width']."|".$_GET['height'];
+    $hotspot_type = $_GET['type'];
+    $hotspot_coordinates = $_GET['x'].";".$_GET['y']."|".$_GET['width']."|".$_GET['height'];
 }
 if ($_GET['type'] == "poly" || $_GET['type'] == "delineation" || $_GET['type'] == "oar") {
-	$hotspot_type = $_GET['type'];
-	$tmp_coord = explode(",",$_GET['co']);
-	$i = 0;
-	$hotspot_coordinates = "";
-	foreach ($tmp_coord as $coord) {
-		if ($i%2 == 0) {
-			$delimiter = ";";
-		} else {
-			$delimiter = "|";
-		}
-		$hotspot_coordinates .= $coord.$delimiter;
-		$i++;
-	}
-	$hotspot_coordinates = api_substr($hotspot_coordinates,0,-2);
+    $hotspot_type = $_GET['type'];
+    $tmp_coord = explode(",",$_GET['co']);
+    $i = 0;
+    $hotspot_coordinates = "";
+    foreach ($tmp_coord as $coord) {
+        if ($i%2 == 0) {
+            $delimiter = ";";
+        } else {
+            $delimiter = "|";
+        }
+        $hotspot_coordinates .= $coord.$delimiter;
+        $i++;
+    }
+    $hotspot_coordinates = api_substr($hotspot_coordinates,0,-2);
 }
 $course_id = api_get_course_int_id();
 $sql = "UPDATE $TBL_ANSWER SET