chamilo / chamilo-lms

main/exercice/TestCategory.php

Indentation +253 added lines, -253 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,196 +251,196 @@ 
      *
      * @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
-	 */
-	public static function getListOfCategoriesIDForTest($in_testid)
+        $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
+     */
+    public static function getListOfCategoriesIDForTest($in_testid)
     {
-		// parcourir les questions d'un test, recup les categories uniques dans un tableau
-		$result = array();
-		$quiz = new Exercise();
-		$quiz->read($in_testid);
-		$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 (!in_array(TestCategory::getCategoryForQuestion($tabQuestionList[$i]), $result)) {
-				$result[] = TestCategory::getCategoryForQuestion($tabQuestionList[$i]);
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * return the list of different categories NAME for a test
-	 * input : test_id
-	 * return : array of string
-	 * hubert.borderiou 07-04-2011
+        // parcourir les questions d'un test, recup les categories uniques dans un tableau
+        $result = array();
+        $quiz = new Exercise();
+        $quiz->read($in_testid);
+        $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 (!in_array(TestCategory::getCategoryForQuestion($tabQuestionList[$i]), $result)) {
+                $result[] = TestCategory::getCategoryForQuestion($tabQuestionList[$i]);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * return the list of different categories NAME for a test
+     * input : test_id
+     * return : array of string
+     * hubert.borderiou 07-04-2011
      * @author function rewrote by jmontoya
-	 */
-	public static function getListOfCategoriesNameForTest($in_testid)
+     */
+    public static function getListOfCategoriesNameForTest($in_testid)
     {
-		$tabcatName = array();
-		$tabcatID = self::getListOfCategoriesIDForTest($in_testid);
-		for ($i=0; $i < count($tabcatID); $i++) {
-			$cat = new TestCategory($tabcatID[$i]);
-			$tabcatName[$cat->id] = $cat->name;
-		}
-		return $tabcatName;
-	}
-
-	/**
-	 * return the number of differents categories for a test
-	 * input : test_id
-	 * return : integer
-	 * hubert.borderiou 07-04-2011
-	 */
-	public static function getNumberOfCategoriesForTest($in_testid)
+        $tabcatName = array();
+        $tabcatID = self::getListOfCategoriesIDForTest($in_testid);
+        for ($i=0; $i < count($tabcatID); $i++) {
+            $cat = new TestCategory($tabcatID[$i]);
+            $tabcatName[$cat->id] = $cat->name;
+        }
+        return $tabcatName;
+    }
+
+    /**
+     * return the number of differents categories for a test
+     * input : test_id
+     * return : integer
+     * hubert.borderiou 07-04-2011
+     */
+    public static function getNumberOfCategoriesForTest($in_testid)
     {
-		return count(TestCategory::getListOfCategoriesIDForTest($in_testid));
-	}
+        return count(TestCategory::getListOfCategoriesIDForTest($in_testid));
+    }
 
-	/**
-	 * 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);
-		for ($i=0; $i < count($tabcatid); $i++) {
-			if ($tabcatid[$i] > 0) {	// 0 = no category for this questio
-				$nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
-				if ($nbQuestionInThisCat > $in_nbrandom) {
-					$nbquestionresult += $in_nbrandom;
-				}
-				else {
-					$nbquestionresult += $nbQuestionInThisCat;
-				}
-			}
-		}
-		return $nbquestionresult;
-	}
-
-	/**
-	 * Return an array (id=>name)
-	 * tabresult[0] = get_lang('NoCategory');
+        $nbquestionresult = 0;
+        $tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
+        for ($i=0; $i < count($tabcatid); $i++) {
+            if ($tabcatid[$i] > 0) {	// 0 = no category for this questio
+                $nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
+                if ($nbQuestionInThisCat > $in_nbrandom) {
+                    $nbquestionresult += $in_nbrandom;
+                }
+                else {
+                    $nbquestionresult += $nbQuestionInThisCat;
+                }
+            }
+        }
+        return $nbquestionresult;
+    }
+
+    /**
+     * 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;
+    }
 
     /**
-    * return an array of question_id for each category
-    * tabres[0] = array of question id with category id = 0 (i.e. no category)
-    * tabres[24] = array of question id with category id = 24
-    * In this version, a question has 0 or 1 category
-    *
-    * @param int $exerciseId
-    * @return array
-    */
+     * return an array of question_id for each category
+     * tabres[0] = array of question id with category id = 0 (i.e. no category)
+     * tabres[24] = array of question id with category id = 24
+     * In this version, a question has 0 or 1 category
+     *
+     * @param int $exerciseId
+     * @return array
+     */
     public static function getQuestionsByCat($exerciseId)
     {
         $em = Database::getManager();
@@ -469,29 +469,29 @@ 
             }
             $list[$data['categoryId']][] = $data['questionId'];
         }
-		return $list;
-	}
+        return $list;
+    }
 
-	/**
-	 * 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
@@ -507,71 +507,71 @@ 
             $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 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);
-		for ($i=0; $i < count($tabcatid); $i++) {
-			if ($tabcatid[$i] > 0) {	// 0 = no category for this question
-				$nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
+        $tabcatid = TestCategory::getListOfCategoriesIDForTest($exerciseId);
+        for ($i=0; $i < count($tabcatid); $i++) {
+            if ($tabcatid[$i] > 0) {	// 0 = no category for this question
+                $nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($exerciseId, $tabcatid[$i]);
                 if ($nbQuestionInThisCat > $res_num_max) {
                     $res_num_max = $nbQuestionInThisCat;
                 }
-			}
-		}
+            }
+        }
         return $res_num_max;
     }
 
@@ -677,8 +677,8 @@ 
      * @param int $categoryId
      * @param int $questionId
      * @param int $courseId
-	 *
-	 * @return int
+     *
+     * @return int
      */
     public static function add_category_for_question_id($categoryId, $questionId, $courseId)
     {
@@ -686,18 +686,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/exercice/exercise_show.php

Indentation +152 added lines, -152 removed lines

@@ -92,7 +92,7 @@ 
 $locked = api_resource_is_locked_by_gradebook($exercise_id, LINK_EXERCISE);
 
 if (empty($objExercise)) {
-	$objExercise = new Exercise();
+    $objExercise = new Exercise();
     $objExercise->read($exercise_id);
 }
 $feedback_type = $objExercise->feedback_type;
@@ -100,16 +100,16 @@ 
 //Only users can see their own results
 if (!$is_allowedToEdit) {
     if ($student_id != $current_user_id) {
-    	api_not_allowed(true);
+        api_not_allowed(true);
     }
 }
 
 if (isset($_SESSION['gradebook'])) {
-	$gradebook=	Security::remove_XSS($_SESSION['gradebook']);
+    $gradebook=	Security::remove_XSS($_SESSION['gradebook']);
 }
 
 if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'],'name' => get_lang('ToolGradebook'));
+    $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'],'name' => get_lang('ToolGradebook'));
 }
 
 $fromlink = '';
@@ -124,14 +124,14 @@ 
 $htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/js/hotspot.js"></script>';
 
 if ($origin != 'learnpath') {
-	Display::display_header('');
+    Display::display_header('');
 } else {
     $htmlHeadXtra[] = "
     <style>
     body { background: none;}
     </style>
     ";
-	Display::display_reduced_header();
+    Display::display_reduced_header();
 }
 ?>
 <script>
@@ -210,12 +210,12 @@ 
         }
     }
 } else {
-	Display::display_warning_message(get_lang('CantViewResults'));
-	$show_results = false;
+    Display::display_warning_message(get_lang('CantViewResults'));
+    $show_results = false;
 }
 
 if ($origin == 'learnpath' && !isset($_GET['fb_type']) ) {
-	$show_results = false;
+    $show_results = false;
 }
 
 if ($show_results || $show_only_total_score) {
@@ -260,13 +260,13 @@ 
 $exerciseResult = array();
 
 while ($row = Database::fetch_array($result)) {
-	$question_list_from_database[] = $row['question_id'];
-	$exerciseResult[$row['question_id']] = $row['answer'];
+    $question_list_from_database[] = $row['question_id'];
+    $exerciseResult[$row['question_id']] = $row['answer'];
 }
 
 //Fixing #2073 Fixing order of questions
 if (!empty($track_exercise_info['data_tracking'])) {
-	$temp_question_list = explode(',', $track_exercise_info['data_tracking']);
+    $temp_question_list = explode(',', $track_exercise_info['data_tracking']);
 
     // Getting question list from data_tracking
     if (!empty($temp_question_list)) {
@@ -306,64 +306,64 @@ 
 
 foreach ($questionList as $questionId) {
 
-	$choice = $exerciseResult[$questionId];
-	// destruction of the Question object
-	unset($objQuestionTmp);
+    $choice = $exerciseResult[$questionId];
+    // destruction of the Question object
+    unset($objQuestionTmp);
 
-	// creates a temporary Question object
-	$objQuestionTmp 	= Question::read($questionId);
-	$questionWeighting	= $objQuestionTmp->selectWeighting();
-	$answerType			= $objQuestionTmp->selectType();
+    // creates a temporary Question object
+    $objQuestionTmp 	= Question::read($questionId);
+    $questionWeighting	= $objQuestionTmp->selectWeighting();
+    $answerType			= $objQuestionTmp->selectType();
 
-	// Start buffer
+    // Start buffer
     ob_start();
 
     /* Use switch
     switch ($answerType) {
     }*/
 
-	if ($answerType == MULTIPLE_ANSWER || $answerType == MULTIPLE_ANSWER_TRUE_FALSE) {
+    if ($answerType == MULTIPLE_ANSWER || $answerType == MULTIPLE_ANSWER_TRUE_FALSE) {
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore      += $question_result['score'];
-	} elseif ($answerType == MULTIPLE_ANSWER_COMBINATION || $answerType ==  MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
-		$choice = array();
+    } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION || $answerType ==  MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
+        $choice = array();
+        $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
+        $questionScore   = $question_result['score'];
+        $totalScore     += $question_result['score'];
+    } elseif ($answerType == UNIQUE_ANSWER || $answerType ==  UNIQUE_ANSWER_NO_OPTION) {
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
-	} elseif ($answerType == UNIQUE_ANSWER || $answerType ==  UNIQUE_ANSWER_NO_OPTION) {
+        echo '</table>';
+    } elseif ($answerType == FILL_IN_BLANKS) {
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
-		echo '</table>';
-	} elseif ($answerType == FILL_IN_BLANKS) {
+    } elseif ($answerType == GLOBAL_MULTIPLE_ANSWER) {
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
-	} elseif ($answerType == GLOBAL_MULTIPLE_ANSWER) {
+    } elseif ($answerType == FREE_ANSWER) {
+        $answer = $str;
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
-	} elseif ($answerType == FREE_ANSWER) {
+    } elseif ($answerType == ORAL_EXPRESSION) {
         $answer = $str;
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
-	} elseif ($answerType == ORAL_EXPRESSION) {
-		$answer = $str;
-		$question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
-		$questionScore   = $question_result['score'];
-		$totalScore     += $question_result['score'];
         } elseif (in_array($answerType, [MATCHING, DRAGGABLE, MATCHING_DRAGGABLE])) {
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore   = $question_result['score'];
         $totalScore     += $question_result['score'];
-	} elseif ($answerType == HOT_SPOT) {
-	    if ($show_results) {
-		    echo '<table width="500" border="0"><tr>
+    } elseif ($answerType == HOT_SPOT) {
+        if ($show_results) {
+            echo '<table width="500" border="0"><tr>
                     <td valign="top" align="center" style="padding-left:0px;" >
                         <table border="1" bordercolor="#A4A4A4" style="border-collapse: collapse;" width="552">';
-		}
+        }
         $question_result = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg());
         $questionScore  = $question_result['score'];
         $totalScore    += $question_result['score'];
@@ -392,7 +392,7 @@ 
                 <br>
             ";
         }
-	} else if($answerType == HOT_SPOT_DELINEATION) {
+    } else if($answerType == HOT_SPOT_DELINEATION) {
 
         $question_result  = $objExercise->manage_answer($id, $questionId, $choice,'exercise_show', array(), false, true, $show_results, $objExercise->selectPropagateNeg(), 'database');
 
@@ -535,15 +535,15 @@ 
                 </table>
             ";
         }
-	}
+    }
 
-	if ($show_results) {
-	    if ($answerType != HOT_SPOT) {
-	        echo '</table>';
-	    }
-	}
+    if ($show_results) {
+        if ($answerType != HOT_SPOT) {
+            echo '</table>';
+        }
+    }
 
-	$comnt = null;
+    $comnt = null;
 
     if ($show_results) {
         if (
@@ -560,40 +560,40 @@ 
 
         $marksname = '';
 
-		if ($isFeedbackAllowed) {
-			$name = "fckdiv".$questionId;
-			$marksname = "marksName".$questionId;
-			if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
-				$url_name = get_lang('EditCommentsAndMarks');
-			} else {
-				if ($action=='edit') {
-					$url_name = get_lang('EditIndividualComment');
-				} else {
-					$url_name = get_lang('AddComments');
-				}
-			}
+        if ($isFeedbackAllowed) {
+            $name = "fckdiv".$questionId;
+            $marksname = "marksName".$questionId;
+            if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
+                $url_name = get_lang('EditCommentsAndMarks');
+            } else {
+                if ($action=='edit') {
+                    $url_name = get_lang('EditIndividualComment');
+                } else {
+                    $url_name = get_lang('AddComments');
+                }
+            }
             echo '<br />';
             echo Display::url($url_name, 'javascript://', array('class' => 'btn', 'onclick'=>"showfck('".$name."', '".$marksname."');"));
-			echo '<br />';
+            echo '<br />';
 
             echo '<div id="feedback_'.$name.'" style="width:100%">';
-			$comnt = trim(Event::get_comments($id, $questionId));
-			if (empty($comnt)) {
-				echo '<br />';
-			} else {
-				echo '<div id="question_feedback">'.$comnt.'</div>';
-			}
-			echo '</div>';
+            $comnt = trim(Event::get_comments($id, $questionId));
+            if (empty($comnt)) {
+                echo '<br />';
+            } else {
+                echo '<div id="question_feedback">'.$comnt.'</div>';
+            }
+            echo '</div>';
 
             echo '<div id="'.$name.'" style="display:none">';
-			$arrid[] = $questionId;
-			$feedback_form = new FormValidator('frmcomments'.$questionId,'post','');
-			$feedback_form->addElement('html','<br>');
-			$renderer =& $feedback_form->defaultRenderer();
-			$renderer->setFormTemplate('<form{attributes}><div align="left">{content}</div></form>');
-			$renderer->setCustomElementTemplate('<div align="left">{element}</div>');
-			$comnt = Event::get_comments($id, $questionId);
-			$default = array('comments_'.$questionId =>  $comnt);
+            $arrid[] = $questionId;
+            $feedback_form = new FormValidator('frmcomments'.$questionId,'post','');
+            $feedback_form->addElement('html','<br>');
+            $renderer =& $feedback_form->defaultRenderer();
+            $renderer->setFormTemplate('<form{attributes}><div align="left">{content}</div></form>');
+            $renderer->setCustomElementTemplate('<div align="left">{element}</div>');
+            $comnt = Event::get_comments($id, $questionId);
+            $default = array('comments_'.$questionId =>  $comnt);
 
             if ($useAdvancedEditor) {
                 $feedback_form->addElement(
@@ -610,52 +610,52 @@ 
             } else {
                 $feedback_form->addElement('textarea', 'comments_' . $questionId);
             }
-			$feedback_form->addElement('html','<br>');
-			$feedback_form->setDefaults($default);
-			$feedback_form->display();
-			echo '</div>';
-
-		} else {
-			$comnt = Event::get_comments($id, $questionId);
-			echo '<br />';
-			if (!empty($comnt)) {
-				echo '<b>'.get_lang('Feedback').'</b>';
-				echo '<div id="question_feedback">'.$comnt.'</div>';
-			}
-		}
-
-		if ($is_allowedToEdit && $isFeedbackAllowed) {
-			if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
-				$marksname = "marksName".$questionId;
+            $feedback_form->addElement('html','<br>');
+            $feedback_form->setDefaults($default);
+            $feedback_form->display();
+            echo '</div>';
+
+        } else {
+            $comnt = Event::get_comments($id, $questionId);
+            echo '<br />';
+            if (!empty($comnt)) {
+                echo '<b>'.get_lang('Feedback').'</b>';
+                echo '<div id="question_feedback">'.$comnt.'</div>';
+            }
+        }
+
+        if ($is_allowedToEdit && $isFeedbackAllowed) {
+            if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
+                $marksname = "marksName".$questionId;
                 echo '<div id="'.$marksname.'" style="display:none">';
                 echo '<form name="marksform_'.$questionId.'" method="post" action="">';
-				$arrmarks[] = $questionId;
-				echo get_lang("AssignMarks");
-				echo "&nbsp;<select name='marks' id='marks'>";
-				for ($i=0;$i<=$questionWeighting;$i++) {
-					echo '<option '.(($i==$questionScore)?"selected='selected'":'').'>'.$i.'</option>';
-				}
-				echo '</select>';
-				echo '</form><br /></div>';
-
-				if ($questionScore == -1 ) {
-					$questionScore = 0;
-				  	echo Display::return_message(get_lang('notCorrectedYet'));
-				}
-			} else {
-				$arrmarks[] = $questionId;
-				echo '<div id="'.$marksname.'" style="display:none"><form name="marksform_'.$questionId.'" method="post" action="">
+                $arrmarks[] = $questionId;
+                echo get_lang("AssignMarks");
+                echo "&nbsp;<select name='marks' id='marks'>";
+                for ($i=0;$i<=$questionWeighting;$i++) {
+                    echo '<option '.(($i==$questionScore)?"selected='selected'":'').'>'.$i.'</option>';
+                }
+                echo '</select>';
+                echo '</form><br /></div>';
+
+                if ($questionScore == -1 ) {
+                    $questionScore = 0;
+                        echo Display::return_message(get_lang('notCorrectedYet'));
+                }
+            } else {
+                $arrmarks[] = $questionId;
+                echo '<div id="'.$marksname.'" style="display:none"><form name="marksform_'.$questionId.'" method="post" action="">
 					  <select name="marks" id="marks" style="display:none;"><option>'.$questionScore.'</option></select></form><br/ ></div>';
-			}
-		} else {
-			if ($questionScore == -1) {
-				 $questionScore = 0;
-			}
-		}
-	}
+            }
+        } else {
+            if ($questionScore == -1) {
+                    $questionScore = 0;
+            }
+        }
+    }
 
     $my_total_score  = $questionScore;
-	$my_total_weight = $questionWeighting;
+    $my_total_weight = $questionWeighting;
     $totalWeighting += $questionWeighting;
     $category_was_added_for_this_test = false;
 
@@ -701,7 +701,7 @@ 
 
     $score = array();
     if ($show_results) {
-		$score['result'] = get_lang('Score')." : ".ExerciseLib::show_score($my_total_score, $my_total_weight, false, false);
+        $score['result'] = get_lang('Score')." : ".ExerciseLib::show_score($my_total_score, $my_total_weight, false, false);
         $score['pass']   = $my_total_score >= $my_total_weight ? true : false;
         $score['type']   = $answerType;
         $score['score']  = $my_total_score;
@@ -709,18 +709,18 @@ 
         $score['comments'] = isset($comnt) ? $comnt : null;
     }
 
-	unset($objAnswerTmp);
-	$i++;
+    unset($objAnswerTmp);
+    $i++;
 
     $contents = ob_get_clean();
 
     $question_content = '<div class="question_row">';
 
- 	if ($show_results) {
+        if ($show_results) {
         //Shows question title an description
-	    $question_content .= $objQuestionTmp->return_header(null, $counter, $score);
-	}
-	$counter++;
+        $question_content .= $objQuestionTmp->return_header(null, $counter, $score);
+    }
+    $counter++;
     $question_content .= $contents;
     $question_content .= '</div>';
     $exercise_content .= $question_content;
@@ -730,12 +730,12 @@ 
 
 //Total score
 if ($origin!='learnpath' || ($origin == 'learnpath' && isset($_GET['fb_type']))) {
-	if ($show_results || $show_only_total_score) {
+    if ($show_results || $show_only_total_score) {
         $total_score_text .= '<div class="question_row">';
         $my_total_score_temp = $totalScore;
-	    if ($objExercise->selectPropagateNeg() == 0 && $my_total_score_temp < 0) {
-	        $my_total_score_temp = 0;
-	    }
+        if ($objExercise->selectPropagateNeg() == 0 && $my_total_score_temp < 0) {
+            $my_total_score_temp = 0;
+        }
         $total_score_text .= ExerciseLib::get_question_ribbon(
             $objExercise,
             $my_total_score_temp,
@@ -743,7 +743,7 @@ 
             true
         );
         $total_score_text .= '</div>';
-	}
+    }
 }
 
 if (!empty($category_list) && ($show_results || $show_only_total_score)) {
@@ -767,25 +767,25 @@ 
 }
 
 if ($isFeedbackAllowed) {
-	if (in_array($origin, array('tracking_course','user_course','correct_exercise_in_lp'))) {
-		echo '<form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=2&comments=update&exeid='.$id.'&origin='.$origin.'&details=true&course='.Security::remove_XSS($_GET['cidReq']).$fromlink.'" method="post">';
-		echo '<input type = "hidden" name="lp_item_id"       value="'.$learnpath_id.'">';
-		echo '<input type = "hidden" name="lp_item_view_id"  value="'.$lp_item_view_id.'">';
-		echo '<input type = "hidden" name="student_id"       value="'.$student_id.'">';
-		echo '<input type = "hidden" name="total_score"      value="'.$totalScore.'"> ';
-		echo '<input type = "hidden" name="my_exe_exo_id"    value="'.$exercise_id.'"> ';
-	} else {
-		echo ' <form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=1&comments=update&exeid='.$id.'" method="post">';
-	}
-	if ($origin !='learnpath' && $origin!='student_progress') {
+    if (in_array($origin, array('tracking_course','user_course','correct_exercise_in_lp'))) {
+        echo '<form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=2&comments=update&exeid='.$id.'&origin='.$origin.'&details=true&course='.Security::remove_XSS($_GET['cidReq']).$fromlink.'" method="post">';
+        echo '<input type = "hidden" name="lp_item_id"       value="'.$learnpath_id.'">';
+        echo '<input type = "hidden" name="lp_item_view_id"  value="'.$lp_item_view_id.'">';
+        echo '<input type = "hidden" name="student_id"       value="'.$student_id.'">';
+        echo '<input type = "hidden" name="total_score"      value="'.$totalScore.'"> ';
+        echo '<input type = "hidden" name="my_exe_exo_id"    value="'.$exercise_id.'"> ';
+    } else {
+        echo ' <form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=1&comments=update&exeid='.$id.'" method="post">';
+    }
+    if ($origin !='learnpath' && $origin!='student_progress') {
         echo '<label><input type= "checkbox" name="send_notification"> '.get_lang('SendEmail').'</label>';
-		?>
+        ?>
         <button type="submit" class="btn btn-primary" value="<?php echo get_lang('Ok'); ?>" onclick="getFCK('<?php echo $strids; ?>','<?php echo $marksid; ?>');">
             <?php echo get_lang('CorrectTest'); ?>
         </button>
 		</form>
 		<?php
-	}
+    }
 }
 
 //Came from lpstats in a lp
@@ -802,21 +802,21 @@ 
 }
 
 if ($origin != 'learnpath') {
-	//we are not in learnpath tool
-	Display::display_footer();
+    //we are not in learnpath tool
+    Display::display_footer();
 } else {
-	if (!isset($_GET['fb_type'])) {
-		$lp_mode =  $_SESSION['lp_mode'];
-		$url = '../newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exeId.'&fb_type='.$feedback_type;
-		$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'" ';
-		echo '<script type="text/javascript">'.$href.'</script>';
-		// Record the results in the learning path, using the SCORM interface (API)
-		echo "<script>window.parent.API.void_save_asset('$totalScore', '$totalWeighting', 0, 'completed'); </script>";
-		echo '</body></html>';
-	} else {
-		Display::display_normal_message(get_lang('ExerciseFinished').' '.get_lang('ToContinueUseMenu'));
+    if (!isset($_GET['fb_type'])) {
+        $lp_mode =  $_SESSION['lp_mode'];
+        $url = '../newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exeId.'&fb_type='.$feedback_type;
+        $href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'" ';
+        echo '<script type="text/javascript">'.$href.'</script>';
+        // Record the results in the learning path, using the SCORM interface (API)
+        echo "<script>window.parent.API.void_save_asset('$totalScore', '$totalWeighting', 0, 'completed'); </script>";
+        echo '</body></html>';
+    } else {
+        Display::display_normal_message(get_lang('ExerciseFinished').' '.get_lang('ToContinueUseMenu'));
         echo '<br />';
-	}
+    }
 }
 
 // Destroying the session

main/exercice/multiple_answer_combination.class.php

Indentation +4 added lines, -4 removed lines

@@ -178,9 +178,9 @@ 
     }
 
     /**
-	 * 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;
@@ -221,7 +221,7 @@ 
         // sets the total weighting of the question
         $this->updateWeighting($questionWeighting);
         $this->save();
-	}
+    }
 
     function return_header($feedback_type = null, $counter = null, $score = null)
     {

main/exercice/live_stats.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 $result = $objExercise->read($exercise_id);
 
 if (!$result) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $interbreadcrumb[] = array(

main/exercice/feedback.php

Indentation +26 added lines, -26 removed lines

@@ -13,14 +13,14 @@ 
 $nameTools=get_lang('ExerciseManagement');
 
 if (isset($_SESSION['gradebook'])){
-	$gradebook=	$_SESSION['gradebook'];
+    $gradebook=	$_SESSION['gradebook'];
 }
 
 if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array (
-			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
-			'name' => get_lang('ToolGradebook')
-		);
+    $interbreadcrumb[]= array (
+            'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+            'name' => get_lang('ToolGradebook')
+        );
 }
 
 $interbreadcrumb[]=array("url" => "exercise.php","name" => get_lang('Exercises'));
@@ -31,24 +31,24 @@ 
   <?php echo "Add Feedback"; ?>
 </h4>
 <?php
-	$id = $_REQUEST['question'];
-	$objQuestionTmp = Question::read($id);
-	echo "<tr><td><b>".get_lang('Question')." : </b>";
-	echo $objQuestionTmp->selectTitle();
-	echo "</td></tr>";
-	echo " <br><tr><td><b><br>".get_lang('Answer')." : </b></td></tr>";
-	$objAnswerTmp=new Answer($id);
-	$num = $objAnswerTmp->selectNbrAnswers();
-	$objAnswerTmp->read();
-	for($i=1;$i<=$num;$i++)
-	{
-	echo "<tr><td width='10%'> ";
-	$ans =  $objAnswerTmp->answer[$i];
+    $id = $_REQUEST['question'];
+    $objQuestionTmp = Question::read($id);
+    echo "<tr><td><b>".get_lang('Question')." : </b>";
+    echo $objQuestionTmp->selectTitle();
+    echo "</td></tr>";
+    echo " <br><tr><td><b><br>".get_lang('Answer')." : </b></td></tr>";
+    $objAnswerTmp=new Answer($id);
+    $num = $objAnswerTmp->selectNbrAnswers();
+    $objAnswerTmp->read();
+    for($i=1;$i<=$num;$i++)
+    {
+    echo "<tr><td width='10%'> ";
+    $ans =  $objAnswerTmp->answer[$i];
 
-	$form = new FormValidator('feedbackform','post',api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion);
-	$obj_registration_form = new HTML_QuickForm('frmRegistration', 'POST');
-	$renderer =& $obj_registration_form->defaultRenderer();
-	$renderer->setCustomElementTemplate(
+    $form = new FormValidator('feedbackform','post',api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion);
+    $obj_registration_form = new HTML_QuickForm('frmRegistration', 'POST');
+    $renderer =& $obj_registration_form->defaultRenderer();
+    $renderer->setCustomElementTemplate(
 '<tr>
 	<td align="left" style="" valign="top" width=30%>{label}
 		<!-- BEGIN required --><span style="color: #ff0000">*</span><!-- END required -->
@@ -57,10 +57,10 @@ 
 		<!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
 	</td>
 </tr>');
-	$form->addHtmlEditor('Feedback', $i.'.'.$ans, false, false, array('ToolbarSet' => 'TestAnswerFeedback', 'Width' => '600', 'Height' => '200'));
-	$form->display();
-	echo "</td>";
-	}?>
+    $form->addHtmlEditor('Feedback', $i.'.'.$ans, false, false, array('ToolbarSet' => 'TestAnswerFeedback', 'Width' => '600', 'Height' => '200'));
+    $form->display();
+    echo "</td>";
+    }?>
 	<form name="frm" action="javascript: void(0);" method="post">
 	 Click Ok to finish <input  type="submit" value="Ok" />
 	</form>

main/exercice/hotspot.class.php

Indentation +102 added lines, -102 removed lines

@@ -12,78 +12,78 @@ 
  **/
 class HotSpot extends Question
 {
-	static $typePicture = 'hotspot.png';
-	static $explanationLangVar = 'HotSpot';
-
-	public function __construct()
-	{
-		parent::__construct();
-		$this -> type = HOT_SPOT;
-	}
-
-	public function display()
-	{
-	}
-
-	/**
-	 * @param FormValidator $form
-	 * @param int $fck_config
-	 */
-	public function createForm (&$form, $fck_config=0)
-	{
-		parent::createForm($form, $fck_config);
-
-		if (!isset($_GET['editQuestion'])) {
-			$form->addElement('file','imageUpload',array('<img src="../img/icons/22/hotspots.png" />', get_lang('UploadJpgPicture')) );
-
-			// setting the save button here and not in the question class.php
-			// Saving a question
-			$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
-			//$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
-			$form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
-			$form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
-		} else {
-			// setting the save button here and not in the question class.php
-			// Editing a question
-			$form->addButtonUpdate(get_lang('ModifyExercise'), 'submitQuestion');
-		}
-	}
-
-	/**
-	 * @param FormValidator $form
-	 * @param null $objExercise
-	 * @return bool
-	 */
-	public function processCreation($form, $objExercise = null)
-	{
-		$file_info = $form->getSubmitValue('imageUpload');
-		$_course = api_get_course_info();
-		parent::processCreation($form, $objExercise);
-
-		if(!empty($file_info['tmp_name'])) {
-			$this->uploadPicture($file_info['tmp_name'], $file_info['name']);
-			$documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-			$picturePath   = $documentPath.'/images';
-
-			// fixed width ang height
-			if (file_exists($picturePath.'/'.$this->picture)) {
-				$this->resizePicture('width', 800);
-				$this->save();
-			} else {
-				return false;
-			}
-		}
-	}
-
-	function createAnswersForm ($form)
-	{
-		// nothing
-	}
-
-	function processAnswersCreation ($form)
-	{
-		// nothing
-	}
+    static $typePicture = 'hotspot.png';
+    static $explanationLangVar = 'HotSpot';
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this -> type = HOT_SPOT;
+    }
+
+    public function display()
+    {
+    }
+
+    /**
+     * @param FormValidator $form
+     * @param int $fck_config
+     */
+    public function createForm (&$form, $fck_config=0)
+    {
+        parent::createForm($form, $fck_config);
+
+        if (!isset($_GET['editQuestion'])) {
+            $form->addElement('file','imageUpload',array('<img src="../img/icons/22/hotspots.png" />', get_lang('UploadJpgPicture')) );
+
+            // setting the save button here and not in the question class.php
+            // Saving a question
+            $form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
+            //$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
+            $form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
+            $form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
+        } else {
+            // setting the save button here and not in the question class.php
+            // Editing a question
+            $form->addButtonUpdate(get_lang('ModifyExercise'), 'submitQuestion');
+        }
+    }
+
+    /**
+     * @param FormValidator $form
+     * @param null $objExercise
+     * @return bool
+     */
+    public function processCreation($form, $objExercise = null)
+    {
+        $file_info = $form->getSubmitValue('imageUpload');
+        $_course = api_get_course_info();
+        parent::processCreation($form, $objExercise);
+
+        if(!empty($file_info['tmp_name'])) {
+            $this->uploadPicture($file_info['tmp_name'], $file_info['name']);
+            $documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+            $picturePath   = $documentPath.'/images';
+
+            // fixed width ang height
+            if (file_exists($picturePath.'/'.$this->picture)) {
+                $this->resizePicture('width', 800);
+                $this->save();
+            } else {
+                return false;
+            }
+        }
+    }
+
+    function createAnswersForm ($form)
+    {
+        // nothing
+    }
+
+    function processAnswersCreation ($form)
+    {
+        // nothing
+    }
 }
 
 /**
@@ -91,35 +91,35 @@ 
  */
 class HotSpotDelineation extends HotSpot
 {
-	static $typePicture = 'hotspot-delineation.png';
-	static $explanationLangVar = 'HotspotDelineation';
-
-	function __construct()
-	{
-		parent::__construct();
-		$this -> type = HOT_SPOT_DELINEATION;
-
-	}
-
-	function createForm (&$form, $fck_config=0)
-	{
-		parent::createForm ($form, $fck_config);
-	}
-
-	function processCreation ($form, $objExercise = null)
-	{
-		$file_info = $form -> getSubmitValue('imageUpload');
-		parent::processCreation ($form, $objExercise);
-	}
-
-	function createAnswersForm ($form)
-	{
-		parent::createAnswersForm ($form);
-	}
-
-	function processAnswersCreation ($form)
-	{
-		parent::processAnswersCreation ($form);
-	}
+    static $typePicture = 'hotspot-delineation.png';
+    static $explanationLangVar = 'HotspotDelineation';
+
+    function __construct()
+    {
+        parent::__construct();
+        $this -> type = HOT_SPOT_DELINEATION;
+
+    }
+
+    function createForm (&$form, $fck_config=0)
+    {
+        parent::createForm ($form, $fck_config);
+    }
+
+    function processCreation ($form, $objExercise = null)
+    {
+        $file_info = $form -> getSubmitValue('imageUpload');
+        parent::processCreation ($form, $objExercise);
+    }
+
+    function createAnswersForm ($form)
+    {
+        parent::createAnswersForm ($form);
+    }
+
+    function processAnswersCreation ($form)
+    {
+        parent::processAnswersCreation ($form);
+    }
 }
 

main/exercice/stats.php

Indentation +41 added lines, -41 removed lines

@@ -12,7 +12,7 @@ 
 $result = $objExercise->read($exercise_id);
 
 if (!$result) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $sessionId = api_get_session_id();
@@ -29,17 +29,17 @@ 
 $data = array();
 // Question title 	# of students who tool it 	Lowest score 	Average 	Highest score 	Maximum score
 $headers = array(
-	get_lang('Question'),
+    get_lang('Question'),
     get_lang('QuestionType'),
     get_lang('NumberStudentWhoSelectedIt'),
-	get_lang('LowestScore'),
-	get_lang('AverageScore'),
-	get_lang('HighestScore'),
-	get_lang('Weighting')
+    get_lang('LowestScore'),
+    get_lang('AverageScore'),
+    get_lang('HighestScore'),
+    get_lang('Weighting')
 );
 
 if (!empty($question_list)) {
-	foreach ($question_list as $question_id) {
+    foreach ($question_list as $question_id) {
         $question_obj = Question::read($question_id);
 
         $exercise_stats = ExerciseLib::get_student_stats_by_question(
@@ -73,7 +73,7 @@ 
         $data[$question_id]['average_score'] = round($exercise_stats['average'], 2);
         $data[$question_id]['highest_score'] = round($exercise_stats['max'], 2);
         $data[$question_id]['max_score'] = round($question_obj->weighting, 2);
-	}
+    }
 }
 
 // Format A table
@@ -81,37 +81,37 @@ 
 $row = 0;
 $column = 0;
 foreach ($headers as $header) {
-	$table->setHeaderContents($row, $column, $header);
-	$column++;
+    $table->setHeaderContents($row, $column, $header);
+    $column++;
 }
 $row++;
 foreach ($data as $row_table) {
-	$column = 0;
-	foreach ($row_table as $cell) {
-		$table->setCellContents($row, $column, $cell);
-		$table->updateCellAttributes($row, $column, 'align="center"');
-		$column++;
-	}
-	$table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
-	$row++;
+    $column = 0;
+    foreach ($row_table as $cell) {
+        $table->setCellContents($row, $column, $cell);
+        $table->updateCellAttributes($row, $column, 'align="center"');
+        $column++;
+    }
+    $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
+    $row++;
 }
 $content = $table->toHtml();
 
 // Format B
 
 $headers = array(
-	get_lang('Question'),
-	get_lang('Answer'),
-	get_lang('Correct'),
-	get_lang('NumberStudentWhoSelectedIt')
+    get_lang('Question'),
+    get_lang('Answer'),
+    get_lang('Correct'),
+    get_lang('NumberStudentWhoSelectedIt')
 );
 
 $data = array();
 
 if (!empty($question_list)) {
     $id = 0;
-	foreach ($question_list as $question_id) {
-		$question_obj = Question::read($question_id);
+    foreach ($question_list as $question_id) {
+        $question_obj = Question::read($question_id);
         $exercise_stats = ExerciseLib::get_student_stats_by_question(
             $question_id,
             $exercise_id,
@@ -120,7 +120,7 @@ 
         );
 
         $answer = new Answer($question_id);
-		$answer_count = $answer->selectNbrAnswers();
+        $answer_count = $answer->selectNbrAnswers();
 
         for ($answer_id = 1; $answer_id <= $answer_count; $answer_id++) {
             $answer_info = $answer->selectAnswer($answer_id);
@@ -175,11 +175,11 @@ 
                         $correct = '';
 
                         for ($i = 1; $i <= $answer_count; $i++) {
-                             $is_correct_i = $answer->isCorrect($i);
-                             if ($is_correct_i != 0 && $is_correct_i == $answer_id) {
-                                 $correct = $answer->selectAnswer($i);
-                                 break;
-                             }
+                                $is_correct_i = $answer->isCorrect($i);
+                                if ($is_correct_i != 0 && $is_correct_i == $answer_id) {
+                                    $correct = $answer->selectAnswer($i);
+                                    break;
+                                }
                         }
                         $data[$id]['answer'] = $correct;
                         $data[$id]['correct'] = $answer_info;
@@ -245,7 +245,7 @@ 
             }
             $id++;
         }
-	}
+    }
 }
 
 // Format A table
@@ -253,19 +253,19 @@ 
 $row = 0;
 $column = 0;
 foreach ($headers as $header) {
-	$table->setHeaderContents($row, $column, $header);
-	$column++;
+    $table->setHeaderContents($row, $column, $header);
+    $column++;
 }
 $row++;
 foreach ($data as $row_table) {
-	$column = 0;
-	foreach ($row_table as $cell) {
-		$table->setCellContents($row, $column, $cell);
-		$table->updateCellAttributes($row, $column, 'align="center"');
-		$column++;
-	}
-	$table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
-	$row++;
+    $column = 0;
+    foreach ($row_table as $cell) {
+        $table->setCellContents($row, $column, $cell);
+        $table->updateCellAttributes($row, $column, 'align="center"');
+        $column++;
+    }
+    $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
+    $row++;
 }
 $content .= $table->toHtml();
 

main/exercice/qti2.php

Indentation +7 added lines, -7 removed lines

@@ -1,14 +1,14 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- *	Code for Qti2 import integration.
- *	@package chamilo.exercise
- * 	@author Ronny Velasquez
- * 	@version $Id: qti2.php  2010-03-12 12:14:25Z $
- */
+     *	Code for Qti2 import integration.
+     *	@package chamilo.exercise
+     * 	@author Ronny Velasquez
+     * 	@version $Id: qti2.php  2010-03-12 12:14:25Z $
+     */
 /**
- * Code
- */
+     * Code
+     */
 // including the global Chamilo file
 require_once '../inc/global.inc.php';
 

main/exercice/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;
-	}
+    }
 }