chamilo / chamilo-lms

main/admin/specific_fields_add.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 $tool_name = get_lang('AddSpecificSearchField');
 
 if (isset($_GET['action']) && $_GET['action'] === 'edit') {
-  $tool_name = get_lang('EditSpecificSearchField');
+    $tool_name = get_lang('EditSpecificSearchField');
 }
 // Create the form
 $form = new FormValidator('specific_fields_add');

main/exercice/TestCategory.php

Indentation +504 added lines, -504 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,246 +251,246 @@ 
      *
      * @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 array 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 array 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);
-		for ($i=0; $i < count($tabcatid); $i++) {
-			if ($tabcatid[$i] > 0 && $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 && $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;
+    }
 
     /**
      * Returns an array of question ids for each category
@@ -499,10 +499,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(),
@@ -580,28 +580,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
@@ -617,98 +617,98 @@ 
             $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);
-		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;
     }
 
@@ -768,34 +768,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();
         }
@@ -805,165 +805,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
      *
@@ -1010,8 +1010,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)
     {
@@ -1019,18 +1019,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_submit.php

Indentation +190 added lines, -190 removed lines

@@ -116,7 +116,7 @@ 
     if (!$objExercise->read($exerciseId) ||
         (!$objExercise->selectStatus() && !$is_allowedToEdit && $origin != 'learnpath')
     ) {
-    	if ($debug) {error_log('1.1. Error while reading the exercise'); };
+        if ($debug) {error_log('1.1. Error while reading the exercise'); };
         unset ($objExercise);
         $error = get_lang('ExerciseNotFound');
     } else {
@@ -130,13 +130,13 @@ 
 
 //2. Checking if $objExercise is set
 if (!isset($objExercise) && isset($exerciseInSession)) {
-	if ($debug) { error_log('2. Loading $objExercise from session'); };
+    if ($debug) { error_log('2. Loading $objExercise from session'); };
     $objExercise = $exerciseInSession;
 }
 
 //3. $objExercise is not set, then return to the exercise list
 if (!is_object($objExercise)) {
-	if ($debug) {error_log('3. $objExercise was not set, kill the script'); };
+    if ($debug) {error_log('3. $objExercise was not set, kill the script'); };
     header('Location: exercise.php');
     exit;
 }
@@ -157,7 +157,7 @@ 
 
 $time_control = false;
 if ($objExercise->expired_time != 0) {
-	$time_control = true;
+    $time_control = true;
 }
 
 // Generating the time control key for the user
@@ -166,14 +166,14 @@ 
 $_SESSION['duration_time'][$current_expired_time_key] = $current_timestamp;
 
 if ($time_control) {
-	// Get the expired time of the current exercise in track_e_exercises
-	$total_seconds = $objExercise->expired_time*60;
+    // Get the expired time of the current exercise in track_e_exercises
+    $total_seconds = $objExercise->expired_time*60;
 }
 
 $show_clock = true;
 $user_id = api_get_user_id();
 if ($objExercise->selectAttempts() > 0) {
-	$attempt_html = '';
+    $attempt_html = '';
     $attempt_count = Event::get_attempt_count(
         $user_id,
         $exerciseId,
@@ -182,9 +182,9 @@ 
         $learnpath_item_view_id
     );
 
-	if ($attempt_count >= $objExercise->selectAttempts()) {
-		$show_clock = false;
-		if (!api_is_allowed_to_edit(null,true)) {
+    if ($attempt_count >= $objExercise->selectAttempts()) {
+        $show_clock = false;
+        if (!api_is_allowed_to_edit(null,true)) {
             if ($objExercise->results_disabled == 0 && $origin != 'learnpath') {
 
                 // Showing latest attempt according with task BT#1628
@@ -223,29 +223,29 @@ 
                             $attempt_html .= Display::div(get_lang('Score').' '.$marks, array('id'=>'question_question_titlescore'));
                         }
                     }
-					$score =  ExerciseLib::show_score($last_attempt_info['exe_result'], $last_attempt_info['exe_weighting']);
-					$attempt_html .= Display::div(get_lang('YourTotalScore').' '.$score, array('id'=>'question_score'));
-				} else {
-					$attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
-				}
-			} else {
-				$attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
-			}
-		} else {
-			$attempt_html .= Display :: return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
-		}
+                    $score =  ExerciseLib::show_score($last_attempt_info['exe_result'], $last_attempt_info['exe_weighting']);
+                    $attempt_html .= Display::div(get_lang('YourTotalScore').' '.$score, array('id'=>'question_score'));
+                } else {
+                    $attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
+                }
+            } else {
+                $attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
+            }
+        } else {
+            $attempt_html .= Display :: return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
+        }
 
-		if ($origin == 'learnpath') {
-			Display :: display_reduced_header();
-		} else {
-			Display :: display_header($nameTools,'Exercises');
-		}
+        if ($origin == 'learnpath') {
+            Display :: display_reduced_header();
+        } else {
+            Display :: display_header($nameTools,'Exercises');
+        }
 
-		echo $attempt_html;
-		if ($origin != 'learnpath')
-			Display :: display_footer();
-		exit;
-	}
+        echo $attempt_html;
+        if ($origin != 'learnpath')
+            Display :: display_footer();
+        exit;
+    }
 }
 
 if ($debug) {
@@ -296,26 +296,26 @@ 
 
 if (empty($exercise_stat_info)) {
     if ($debug)  error_log('5  $exercise_stat_info is empty ');
-	$total_weight = 0;
-	$questionList = $objExercise->get_validated_question_list();
-	foreach ($questionListUncompressed as $question_id) {
-		$objQuestionTmp = Question::read($question_id);
-		$total_weight += floatval($objQuestionTmp->weighting);
-	}
+    $total_weight = 0;
+    $questionList = $objExercise->get_validated_question_list();
+    foreach ($questionListUncompressed as $question_id) {
+        $objQuestionTmp = Question::read($question_id);
+        $total_weight += floatval($objQuestionTmp->weighting);
+    }
 
-	if ($time_control) {
-		$expected_time = $current_timestamp + $total_seconds;
+    if ($time_control) {
+        $expected_time = $current_timestamp + $total_seconds;
 
-		if ($debug)  error_log('5.1. $current_timestamp '.$current_timestamp);
-		if ($debug)  error_log('5.2. $expected_time '.$expected_time);
+        if ($debug)  error_log('5.1. $current_timestamp '.$current_timestamp);
+        if ($debug)  error_log('5.2. $expected_time '.$expected_time);
 
-		$clock_expired_time 	= api_get_utc_datetime($expected_time);
-		if ($debug) error_log('5.3. $expected_time '.$clock_expired_time);
+        $clock_expired_time 	= api_get_utc_datetime($expected_time);
+        if ($debug) error_log('5.3. $expected_time '.$clock_expired_time);
 
-		//Sessions  that contain the expired time
-		$_SESSION['expired_time'][$current_expired_time_key] 	 = $clock_expired_time;
-		if ($debug) { error_log('5.4. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
-	}
+        //Sessions  that contain the expired time
+        $_SESSION['expired_time'][$current_expired_time_key] 	 = $clock_expired_time;
+        if ($debug) { error_log('5.4. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
+    }
 
     $exe_id = $objExercise->save_stat_track_exercise_info(
         $clock_expired_time,
@@ -332,7 +332,7 @@ 
     );
     if ($debug)  error_log("5.5  exercise_stat_info[] exists getting exe_id $exe_id");
 } else {
-	$exe_id = $exercise_stat_info['exe_id'];
+    $exe_id = $exercise_stat_info['exe_id'];
     // Remember last question id position.
     $isFirstTime = Session::read('firstTime');
     if ($isFirstTime && $objExercise->type == ONE_PER_PAGE) {
@@ -362,9 +362,9 @@ 
 if ($debug) { error_log('6. $objExercise->get_stat_track_exercise_info function called::  '.print_r($exercise_stat_info, 1)); };
 
 if (!empty($exercise_stat_info['questions_to_check'])) {
-	$my_remind_list = $exercise_stat_info['questions_to_check'];
-	$my_remind_list = explode(',', $my_remind_list);
-	$my_remind_list = array_filter($my_remind_list);
+    $my_remind_list = $exercise_stat_info['questions_to_check'];
+    $my_remind_list = explode(',', $my_remind_list);
+    $my_remind_list = array_filter($my_remind_list);
 }
 
 $params = "exe_id=$exe_id&exerciseId=$exerciseId&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&learnpath_item_view_id=$learnpath_item_view_id&".api_get_cidreq();
@@ -372,8 +372,8 @@ 
 
 if ($reminder == 2 && empty($my_remind_list)) {
     if ($debug) { error_log("6.2 calling the exercise_reminder.php "); };
-	header('Location: exercise_reminder.php?'.$params);
-	exit;
+    header('Location: exercise_reminder.php?'.$params);
+    exit;
 }
 
 /*
@@ -381,56 +381,56 @@ 
  * If the expired time is major that zero(0) then the expired time is compute on this time.
  */
 if ($time_control) {
-	if ($debug) error_log('7.1. Time control is enabled');
-	if ($debug) error_log('7.2. $current_expired_time_key  '.$current_expired_time_key);
-	if ($debug) error_log('7.3. $_SESSION[expired_time][$current_expired_time_key]  '.$_SESSION['expired_time'][$current_expired_time_key]);
+    if ($debug) error_log('7.1. Time control is enabled');
+    if ($debug) error_log('7.2. $current_expired_time_key  '.$current_expired_time_key);
+    if ($debug) error_log('7.3. $_SESSION[expired_time][$current_expired_time_key]  '.$_SESSION['expired_time'][$current_expired_time_key]);
 
     if (!isset($_SESSION['expired_time'][$current_expired_time_key])) {
         //Timer - Get expired_time for a student
         if (!empty($exercise_stat_info)) {
-        	if ($debug) {error_log('7.4 Seems that the session ends and the user want to retake the exam'); };
-	        $expired_time_of_this_attempt = $exercise_stat_info['expired_time_control'];
-			if ($debug) {error_log('7.5 $expired_time_of_this_attempt: '.$expired_time_of_this_attempt); }
-	        // Get the last attempt of an exercise
-	    	$last_attempt_date = Event::getLastAttemptDateOfExercise($exercise_stat_info['exe_id']);
+            if ($debug) {error_log('7.4 Seems that the session ends and the user want to retake the exam'); };
+            $expired_time_of_this_attempt = $exercise_stat_info['expired_time_control'];
+            if ($debug) {error_log('7.5 $expired_time_of_this_attempt: '.$expired_time_of_this_attempt); }
+            // Get the last attempt of an exercise
+            $last_attempt_date = Event::getLastAttemptDateOfExercise($exercise_stat_info['exe_id']);
 
-	    	/* This means that the user enters the exam but do not answer the
+            /* This means that the user enters the exam but do not answer the
 	    	   first question we get the date from the track_e_exercises not from
 	    	   the track_et_attempt see #2069 */
-	    	if (empty($last_attempt_date)) {
-	    		$diff = $current_timestamp - api_strtotime($exercise_stat_info['start_date'], 'UTC');
-	    		$last_attempt_date = api_get_utc_datetime(api_strtotime($exercise_stat_info['start_date'],'UTC') + $diff);
-	    	} else {
-	    		//Recalculate the time control due #2069
-	    		$diff = $current_timestamp - api_strtotime($last_attempt_date,'UTC');
-	    		$last_attempt_date = api_get_utc_datetime(api_strtotime($last_attempt_date,'UTC') + $diff);
-	    	}
-	        if ($debug) {error_log('7.6. $last_attempt_date: '.$last_attempt_date); }
-
-	        //New expired time - it is due to the possible closure of session
-	        $new_expired_time_in_seconds = api_strtotime($expired_time_of_this_attempt, 'UTC') - api_strtotime($last_attempt_date,'UTC');
-	        if ($debug) {error_log('7.7. $new_expired_time_in_seconds: '.$new_expired_time_in_seconds); }
-
-	        $expected_time	= $current_timestamp + $new_expired_time_in_seconds;
-	        if ($debug) {error_log('7.8. $expected_time1: '.$expected_time); }
-
-	        $clock_expired_time  = api_get_utc_datetime($expected_time);
-	        if ($debug) {error_log('7.9. $clock_expired_time: '.$clock_expired_time); }
-
-			// First we update the attempt to today
-			/* How the expired time is changed into "track_e_exercises" table,
+            if (empty($last_attempt_date)) {
+                $diff = $current_timestamp - api_strtotime($exercise_stat_info['start_date'], 'UTC');
+                $last_attempt_date = api_get_utc_datetime(api_strtotime($exercise_stat_info['start_date'],'UTC') + $diff);
+            } else {
+                //Recalculate the time control due #2069
+                $diff = $current_timestamp - api_strtotime($last_attempt_date,'UTC');
+                $last_attempt_date = api_get_utc_datetime(api_strtotime($last_attempt_date,'UTC') + $diff);
+            }
+            if ($debug) {error_log('7.6. $last_attempt_date: '.$last_attempt_date); }
+
+            //New expired time - it is due to the possible closure of session
+            $new_expired_time_in_seconds = api_strtotime($expired_time_of_this_attempt, 'UTC') - api_strtotime($last_attempt_date,'UTC');
+            if ($debug) {error_log('7.7. $new_expired_time_in_seconds: '.$new_expired_time_in_seconds); }
+
+            $expected_time	= $current_timestamp + $new_expired_time_in_seconds;
+            if ($debug) {error_log('7.8. $expected_time1: '.$expected_time); }
+
+            $clock_expired_time  = api_get_utc_datetime($expected_time);
+            if ($debug) {error_log('7.9. $clock_expired_time: '.$clock_expired_time); }
+
+            // First we update the attempt to today
+            /* How the expired time is changed into "track_e_exercises" table,
                then the last attempt for this student should be changed too */
-	        $sql = "UPDATE $exercise_attempt_table SET
+            $sql = "UPDATE $exercise_attempt_table SET
 	                tms = '".api_get_utc_datetime()."'
 	                WHERE
 	                    exe_id = '".$exercise_stat_info['exe_id']."' AND
 	                    tms = '".$last_attempt_date."' ";
-	        if ($debug) {error_log('7.10. $sql: '.$sql); }
-	        Database::query($sql);
+            if ($debug) {error_log('7.10. $sql: '.$sql); }
+            Database::query($sql);
 
-	        //Sessions  that contain the expired time
-	        $_SESSION['expired_time'][$current_expired_time_key] = $clock_expired_time;
-	        if ($debug) {error_log('7.11. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
+            //Sessions  that contain the expired time
+            $_SESSION['expired_time'][$current_expired_time_key] = $clock_expired_time;
+            if ($debug) {error_log('7.11. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
         }
     } else {
         $clock_expired_time =  $_SESSION['expired_time'][$current_expired_time_key];
@@ -447,7 +447,7 @@ 
  * for more details of how it works see this link : http://eric.garside.name/docs.html?p=epiclock
  */
 if ($time_control) { //Sends the exercise form when the expired time is finished
-	$htmlHeadXtra[] = $objExercise->show_time_control_js($time_left);
+    $htmlHeadXtra[] = $objExercise->show_time_control_js($time_left);
 }
 
 // if the user has submitted the form
@@ -461,14 +461,14 @@ 
     // selects the list of question ID
     $questionList = $objExercise->get_validated_question_list();
     if ($objExercise->isRandom() && !empty($exercise_stat_info['data_tracking'])) {
-    	$questionList = explode(',', $exercise_stat_info['data_tracking']);
+        $questionList = explode(',', $exercise_stat_info['data_tracking']);
     }
     Session::write('questionList', $questionList);
     if ($debug > 0) { error_log('$_SESSION[questionList] was set'); }
 } else {
-	if (isset($objExercise) && isset($_SESSION['objExercise'])) {
-    	$questionList = $_SESSION['questionList'];
-	}
+    if (isset($objExercise) && isset($_SESSION['objExercise'])) {
+        $questionList = $_SESSION['questionList'];
+    }
 }
 
 if ($debug) error_log('8. Question list loaded '.print_r($questionList, 1));
@@ -476,7 +476,7 @@ 
 //Real question count
 $question_count = 0;
 if (!empty($questionList)) {
-	$question_count = count($questionList);
+    $question_count = count($questionList);
 }
 
 if ($formSent && isset($_POST)) {
@@ -518,11 +518,11 @@ 
                 //saving each question
                 if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_DIRECT) {
                     $nro_question = $current_question; // - 1;
-                 	$questionId   = $key;
+                        $questionId   = $key;
                     // gets the student choice for this question
                     $choice = $exerciseResult[$questionId];
                     if (isset($exe_id)) {
-                    	// Manage the question and answer attempts
+                        // Manage the question and answer attempts
                         if ($debug) { error_log('8.3. manage_answer exe_id: '.$exe_id.' - $questionId: '.$questionId.' Choice'.print_r($choice,1)); }
                         $objExercise->manage_answer(
                             $exe_id,
@@ -611,58 +611,58 @@ 
 }
 
 if ($question_count != 0) {
-	if (($objExercise->type == ALL_ON_ONE_PAGE ||
+    if (($objExercise->type == ALL_ON_ONE_PAGE ||
         $current_question > $question_count)
     ) {
-	    if (api_is_allowed_to_session_edit()) {
-	        // goes to the script that will show the result of the exercise
-	        if ($objExercise->type == ALL_ON_ONE_PAGE) {
-	            if ($debug) { error_log('12. Exercise ALL_ON_ONE_PAGE -> Redirecting to exercise_result.php'); }
-
-	            //We check if the user attempts before sending to the exercise_result.php
-	            if ($objExercise->selectAttempts() > 0) {
-	                $attempt_count = Event::get_attempt_count(
+        if (api_is_allowed_to_session_edit()) {
+            // goes to the script that will show the result of the exercise
+            if ($objExercise->type == ALL_ON_ONE_PAGE) {
+                if ($debug) { error_log('12. Exercise ALL_ON_ONE_PAGE -> Redirecting to exercise_result.php'); }
+
+                //We check if the user attempts before sending to the exercise_result.php
+                if ($objExercise->selectAttempts() > 0) {
+                    $attempt_count = Event::get_attempt_count(
                         api_get_user_id(),
                         $exerciseId,
                         $learnpath_id,
                         $learnpath_item_id,
                         $learnpath_item_view_id
                     );
-	                if ($attempt_count >= $objExercise->selectAttempts()) {
-	                    Display :: display_warning_message(
+                    if ($attempt_count >= $objExercise->selectAttempts()) {
+                        Display :: display_warning_message(
                             sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()),
                             false
                         );
-	                    if ($origin != 'learnpath') {
-	                        //so we are not in learnpath tool
-	                        echo '</div>'; //End glossary div
-	                        Display :: display_footer();
-	                    } else {
-	                        echo '</body></html>';
-	                    }
-	                    exit;
-	                }
-	            }
-	        } else {
-	            if ($objExercise->review_answers) {
-	            	header('Location: exercise_reminder.php?'.$params);
-	            	exit;
-	            } else {
+                        if ($origin != 'learnpath') {
+                            //so we are not in learnpath tool
+                            echo '</div>'; //End glossary div
+                            Display :: display_footer();
+                        } else {
+                            echo '</body></html>';
+                        }
+                        exit;
+                    }
+                }
+            } else {
+                if ($objExercise->review_answers) {
+                    header('Location: exercise_reminder.php?'.$params);
+                    exit;
+                } else {
                     header("Location: exercise_result.php?".api_get_cidreq()."&exe_id=$exe_id&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&learnpath_item_view_id=$learnpath_item_view_id");
                     exit;
-	            }
-	        }
-	    } else {
-	        if ($debug) { error_log('Redirecting to exercise_submit.php'); }
-	        exit;
-	    }
-	}
+                }
+            }
+        } else {
+            if ($debug) { error_log('Redirecting to exercise_submit.php'); }
+            exit;
+        }
+    }
 } else {
-	$error = get_lang('ThereAreNoQuestionsForThisExercise');
-	// if we are in the case where user select random by category, but didn't choose the number of random question
-	if ($objExercise->selectRandomByCat() > 0 && $objExercise->random <= 0) {
-		$error .= "<br/>".get_lang('PleaseSelectSomeRandomQuestion');
-	}
+    $error = get_lang('ThereAreNoQuestionsForThisExercise');
+    // if we are in the case where user select random by category, but didn't choose the number of random question
+    if ($objExercise->selectRandomByCat() > 0 && $objExercise->random <= 0) {
+        $error .= "<br/>".get_lang('PleaseSelectSomeRandomQuestion');
+    }
 }
 
 if (!empty ($_GET['gradebook']) && $_GET['gradebook'] == 'view') {
@@ -701,9 +701,9 @@ 
 if (api_is_course_admin() && $origin != 'learnpath') {
     echo '<div class="actions">';
     if ($show_quiz_edition == false) {
-    	echo '<a href="exercise_admin.php?' . api_get_cidreq() . '&modifyExercise=yes&exerciseId=' . $objExercise->id . '">'.Display :: return_icon('settings.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
+        echo '<a href="exercise_admin.php?' . api_get_cidreq() . '&modifyExercise=yes&exerciseId=' . $objExercise->id . '">'.Display :: return_icon('settings.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
     } else {
-    	echo '<a href="#">'.Display::return_icon('settings_na.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
+        echo '<a href="#">'.Display::return_icon('settings_na.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
     }
     echo '</div>';
 }
@@ -746,7 +746,7 @@ 
             $message_warning = $permission_to_start ? get_lang('ReachedTimeLimit') : get_lang('ExerciseNoStartedYet');
             Display :: display_warning_message(sprintf($message_warning, $exercise_title, $objExercise->selectAttempts()));
             if ($origin != 'learnpath') {
-            	Display :: display_footer();
+                Display :: display_footer();
             }
             exit;
         } else {
@@ -761,7 +761,7 @@ 
 if (isset($_custom['exercises_hidden_when_no_start_date']) &&
     $_custom['exercises_hidden_when_no_start_date']
 ) {
-	if (empty($objExercise->start_time) || $objExercise->start_time == '0000-00-00 00:00:00') {
+    if (empty($objExercise->start_time) || $objExercise->start_time == '0000-00-00 00:00:00') {
         Display:: display_warning_message(
             sprintf(
                 get_lang('ExerciseNoStartedYet'),
@@ -769,20 +769,20 @@ 
                 $objExercise->selectAttempts()
             )
         );
-		if ($origin != 'learnpath') {
-			Display :: display_footer();
-		}
-	}
+        if ($origin != 'learnpath') {
+            Display :: display_footer();
+        }
+    }
 }
 
 //Timer control
 if ($time_control) {
     echo $objExercise->return_time_left_div();
-	echo '<div style="display:none" class="warning-message" id="expired-message-id">'.get_lang('ExerciseExpiredTimeMessage').'</div>';
+    echo '<div style="display:none" class="warning-message" id="expired-message-id">'.get_lang('ExerciseExpiredTimeMessage').'</div>';
 }
 
 if ($origin != 'learnpath') {
-   echo '<div id="highlight-plugin" class="glossary-content">';
+    echo '<div id="highlight-plugin" class="glossary-content">';
 }
 
 if ($reminder == 2)  {
@@ -794,53 +794,53 @@ 
     $current_question = 1; //set by default the 1st question
 
     if (!empty($my_remind_list)) {
-    	// Checking which questions we are going to call from the remind list
-		for ($i = 0; $i < count($data_tracking); $i++) {
-			for($j = 0; $j < count($my_remind_list); $j++) {
-
-				if (!empty($remind_question_id)) {
-					if ($remind_question_id == $my_remind_list[$j]) {
-
-			        	if ($remind_question_id == $data_tracking[$i]) {
-			        		if (isset($my_remind_list[$j+1])) {
-			        			$remind_question_id = $my_remind_list[$j+1];
-			        			$current_question = $i + 1;
-			        		} else {
+        // Checking which questions we are going to call from the remind list
+        for ($i = 0; $i < count($data_tracking); $i++) {
+            for($j = 0; $j < count($my_remind_list); $j++) {
+
+                if (!empty($remind_question_id)) {
+                    if ($remind_question_id == $my_remind_list[$j]) {
+
+                        if ($remind_question_id == $data_tracking[$i]) {
+                            if (isset($my_remind_list[$j+1])) {
+                                $remind_question_id = $my_remind_list[$j+1];
+                                $current_question = $i + 1;
+                            } else {
                                 // We end the remind list we go to the exercise_reminder.php please
-			        			$remind_question_id = -1;
-			        			$current_question = $i + 1; // last question
-			        		}
-			        		break 2;
-			            }
-					}
-				} else {
-					if ($my_remind_list[$j] == $data_tracking[$i]) {
-						if (isset($my_remind_list[$j+1])) {
-							$remind_question_id = $my_remind_list[$j+1];
-							$current_question = $i + 1; // last question
-						} else {
+                                $remind_question_id = -1;
+                                $current_question = $i + 1; // last question
+                            }
+                            break 2;
+                        }
+                    }
+                } else {
+                    if ($my_remind_list[$j] == $data_tracking[$i]) {
+                        if (isset($my_remind_list[$j+1])) {
+                            $remind_question_id = $my_remind_list[$j+1];
+                            $current_question = $i + 1; // last question
+                        } else {
                             // We end the remind list we go to the exercise_reminder.php please
-							$remind_question_id = -1;
-							$current_question = $i + 1; // last question
-						}
-						break 2;
-					}
-				}
-			}
+                            $remind_question_id = -1;
+                            $current_question = $i + 1; // last question
+                        }
+                        break 2;
+                    }
+                }
+            }
         }
     } else {
-    	if ($objExercise->review_answers) {
+        if ($objExercise->review_answers) {
             if ($debug) { error_log('. redirecting to exercise_reminder.php '); }
-	    	header("Location: exercise_reminder.php?$params");
-	    	exit;
-    	}
+            header("Location: exercise_reminder.php?$params");
+            exit;
+        }
     }
 }
 
 if ($objExercise->review_answers) {
-	$script_php = 'exercise_reminder.php';
+    $script_php = 'exercise_reminder.php';
 } else {
-	$script_php = 'exercise_result.php';
+    $script_php = 'exercise_result.php';
 }
 
 if (!empty($error)) {
@@ -1084,7 +1084,7 @@ 
          <input type="hidden" name="learnpath_item_id" 		value="'.$learnpath_item_id . '" />
          <input type="hidden" name="learnpath_item_view_id" value="'.$learnpath_item_view_id . '" />';
 
-	// Show list of questions
+    // Show list of questions
     $i = 1;
     $attempt_list = array();
     if (isset($exe_id)) {
@@ -1134,10 +1134,10 @@ 
 
         $attributes = array('id' =>'remind_list['.$questionId.']');
         if (in_array($questionId, $remind_list)) {
-        	$is_remind_on = true;
-        	$attributes['checked'] = 1;
-        	$remind_question = true;
-        	$remind_highlight = ' remind_highlight ';
+            $is_remind_on = true;
+            $attributes['checked'] = 1;
+            $remind_question = true;
+            $remind_highlight = ' remind_highlight ';
         }
 
         // Showing the exercise description
@@ -1211,8 +1211,8 @@ 
     }
     // end foreach()
     if ($objExercise->type == ALL_ON_ONE_PAGE) {
-    	$exercise_actions =  $objExercise->show_button($questionId, $current_question);
-    	echo Display::div($exercise_actions, array('class'=>'exercise_actions'));
+        $exercise_actions =  $objExercise->show_button($questionId, $current_question);
+        echo Display::div($exercise_actions, array('class'=>'exercise_actions'));
         echo '<br>';
     }
     echo '</form>';

app/Resources/public/assets/ckeditor/samples/old/assets/posteddata.php

Indentation +9 added lines, -9 removed lines

@@ -27,22 +27,22 @@
 

 if (!empty($_POST))

 {

-	foreach ( $_POST as $key => $value )

-	{

-		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )

-			continue;

+    foreach ( $_POST as $key => $value )

+    {

+        if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )

+            continue;

 

-		if ( get_magic_quotes_gpc() )

-			$value = htmlspecialchars( stripslashes((string)$value) );

-		else

-			$value = htmlspecialchars( (string)$value );

+        if ( get_magic_quotes_gpc() )

+            $value = htmlspecialchars( stripslashes((string)$value) );

+        else

+            $value = htmlspecialchars( (string)$value );

 ?>

 		<tr>

 			<th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th>

 			<td><pre class="samples"><?php echo $value; ?></pre></td>

 		</tr>

 	<?php

-	}

+    }

 }

 ?>

 	</table>

main/gradebook/lib/fe/resulttable.class.php

Indentation +154 added lines, -154 removed lines

@@ -10,166 +10,166 @@
  */
 class ResultTable extends SortableTable
 {
-	private $datagen;
-	private $evaluation;
-	private $allresults;
-	private $iscourse;
-
-	/**
-	 * Constructor
-	 */
+    private $datagen;
+    private $evaluation;
+    private $allresults;
+    private $iscourse;
+
+    /**
+     * Constructor
+     */
     public function __construct($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false)
-	{
-    	parent :: __construct ('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
-
-		$this->datagen = new ResultsDataGenerator($evaluation, $results, true);
-
-		$this->evaluation = $evaluation;
-		$this->iscourse = $iscourse;
-		$this->forprint = $forprint;
-
-		if (isset ($addparams))  {
-			$this->set_additional_parameters($addparams);
-		}
-		$scoredisplay = ScoreDisplay :: instance();
-		$column= 0;
-		if ($this->iscourse == '1') {
-			$this->set_header($column++, '', false);
-			$this->set_form_actions(array (
-					'delete' => get_lang('Delete')
-			));
-		}
-		if (api_is_western_name_order()) {
-			$this->set_header($column++, get_lang('FirstName'));
-			$this->set_header($column++, get_lang('LastName'));
-		} else {
-			$this->set_header($column++, get_lang('LastName'));
-			$this->set_header($column++, get_lang('FirstName'));
-		}
-		$this->set_header($column++, get_lang('Score'));
-		if ($scoredisplay->is_custom()) {
-			$this->set_header($column++, get_lang('Display'));
-		}
-		if (!$this->forprint) {
-			$this->set_header($column++, get_lang('Modify'),false);
-		}
+    {
+        parent :: __construct ('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
+
+        $this->datagen = new ResultsDataGenerator($evaluation, $results, true);
+
+        $this->evaluation = $evaluation;
+        $this->iscourse = $iscourse;
+        $this->forprint = $forprint;
+
+        if (isset ($addparams))  {
+            $this->set_additional_parameters($addparams);
+        }
+        $scoredisplay = ScoreDisplay :: instance();
+        $column= 0;
+        if ($this->iscourse == '1') {
+            $this->set_header($column++, '', false);
+            $this->set_form_actions(array (
+                    'delete' => get_lang('Delete')
+            ));
+        }
+        if (api_is_western_name_order()) {
+            $this->set_header($column++, get_lang('FirstName'));
+            $this->set_header($column++, get_lang('LastName'));
+        } else {
+            $this->set_header($column++, get_lang('LastName'));
+            $this->set_header($column++, get_lang('FirstName'));
+        }
+        $this->set_header($column++, get_lang('Score'));
+        if ($scoredisplay->is_custom()) {
+            $this->set_header($column++, get_lang('Display'));
+        }
+        if (!$this->forprint) {
+            $this->set_header($column++, get_lang('Modify'),false);
+        }
     }
 
 
-	/**
-	 * Function used by SortableTable to get total number of items in the table
-	 */
-	public function get_total_number_of_items ()
+    /**
+     * Function used by SortableTable to get total number of items in the table
+     */
+    public function get_total_number_of_items ()
     {
-		return $this->datagen->get_total_results_count();
-	}
-
-	/**
-	 * Function used by SortableTable to generate the data to display
-	 */
-	public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
-
-		$is_western_name_order = api_is_western_name_order();
-		$scoredisplay = ScoreDisplay :: instance();
-
-		// determine sorting type
-		$col_adjust = $this->iscourse == '1' ? 1 : 0;
-
-		switch ($this->column) {
-			// first name or last name
-			case (0 + $col_adjust):
-				if ($is_western_name_order) {
-					$sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
-				} else {
-					$sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
-				}
-				break;
+        return $this->datagen->get_total_results_count();
+    }
+
+    /**
+     * Function used by SortableTable to generate the data to display
+     */
+    public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
+
+        $is_western_name_order = api_is_western_name_order();
+        $scoredisplay = ScoreDisplay :: instance();
+
+        // determine sorting type
+        $col_adjust = $this->iscourse == '1' ? 1 : 0;
+
+        switch ($this->column) {
             // first name or last name
-			case (1 + $col_adjust):
-				if ($is_western_name_order) {
-					$sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
-				} else {
-					$sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
-				}
-				break;
+            case (0 + $col_adjust):
+                if ($is_western_name_order) {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
+                } else {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
+                }
+                break;
+            // first name or last name
+            case (1 + $col_adjust):
+                if ($is_western_name_order) {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
+                } else {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
+                }
+                break;
             //Score
-			case (2 + $col_adjust):
-				$sorting = ResultsDataGenerator :: RDG_SORT_SCORE;
-				break;
-			case (3 + $col_adjust):
-				$sorting = ResultsDataGenerator :: RDG_SORT_MASK;
-				break;
-		}
-
-		if ($this->direction == 'DESC') {
-			$sorting |= ResultsDataGenerator :: RDG_SORT_DESC;
-		} else {
-			$sorting |= ResultsDataGenerator :: RDG_SORT_ASC;
-		}
-
-		$data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
-
-		// generate the data to display
-		$sortable_data = array();
-		foreach ($data_array as $item) {
-			$row = array ();
-			if ($this->iscourse == '1') {
-				 $row[] = $item['result_id'];
-			}
-			if ($is_western_name_order) {
-				$row[] = $item['firstname'];
-				$row[] = $item['lastname'];
-			} else {
-				$row[] = $item['lastname'];
-				$row[] = $item['firstname'];
-			}
-
-			$row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
+            case (2 + $col_adjust):
+                $sorting = ResultsDataGenerator :: RDG_SORT_SCORE;
+                break;
+            case (3 + $col_adjust):
+                $sorting = ResultsDataGenerator :: RDG_SORT_MASK;
+                break;
+        }
+
+        if ($this->direction == 'DESC') {
+            $sorting |= ResultsDataGenerator :: RDG_SORT_DESC;
+        } else {
+            $sorting |= ResultsDataGenerator :: RDG_SORT_ASC;
+        }
+
+        $data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
+
+        // generate the data to display
+        $sortable_data = array();
+        foreach ($data_array as $item) {
+            $row = array ();
+            if ($this->iscourse == '1') {
+                    $row[] = $item['result_id'];
+            }
+            if ($is_western_name_order) {
+                $row[] = $item['firstname'];
+                $row[] = $item['lastname'];
+            } else {
+                $row[] = $item['lastname'];
+                $row[] = $item['firstname'];
+            }
+
+            $row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
             //$row[] =  Display::bar_progress($item['percentage_score'], true);
-			if ($scoredisplay->is_custom()) {
-				$row[] = $item['display'];
-			}
-			if (!$this->forprint) {
-				$row[] = $this->build_edit_column ($item);
-			}
-			$sortable_data[] = $row;
-		}
-
-		return $sortable_data;
-	}
-
-	private function build_edit_column ($item)
-	{
-		$status=CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
-		$locked_status = $this->evaluation->get_locked();
-		if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
-			//api_is_course_admin()
-			$edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
-			$edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
-		}
-
-		if ($this->evaluation->get_course_code() == null) {
-			$edit_column .= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">';
-			$edit_column .= Display::return_icon('delete.png', get_lang('Delete'));
-			$edit_column .= '</a>';
-		    $edit_column .= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">';
-			$edit_column .= Display::return_icon('statistics.gif', get_lang('Statistics'));
-		    $edit_column .= '</a>';
-		}
-
-		// Evaluation's origin is a link
-		if ($this->evaluation->get_category_id() < 0) {
-			$link = LinkFactory::get_evaluation_link($this->evaluation->get_id());
-			$doc_url = $link->get_view_url($item['id']);
-
-			if ($doc_url != null) {
-				$edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">';
-				$edit_column .= Display::return_icon('link.gif', get_lang('OpenDocument')).'</a>';
-			}
-		}
-
-		return $edit_column;
-	}
+            if ($scoredisplay->is_custom()) {
+                $row[] = $item['display'];
+            }
+            if (!$this->forprint) {
+                $row[] = $this->build_edit_column ($item);
+            }
+            $sortable_data[] = $row;
+        }
+
+        return $sortable_data;
+    }
+
+    private function build_edit_column ($item)
+    {
+        $status=CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
+        $locked_status = $this->evaluation->get_locked();
+        if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
+            //api_is_course_admin()
+            $edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
+            $edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
+        }
+
+        if ($this->evaluation->get_course_code() == null) {
+            $edit_column .= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">';
+            $edit_column .= Display::return_icon('delete.png', get_lang('Delete'));
+            $edit_column .= '</a>';
+            $edit_column .= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">';
+            $edit_column .= Display::return_icon('statistics.gif', get_lang('Statistics'));
+            $edit_column .= '</a>';
+        }
+
+        // Evaluation's origin is a link
+        if ($this->evaluation->get_category_id() < 0) {
+            $link = LinkFactory::get_evaluation_link($this->evaluation->get_id());
+            $doc_url = $link->get_view_url($item['id']);
+
+            if ($doc_url != null) {
+                $edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">';
+                $edit_column .= Display::return_icon('link.gif', get_lang('OpenDocument')).'</a>';
+            }
+        }
+
+        return $edit_column;
+    }
 }

main/admin/configure_homepage.php

Indentation +846 added lines, -846 removed lines

@@ -17,35 +17,35 @@ 
  */
 function home_tabs($file_logged_in)
 {
-	$post = strpos($file_logged_in, "_logged_in");
-	if ($post !== false) {
-		$file_logged_out = str_replace('_logged_in','', $file_logged_in);
-		//variables initialization
-		$data_logged_out = array();
-		$data_logged_in  = array();
-
-		//we read the file with all links
-		$file = file($file_logged_in);
-		foreach ($file as $line) {
-			$line = str_replace("\n", '',$line);
-			//not logged user only sees public links
-			if (!preg_match('/::private/',$line)) {
-				$data_logged_out[] = $line;
-			}
-			//logged user only sees all links
-			$data_logged_in[] = $line;
-		}
-		//tabs file for logged out users
-		if (file_exists($file_logged_out)) {
-			$fp = fopen($file_logged_out, 'w');
-			fputs($fp, implode("\n", $data_logged_out));
-			fclose($fp);
-		}
-		//tabs file for logged in users
-		$fp = fopen($file_logged_in, 'w');
-		fputs($fp, implode("\n", $data_logged_in));
-		fclose($fp);
-	}
+    $post = strpos($file_logged_in, "_logged_in");
+    if ($post !== false) {
+        $file_logged_out = str_replace('_logged_in','', $file_logged_in);
+        //variables initialization
+        $data_logged_out = array();
+        $data_logged_in  = array();
+
+        //we read the file with all links
+        $file = file($file_logged_in);
+        foreach ($file as $line) {
+            $line = str_replace("\n", '',$line);
+            //not logged user only sees public links
+            if (!preg_match('/::private/',$line)) {
+                $data_logged_out[] = $line;
+            }
+            //logged user only sees all links
+            $data_logged_in[] = $line;
+        }
+        //tabs file for logged out users
+        if (file_exists($file_logged_out)) {
+            $fp = fopen($file_logged_out, 'w');
+            fputs($fp, implode("\n", $data_logged_out));
+            fclose($fp);
+        }
+        //tabs file for logged in users
+        $fp = fopen($file_logged_in, 'w');
+        fputs($fp, implode("\n", $data_logged_in));
+        fclose($fp);
+    }
 }
 
 $cidReset = true;
@@ -76,39 +76,39 @@ 
 $_languages = api_get_languages();
 $selfUrl =  api_get_self();
 $interbreadcrumb[] = array(
-	'url' => 'index.php',
-	'name' => get_lang('PlatformAdmin')
+    'url' => 'index.php',
+    'name' => get_lang('PlatformAdmin')
 );
 
 if (!empty($action)) {
-	$interbreadcrumb[] = array(
-		'url' => 'configure_homepage.php',
-		'name' => get_lang('ConfigureHomePage')
-	);
-
-	switch ($action) {
-		case 'edit_top':
-			$tool_name = get_lang('EditHomePage');
-			break;
-		case 'edit_news':
-			$tool_name = get_lang('EditNews');
-			break;
-		case 'edit_notice':
-			$tool_name = get_lang('EditNotice');
-			break;
-		case 'insert_link':
-			$tool_name = get_lang('InsertLink');
-			break;
-		case 'edit_link':
-			$tool_name = get_lang('EditLink');
-			break;
-		case 'insert_tabs':
-			$tool_name = get_lang('InsertTabs');
-			break;
-		case 'edit_tabs':
-			$tool_name = get_lang('EditTabs');
-			break;
-	}
+    $interbreadcrumb[] = array(
+        'url' => 'configure_homepage.php',
+        'name' => get_lang('ConfigureHomePage')
+    );
+
+    switch ($action) {
+        case 'edit_top':
+            $tool_name = get_lang('EditHomePage');
+            break;
+        case 'edit_news':
+            $tool_name = get_lang('EditNews');
+            break;
+        case 'edit_notice':
+            $tool_name = get_lang('EditNotice');
+            break;
+        case 'insert_link':
+            $tool_name = get_lang('InsertLink');
+            break;
+        case 'edit_link':
+            $tool_name = get_lang('EditLink');
+            break;
+        case 'insert_tabs':
+            $tool_name = get_lang('InsertTabs');
+            break;
+        case 'edit_tabs':
+            $tool_name = get_lang('EditTabs');
+            break;
+    }
 }
 
 // The global logic for language priorities should be:
@@ -131,11 +131,11 @@ 
 
 $lang = ''; //el for "Edit Language"
 if (!empty($_SESSION['user_language_choice'])) {
-	$lang = $_SESSION['user_language_choice'];
+    $lang = $_SESSION['user_language_choice'];
 } elseif (!empty($_SESSION['_user']['language'])) {
-	$lang = $_SESSION['_user']['language'];
+    $lang = $_SESSION['_user']['language'];
 } else {
-	$lang = api_get_setting('platformLanguage');
+    $lang = api_get_setting('platformLanguage');
 }
 
 $languageGet = isset($_GET['language']) ? Security::remove_XSS($_GET['language']) : $lang;
@@ -144,25 +144,25 @@ 
 $homePath = api_get_path(SYS_APP_PATH).'home/';
 
 if (api_is_multiple_url_enabled()) {
-	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1) {
-		$url_info = api_get_access_url($access_url_id);
-		$url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
-		$clean_url = api_replace_dangerous_char($url);
-		$clean_url = str_replace('/', '-', $clean_url);
-		$clean_url .= '/';
-
-		$homep = $homePath; //homep for Home Path
-		$homep_new = $homePath.$clean_url; //homep for Home Path added the url
-		$new_url_dir = $homePath.$clean_url;
-		//we create the new dir for the new sites
-		if (!is_dir($new_url_dir)) {
-			mkdir($new_url_dir, api_get_permissions_for_new_directories());
-		}
-	}
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != -1) {
+        $url_info = api_get_access_url($access_url_id);
+        $url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
+        $clean_url = api_replace_dangerous_char($url);
+        $clean_url = str_replace('/', '-', $clean_url);
+        $clean_url .= '/';
+
+        $homep = $homePath; //homep for Home Path
+        $homep_new = $homePath.$clean_url; //homep for Home Path added the url
+        $new_url_dir = $homePath.$clean_url;
+        //we create the new dir for the new sites
+        if (!is_dir($new_url_dir)) {
+            mkdir($new_url_dir, api_get_permissions_for_new_directories());
+        }
+    }
 } else {
-	$homep_new = '';
-	$homep = $homePath; //homep for Home Path
+    $homep_new = '';
+    $homep = $homePath; //homep for Home Path
 }
 
 $menuf = 'home_menu'; //menuf for Menu File
@@ -177,25 +177,25 @@ 
 
 // If language-specific file does not exist, create it by copying default file
 foreach ($homef as $my_file) {
-	if (api_is_multiple_url_enabled()) {
-		if (!file_exists($homep_new.$my_file.'_'.$lang.$ext)) {
-			if (!file_exists($homep.$my_file.$ext)) {
-				touch($homep.$my_file.$ext);
-			}
-			@copy($homep.$my_file.$ext, $homep_new.$my_file.'_'.$lang.$ext);
-		}
-	} else {
-		if (!file_exists($homep.$my_file.'_'.$lang.$ext)) {
-			if (!file_exists($homep.$my_file.$ext)) {
-				touch($homep.$my_file.$ext);
-			}
-			@copy($homep.$my_file.$ext, $homep.$my_file.'_'.$lang.$ext);
-		}
-	}
+    if (api_is_multiple_url_enabled()) {
+        if (!file_exists($homep_new.$my_file.'_'.$lang.$ext)) {
+            if (!file_exists($homep.$my_file.$ext)) {
+                touch($homep.$my_file.$ext);
+            }
+            @copy($homep.$my_file.$ext, $homep_new.$my_file.'_'.$lang.$ext);
+        }
+    } else {
+        if (!file_exists($homep.$my_file.'_'.$lang.$ext)) {
+            if (!file_exists($homep.$my_file.$ext)) {
+                touch($homep.$my_file.$ext);
+            }
+            @copy($homep.$my_file.$ext, $homep.$my_file.'_'.$lang.$ext);
+        }
+    }
 }
 
 if (api_is_multiple_url_enabled()) {
-	$homep = $homep_new;
+    $homep = $homep_new;
 }
 
 // Check WCAG settings and prepare edition using WCAG
@@ -204,577 +204,577 @@ 
 // Filter link param
 $link = '';
 if (!empty($_GET['link'])) {
-	$link = $_GET['link'];
-	// If the link parameter is suspicious, empty it
-	if (strstr($link, '/') || !strstr($link, '.html') || strstr($link, '\\')) {
-		$link = '';
-		$action = '';
-	}
+    $link = $_GET['link'];
+    // If the link parameter is suspicious, empty it
+    if (strstr($link, '/') || !strstr($link, '.html') || strstr($link, '\\')) {
+        $link = '';
+        $action = '';
+    }
 }
 
 // Start analysing requested actions
 if (!empty($action)) {
-	if (!empty($_POST['formSent'])) {
-		// Variables used are $homep for home path, $menuf for menu file, $newsf
-		// for news file, $topf for top file, $noticef for noticefile,
-		// $ext for '.html'
-		switch ($action) {
-			case 'edit_top':
-				// Filter
-				$home_top = trim(stripslashes($_POST['home_top']));
-
-				// Write
-				if (is_writable($homep)) {
-					// Default
-					if (is_writable($homep.$topf.'_'.$lang.$ext)) {
-						$fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
-						fputs($fp, $home_top);
-						fclose($fp);
-
-						// Language
-						foreach ($_languages['name'] as $key => $value) {
-							$lang_name = $_languages['folder'][$key];
-							if (isset($_POST[$lang_name])) {
-								$fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
-								fputs($fp, $home_top);
-								fclose($fp);
-							}
-						}
-					} else {
-						$errorMsg = get_lang('HomePageFilesNotWritable');
-					}
-				} else {
-					//File does not exist
-					$fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
-					fputs($fp, $home_top);
-					fclose($fp);
-
-					foreach ($_languages['name'] as $key => $value) {
-						$lang_name = $_languages['folder'][$key];
-						if (isset($_POST[$lang_name])) {
-							if (file_exists($homep.$topf.'_'.$lang_name.$ext)) {
-								$fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
-								fputs($fp, $home_top);
-								fclose($fp);
-							}
-						}
-					}
-				}
-
-				if (EventsMail::check_if_using_class('portal_homepage_edited')) {
-					EventsDispatcher::events('portal_homepage_edited',array('about_user' => api_get_user_id()));
-				}
-				Event::addEvent(
-					LOG_HOMEPAGE_CHANGED,
-					'edit_top',
-					cut(strip_tags($home_top), 254),
-					api_get_utc_datetime(),
-					api_get_user_id()
-				);
-				break;
-			case 'edit_notice':
-				// Filter
-				$notice_title = trim(strip_tags(stripslashes($_POST['notice_title'])));
-				$notice_text = trim(str_replace(array("\r", "\n"), array('', '<br />'), strip_tags(stripslashes($_POST['notice_text']), '<a>')));
-				if (empty($notice_title) || empty($notice_text)) {
-					$errorMsg = get_lang('NoticeWillBeNotDisplayed');
-				}
-				// Write
-				if (file_exists($homep.$noticef.'_'.$lang.$ext)) {
-					if (is_writable($homep.$noticef.'_'.$lang.$ext)) {
-						$fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
-						if ($errorMsg == '') {
-							fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
-
-							foreach ($_languages['name'] as $key => $value) {
-								$lang_name = $_languages['folder'][$key];
-								if (isset($_POST[$lang_name])) {
-									if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
-										if (is_writable($homep.$noticef.'_'.$lang_name.$ext)) {
-											$fp = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
-											fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
-											fclose($fp);
-										}
-									}
-								}
-							}
-						} else {
-							fputs($fp, '');
-
-							foreach ($_languages['name'] as $key => $value) {
-								$lang_name = $_languages['folder'][$key];
-								if (isset($_POST[$lang_name])) {
-									if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
-										$fp1 = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
-										fputs($fp1, '');
-										fclose($fp1);
-									}
-								}
-							}
-						}
-						fclose($fp);
-					} else {
-						$errorMsg .= "<br/>\n".get_lang('HomePageFilesNotWritable');
-					}
-				} else {
-					//File does not exist
-					$fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
-					fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
-					fclose($fp);
-				}
-				Event::addEvent(
+    if (!empty($_POST['formSent'])) {
+        // Variables used are $homep for home path, $menuf for menu file, $newsf
+        // for news file, $topf for top file, $noticef for noticefile,
+        // $ext for '.html'
+        switch ($action) {
+            case 'edit_top':
+                // Filter
+                $home_top = trim(stripslashes($_POST['home_top']));
+
+                // Write
+                if (is_writable($homep)) {
+                    // Default
+                    if (is_writable($homep.$topf.'_'.$lang.$ext)) {
+                        $fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
+                        fputs($fp, $home_top);
+                        fclose($fp);
+
+                        // Language
+                        foreach ($_languages['name'] as $key => $value) {
+                            $lang_name = $_languages['folder'][$key];
+                            if (isset($_POST[$lang_name])) {
+                                $fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
+                                fputs($fp, $home_top);
+                                fclose($fp);
+                            }
+                        }
+                    } else {
+                        $errorMsg = get_lang('HomePageFilesNotWritable');
+                    }
+                } else {
+                    //File does not exist
+                    $fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
+                    fputs($fp, $home_top);
+                    fclose($fp);
+
+                    foreach ($_languages['name'] as $key => $value) {
+                        $lang_name = $_languages['folder'][$key];
+                        if (isset($_POST[$lang_name])) {
+                            if (file_exists($homep.$topf.'_'.$lang_name.$ext)) {
+                                $fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
+                                fputs($fp, $home_top);
+                                fclose($fp);
+                            }
+                        }
+                    }
+                }
+
+                if (EventsMail::check_if_using_class('portal_homepage_edited')) {
+                    EventsDispatcher::events('portal_homepage_edited',array('about_user' => api_get_user_id()));
+                }
+                Event::addEvent(
+                    LOG_HOMEPAGE_CHANGED,
+                    'edit_top',
+                    cut(strip_tags($home_top), 254),
+                    api_get_utc_datetime(),
+                    api_get_user_id()
+                );
+                break;
+            case 'edit_notice':
+                // Filter
+                $notice_title = trim(strip_tags(stripslashes($_POST['notice_title'])));
+                $notice_text = trim(str_replace(array("\r", "\n"), array('', '<br />'), strip_tags(stripslashes($_POST['notice_text']), '<a>')));
+                if (empty($notice_title) || empty($notice_text)) {
+                    $errorMsg = get_lang('NoticeWillBeNotDisplayed');
+                }
+                // Write
+                if (file_exists($homep.$noticef.'_'.$lang.$ext)) {
+                    if (is_writable($homep.$noticef.'_'.$lang.$ext)) {
+                        $fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
+                        if ($errorMsg == '') {
+                            fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
+
+                            foreach ($_languages['name'] as $key => $value) {
+                                $lang_name = $_languages['folder'][$key];
+                                if (isset($_POST[$lang_name])) {
+                                    if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
+                                        if (is_writable($homep.$noticef.'_'.$lang_name.$ext)) {
+                                            $fp = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
+                                            fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
+                                            fclose($fp);
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            fputs($fp, '');
+
+                            foreach ($_languages['name'] as $key => $value) {
+                                $lang_name = $_languages['folder'][$key];
+                                if (isset($_POST[$lang_name])) {
+                                    if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
+                                        $fp1 = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
+                                        fputs($fp1, '');
+                                        fclose($fp1);
+                                    }
+                                }
+                            }
+                        }
+                        fclose($fp);
+                    } else {
+                        $errorMsg .= "<br/>\n".get_lang('HomePageFilesNotWritable');
+                    }
+                } else {
+                    //File does not exist
+                    $fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
+                    fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
+                    fclose($fp);
+                }
+                Event::addEvent(
                     LOG_HOMEPAGE_CHANGED,
                     'edit_notice',
                     cut(strip_tags($notice_title), 254),
                     api_get_utc_datetime(),
                     api_get_user_id()
                 );
-				break;
-			case 'edit_news':
-				//Filter
-				$home_news = trim(stripslashes($_POST['home_news']));
-
-				//Write
-				if ($s_languages_news != 'all') {
-					if (file_exists($homep.$newsf.'_'.$s_languages_news.$ext)) {
-						if (is_writable($homep.$newsf.'_'.$s_languages_news.$ext)) {
-							$fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
-							fputs($fp, $home_news);
-							fclose($fp);
-						} else {
-							$errorMsg = get_lang('HomePageFilesNotWritable');
-						}
-					} else {
-						// File does not exist
-						$fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
-						fputs($fp, $home_news);
-						fclose($fp);
-					}
-				} else {
-					// We update all the news file
-					foreach ($_languages['name'] as $key => $value) {
-						$english_name = $_languages['folder'][$key];
-						if (file_exists($homep.$newsf.'_'.$english_name.$ext)) {
-							if (is_writable($homep.$newsf.'_'.$english_name.$ext)) {
-								$fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
-								fputs($fp, $home_news);
-								fclose($fp);
-							} else {
-								$errorMsg = get_lang('HomePageFilesNotWritable');
-							}
-						} else {
-							// File does not exist
-							$fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
-							fputs($fp, $home_news);
-							fclose($fp);
-						}
-					}
-				}
-				Event::addEvent(
+                break;
+            case 'edit_news':
+                //Filter
+                $home_news = trim(stripslashes($_POST['home_news']));
+
+                //Write
+                if ($s_languages_news != 'all') {
+                    if (file_exists($homep.$newsf.'_'.$s_languages_news.$ext)) {
+                        if (is_writable($homep.$newsf.'_'.$s_languages_news.$ext)) {
+                            $fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
+                            fputs($fp, $home_news);
+                            fclose($fp);
+                        } else {
+                            $errorMsg = get_lang('HomePageFilesNotWritable');
+                        }
+                    } else {
+                        // File does not exist
+                        $fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
+                        fputs($fp, $home_news);
+                        fclose($fp);
+                    }
+                } else {
+                    // We update all the news file
+                    foreach ($_languages['name'] as $key => $value) {
+                        $english_name = $_languages['folder'][$key];
+                        if (file_exists($homep.$newsf.'_'.$english_name.$ext)) {
+                            if (is_writable($homep.$newsf.'_'.$english_name.$ext)) {
+                                $fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
+                                fputs($fp, $home_news);
+                                fclose($fp);
+                            } else {
+                                $errorMsg = get_lang('HomePageFilesNotWritable');
+                            }
+                        } else {
+                            // File does not exist
+                            $fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
+                            fputs($fp, $home_news);
+                            fclose($fp);
+                        }
+                    }
+                }
+                Event::addEvent(
                     LOG_HOMEPAGE_CHANGED,
                     'edit_news',
                     strip_tags(cut($home_news, 254)),
                     api_get_utc_datetime(),
                     api_get_user_id()
                 );
-				break;
-			case 'insert_tabs':
-			case 'edit_tabs':
-			case 'insert_link':
-			case 'edit_link':
-				$link_index     = intval($_POST['link_index']);
-				$insert_where   = intval($_POST['insert_where']);
-				$link_name      = trim(stripslashes($_POST['link_name']));
-				$link_url       = trim(stripslashes($_POST['link_url']));
-				$add_in_tab     = intval($_POST['add_in_tab']);
-				$link_html = trim(stripslashes($_POST['link_html']));
-				$filename = trim(stripslashes($_POST['filename']));
-				$target_blank = $_POST['target_blank'] ? true : false;
-
-				if ($link_url == 'http://' || $link_url == 'https://') {
-					$link_url = '';
-				} elseif (!empty($link_url) && !strstr($link_url, '://')) {
-					$link_url='http://'.$link_url;
-				}
-				$menuf = ($action == 'insert_tabs' || $action == 'edit_tabs')? $mtloggedin : $menuf;
-
-				if (!is_writable($homep.$menuf.'_'.$lang.$ext)) {
-					$errorMsg = get_lang('HomePageFilesNotWritable');
-				} elseif (empty($link_name)) {
-					$errorMsg = get_lang('PleaseEnterLinkName');
-				} else {
-					// New links are added as new files in the home/ directory
-					if ($action == 'insert_link' || $action == 'insert_tabs' || empty($filename) || strstr($filename, '/') || !strstr($filename, '.html')) {
-						$filename = api_replace_dangerous_char($link_name).'.html';
-					}
-
-					// "home_" prefix for links are renamed to "user_" prefix (to avoid name clash with existing home page files)
-					if (!empty($filename)) {
-						$filename = str_replace('home_', 'user_', $filename);
-					}
-					// If the typical language suffix is not found in the file name,
-					// replace the ".html" suffix by "_en.html" or the active menu language
-					if (!strstr($filename,'_'.$lang.$ext)) {
-						$filename = str_replace($ext, '_'.$lang.$ext, $filename);
-					}
-					// Get the contents of home_menu_en.html (or active menu language
-					// version) into $home_menu as an array of one entry per line
-					$home_menu = file($homep.$menuf.'_'.$lang.$ext);
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-					$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-					// Prepare place to insert the new link into (default is end of file)
-					if ($insert_where < -1 || $insert_where > (sizeof($home_menu) - 1)) {
-						$insert_where = sizeof($home_menu) - 1;
-					}
-					//
-					// For each line of the file, remove trailing spaces and special chars
-					//foreach ($home_menu as $key => $enreg) {
-					//	$home_menu[$key] = trim($enreg);
-					//}
-					//
-					// If the given link url is empty, then replace the link url by a link to the link file created
-
-					if (empty($link_url) || $link_url == 'http://' ||  $link_url == 'https://') {
-						$link_url = api_get_path(WEB_PATH).'index.php?include='.urlencode($filename);
-						// If the file doesn't exist, then create it and
-						// fill it with default text
-
-						$fp = @fopen($homep.$filename, 'w');
-						if ($fp) {
-							if (empty($link_html)) {
-								fputs($fp, get_lang('MyTextHere'));
-								home_tabs($homep.$filename);
-							} else {
-								fputs($fp, $link_html);
-								home_tabs($homep.$filename);
-							}
-							fclose($fp);
-						}
-					}
-					// If the requested action is to edit a link, open the file and
-					// write to it (if the file doesn't exist, create it)
-					if (in_array($action, array('edit_link'))  && !empty($link_html)) {
-						$fp = @fopen($homep.$filename, 'w');
-						if ($fp) {
-							fputs($fp, $link_html);
-							home_tabs($homep.$filename);
-							fclose($fp);
-						}
-					}
+                break;
+            case 'insert_tabs':
+            case 'edit_tabs':
+            case 'insert_link':
+            case 'edit_link':
+                $link_index     = intval($_POST['link_index']);
+                $insert_where   = intval($_POST['insert_where']);
+                $link_name      = trim(stripslashes($_POST['link_name']));
+                $link_url       = trim(stripslashes($_POST['link_url']));
+                $add_in_tab     = intval($_POST['add_in_tab']);
+                $link_html = trim(stripslashes($_POST['link_html']));
+                $filename = trim(stripslashes($_POST['filename']));
+                $target_blank = $_POST['target_blank'] ? true : false;
+
+                if ($link_url == 'http://' || $link_url == 'https://') {
+                    $link_url = '';
+                } elseif (!empty($link_url) && !strstr($link_url, '://')) {
+                    $link_url='http://'.$link_url;
+                }
+                $menuf = ($action == 'insert_tabs' || $action == 'edit_tabs')? $mtloggedin : $menuf;
+
+                if (!is_writable($homep.$menuf.'_'.$lang.$ext)) {
+                    $errorMsg = get_lang('HomePageFilesNotWritable');
+                } elseif (empty($link_name)) {
+                    $errorMsg = get_lang('PleaseEnterLinkName');
+                } else {
+                    // New links are added as new files in the home/ directory
+                    if ($action == 'insert_link' || $action == 'insert_tabs' || empty($filename) || strstr($filename, '/') || !strstr($filename, '.html')) {
+                        $filename = api_replace_dangerous_char($link_name).'.html';
+                    }
+
+                    // "home_" prefix for links are renamed to "user_" prefix (to avoid name clash with existing home page files)
+                    if (!empty($filename)) {
+                        $filename = str_replace('home_', 'user_', $filename);
+                    }
+                    // If the typical language suffix is not found in the file name,
+                    // replace the ".html" suffix by "_en.html" or the active menu language
+                    if (!strstr($filename,'_'.$lang.$ext)) {
+                        $filename = str_replace($ext, '_'.$lang.$ext, $filename);
+                    }
+                    // Get the contents of home_menu_en.html (or active menu language
+                    // version) into $home_menu as an array of one entry per line
+                    $home_menu = file($homep.$menuf.'_'.$lang.$ext);
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                    $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+                    // Prepare place to insert the new link into (default is end of file)
+                    if ($insert_where < -1 || $insert_where > (sizeof($home_menu) - 1)) {
+                        $insert_where = sizeof($home_menu) - 1;
+                    }
+                    //
+                    // For each line of the file, remove trailing spaces and special chars
+                    //foreach ($home_menu as $key => $enreg) {
+                    //	$home_menu[$key] = trim($enreg);
+                    //}
+                    //
+                    // If the given link url is empty, then replace the link url by a link to the link file created
+
+                    if (empty($link_url) || $link_url == 'http://' ||  $link_url == 'https://') {
+                        $link_url = api_get_path(WEB_PATH).'index.php?include='.urlencode($filename);
+                        // If the file doesn't exist, then create it and
+                        // fill it with default text
+
+                        $fp = @fopen($homep.$filename, 'w');
+                        if ($fp) {
+                            if (empty($link_html)) {
+                                fputs($fp, get_lang('MyTextHere'));
+                                home_tabs($homep.$filename);
+                            } else {
+                                fputs($fp, $link_html);
+                                home_tabs($homep.$filename);
+                            }
+                            fclose($fp);
+                        }
+                    }
+                    // If the requested action is to edit a link, open the file and
+                    // write to it (if the file doesn't exist, create it)
+                    if (in_array($action, array('edit_link'))  && !empty($link_html)) {
+                        $fp = @fopen($homep.$filename, 'w');
+                        if ($fp) {
+                            fputs($fp, $link_html);
+                            home_tabs($homep.$filename);
+                            fclose($fp);
+                        }
+                    }
 
                     $class_add_in_tab = 'class="show_menu"';
 
-					if (!$add_in_tab) {
-						$class_add_in_tab = 'class="hide_menu"';
-					}
+                    if (!$add_in_tab) {
+                        $class_add_in_tab = 'class="hide_menu"';
+                    }
 
-					// If the requested action is to create a link, make some room
-					// for the new link in the home_menu array at the requested place
-					// and insert the new link there
+                    // If the requested action is to create a link, make some room
+                    // for the new link in the home_menu array at the requested place
+                    // and insert the new link there
                     
-					if ($action == 'insert_link' || $action == 'insert_tabs') {
-						for ($i = sizeof($home_menu); $i; $i--) {
-							if ($i > $insert_where) {
-								$home_menu[$i] = $home_menu[$i - 1];
-							} else {
-								break;
-							}
-						}
-						$home_menu[$insert_where + 1] = '<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank ? '_blank' : '_self').'">'. $link_name .'</a></li>';
-					} else {
-						// If the request is about a link edition, change the link
-						$home_menu[$link_index]='<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank?'_blank':'_self').'">'. $link_name .'</a></li>';
-					}
-					// Re-build the file from the home_menu array
-					$home_menu = implode("\n", $home_menu);
-					// Write
-					if (file_exists($homep.$menuf.'_'.$lang.$ext)) {
-						if (is_writable($homep.$menuf.'_'.$lang.$ext)) {
-							$fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
-							fputs($fp, $home_menu);
-							home_tabs($homep.$menuf.'_'.$lang.$ext);
-							fclose($fp);
-
-							foreach ($_languages['name'] as $key => $value) {
-								$lang_name = $_languages['folder'][$key];
-								if (isset($_POST[$lang_name])) {
-									$fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
-									fputs($fp, $home_menu);
-									home_tabs($homep.$menuf.'_'.$lang_name.$ext);
-									fclose($fp);
-								}
-							}
-
-							if (file_exists($homep.$menuf.$ext)) {
-								if (is_writable($homep.$menuf.$ext)) {
-									$fpo = fopen($homep.$menuf.$ext, 'w');
-									fputs($fpo, $home_menu);
-									home_tabs($homep.$menuf.$ext);
-									fclose($fpo);
-								}
-							}
-						} else {
-							$errorMsg = get_lang('HomePageFilesNotWritable');
-						}
-					} else {
-						//File does not exist
-						$fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
-						fputs($fp, $home_menu);
-						home_tabs($homep.$menuf.'_'.$lang.$ext);
-						fclose($fp);
-
-						foreach ($_languages['name'] as $key => $value) {
-							$lang_name = $_languages['folder'][$key];
-							if (isset($_POST[$lang_name])) {
-								$fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
-								fputs($fp, $home_menu);
-								home_tabs($homep.$menuf.'_'.$lang_name.$ext);
-								fclose($fp);
-							}
-						}
-					}
-				}
-				Event::addEvent(
-					LOG_HOMEPAGE_CHANGED,
-					$action,
-					cut($link_name . ':' . $link_url, 254),
-					api_get_utc_datetime(),
-					api_get_user_id()
-				);
-				break;
-		} //end of switch($action)
-
-		if (empty($errorMsg)) {
-			header('Location: '.$selfUrl.'?language='.$languageGet);
-			exit();
-		}
-	} else {
-		//if POST[formSent] is not set
-		switch ($action) {
-			case 'open_link':
-				// Previously, filtering of GET['link'] was done here but it left
-				// a security threat. Filtering has now been moved outside conditions
-				break;
-			case 'delete_tabs':
-			case 'delete_link':
-				// A link is deleted by getting the file into an array, removing the
-				// link and re-writing the array to the file
-				$link_index = intval($_GET['link_index']);
-				$menuf = ($action == 'delete_tabs')? $mtloggedin : $menuf;
-				$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				foreach ($home_menu as $key => $enreg) {
-					if ($key == $link_index) {
-						unset($home_menu[$key]);
-					} else {
-						$home_menu[$key] = trim($enreg);
-					}
-				}
-				$home_menu = implode("\n", $home_menu);
-				$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-
-				$fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
-				fputs($fp, $home_menu);
-				home_tabs($homep.$menuf.'_'.$lang.$ext);
-				fclose($fp);
-				if (file_exists($homep.$menuf.$ext)) {
-					if (is_writable($homep.$menuf.$ext)) {
-						$fpo = fopen($homep.$menuf.$ext,'w');
-						fputs($fpo, $home_menu);
-						home_tabs($homep.$menuf.$ext);
-						fclose($fpo);
-					}
-				}
-				header('Location: '.$selfUrl);
-				exit();
-				break;
-			case 'edit_top':
-				// This request is only the preparation for the update of the home_top
-				$home_top = '';
-				if (is_file($homep.$topf.'_'.$lang.$ext) && is_readable($homep.$topf.'_'.$lang.$ext)) {
-					$home_top = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext);
-				} elseif (is_file($homep.$topf.$lang.$ext) && is_readable($homep.$topf.$lang.$ext)) {
-					$home_top = @(string)file_get_contents($homep.$topf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				$home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
-				break;
-			case 'edit_notice':
-				// This request is only the preparation for the update of the home_notice
-				$home_notice = '';
-				if (is_file($homep.$noticef.'_'.$lang.$ext) && is_readable($homep.$noticef.'_'.$lang.$ext)) {
-					$home_notice = @file($homep.$noticef.'_'.$lang.$ext);
-				} elseif (is_file($homep.$noticef.$lang.$ext) && is_readable($homep.$noticef.$lang.$ext)) {
-					$home_notice = @file($homep.$noticef.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				if (empty($home_notice)) {
-					$home_notice = array();
-				}
-				$notice_title = strip_tags($home_notice[0]);
-				$notice_title = api_to_system_encoding($notice_title, api_detect_encoding($notice_title));
-				$notice_text = strip_tags(str_replace('<br />', "\n", $home_notice[1]), '<a>');
-				$notice_text = api_to_system_encoding($notice_text, api_detect_encoding(strip_tags($notice_text)));
-				break;
-			case 'edit_news':
-				// This request is the preparation for the update of the home_news page
-				$home_news = '';
-				if (is_file($homep.$newsf.'_'.$lang.$ext) && is_readable($homep.$newsf.'_'.$lang.$ext)) {
-					$home_news = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
-				} elseif (is_file($homep.$newsf.$lang.$ext) && is_readable($homep.$newsf.$lang.$ext)) {
-					$home_news = @(string)file_get_contents($homep.$newsf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				$home_news = api_to_system_encoding($home_news, api_detect_encoding(strip_tags($home_news)));
-				break;
-			case 'insert_link':
-				// This request is the preparation for the addition of an item in home_menu
-				$home_menu = '';
-				$menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
-				if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
-				} elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				if (!empty($home_menu)) {
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-				}
-				$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-				break;
-			case 'insert_tabs':
-				// This request is the preparation for the addition of an item in home_menu
-				$home_menu = '';
-				if (is_file($homep.$mtloggedin.'_'.$lang.$ext) && is_readable($homep.$mtloggedin.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
-				} elseif (is_file($homep.$mtloggedin.$lang.$ext) && is_readable($homep.$mtloggedin.$lang.$ext)) {
-					$home_menu = @file($homep.$mtloggedin.$lang.$ext);
-				} elseif (touch($homep.$mtloggedin.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				if (!empty($home_menu)) {
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-				}
-				$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-				break;
-			case 'edit_tabs':
-			case 'edit_link':
-				// This request is the preparation for the edition of the links array
-				$home_menu = '';
-				$menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
-				if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
-				} elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-
-				if (empty($home_menu)) {
-					if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
-						$home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
-					}
-				}
-
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				if (!empty($home_menu)) {
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-				}
-
-				$link_index = intval($_GET['link_index']);
-
-				$target_blank = false;
-				$link_name = '';
-				$link_url = '';
-
-				//$home_menu_new = array();
-				//
-				//Cleaning array
-				//foreach ($home_menu as $item) {
-				//	if(!empty($item)) {
-				//		$home_menu_new[] = $item;
-				//	}
-				//}
-				//$home_menu = $home_menu_new;
-
-				// Cleaning the array
-				$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-
-				// For each line of the home_menu file
-				foreach ($home_menu as $key => $enreg) {
-
-					// Check if the current item is the one we want to update
-					if ($key == $link_index) {
-						// This is the link we want to update
-						// Check if the target should be "_blank"
-						if (strstr($enreg, 'target="_blank"')) {
-							$target_blank = true;
-						}
-
-						if (strstr($enreg, 'hide_menu')) {
-							$add_in_tab = false;
-						} else {
-							$add_in_tab = true;
-						}
-
-						// Remove dangerous HTML tags from the link itself (this is an
-						// additional measure in case a link previously contained
-						// unsecure tags)
-						$link_name = strip_tags($enreg);
-
-						// Get the contents of "href" attribute in $link_url
-						$enreg = explode('href="',$enreg);
-						list($link_url) = explode('"', $enreg[sizeof($enreg) - 1]);
-
-						// If the link contains the web root of this portal, then strip
-						// it off and keep only the name of the file that needs edition
-						if (strstr($link_url, '?include=')) {
-							$link_url = explode('?include=', $link_url);
-
-							$filename = $link_url[sizeof($link_url) - 1];
-
-							if (!strstr($filename, '/') && strstr($filename, '.html')) {
-								// Get oonly the contents of the link file
-								$link_html = @file($homep.$filename);
-								$link_html = implode('', $link_html);
-								$link_url = '';
-							} else {
-								$filename = '';
-							}
-						}
-						break;
-					}
-				}
-				break;
-		}//end of second switch($action) (when POST['formSent'] was not set, yet)
-	}// end of "else" in if($_POST['formSent']) condition
+                    if ($action == 'insert_link' || $action == 'insert_tabs') {
+                        for ($i = sizeof($home_menu); $i; $i--) {
+                            if ($i > $insert_where) {
+                                $home_menu[$i] = $home_menu[$i - 1];
+                            } else {
+                                break;
+                            }
+                        }
+                        $home_menu[$insert_where + 1] = '<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank ? '_blank' : '_self').'">'. $link_name .'</a></li>';
+                    } else {
+                        // If the request is about a link edition, change the link
+                        $home_menu[$link_index]='<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank?'_blank':'_self').'">'. $link_name .'</a></li>';
+                    }
+                    // Re-build the file from the home_menu array
+                    $home_menu = implode("\n", $home_menu);
+                    // Write
+                    if (file_exists($homep.$menuf.'_'.$lang.$ext)) {
+                        if (is_writable($homep.$menuf.'_'.$lang.$ext)) {
+                            $fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
+                            fputs($fp, $home_menu);
+                            home_tabs($homep.$menuf.'_'.$lang.$ext);
+                            fclose($fp);
+
+                            foreach ($_languages['name'] as $key => $value) {
+                                $lang_name = $_languages['folder'][$key];
+                                if (isset($_POST[$lang_name])) {
+                                    $fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
+                                    fputs($fp, $home_menu);
+                                    home_tabs($homep.$menuf.'_'.$lang_name.$ext);
+                                    fclose($fp);
+                                }
+                            }
+
+                            if (file_exists($homep.$menuf.$ext)) {
+                                if (is_writable($homep.$menuf.$ext)) {
+                                    $fpo = fopen($homep.$menuf.$ext, 'w');
+                                    fputs($fpo, $home_menu);
+                                    home_tabs($homep.$menuf.$ext);
+                                    fclose($fpo);
+                                }
+                            }
+                        } else {
+                            $errorMsg = get_lang('HomePageFilesNotWritable');
+                        }
+                    } else {
+                        //File does not exist
+                        $fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
+                        fputs($fp, $home_menu);
+                        home_tabs($homep.$menuf.'_'.$lang.$ext);
+                        fclose($fp);
+
+                        foreach ($_languages['name'] as $key => $value) {
+                            $lang_name = $_languages['folder'][$key];
+                            if (isset($_POST[$lang_name])) {
+                                $fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
+                                fputs($fp, $home_menu);
+                                home_tabs($homep.$menuf.'_'.$lang_name.$ext);
+                                fclose($fp);
+                            }
+                        }
+                    }
+                }
+                Event::addEvent(
+                    LOG_HOMEPAGE_CHANGED,
+                    $action,
+                    cut($link_name . ':' . $link_url, 254),
+                    api_get_utc_datetime(),
+                    api_get_user_id()
+                );
+                break;
+        } //end of switch($action)
+
+        if (empty($errorMsg)) {
+            header('Location: '.$selfUrl.'?language='.$languageGet);
+            exit();
+        }
+    } else {
+        //if POST[formSent] is not set
+        switch ($action) {
+            case 'open_link':
+                // Previously, filtering of GET['link'] was done here but it left
+                // a security threat. Filtering has now been moved outside conditions
+                break;
+            case 'delete_tabs':
+            case 'delete_link':
+                // A link is deleted by getting the file into an array, removing the
+                // link and re-writing the array to the file
+                $link_index = intval($_GET['link_index']);
+                $menuf = ($action == 'delete_tabs')? $mtloggedin : $menuf;
+                $home_menu = @file($homep.$menuf.'_'.$lang.$ext);
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                foreach ($home_menu as $key => $enreg) {
+                    if ($key == $link_index) {
+                        unset($home_menu[$key]);
+                    } else {
+                        $home_menu[$key] = trim($enreg);
+                    }
+                }
+                $home_menu = implode("\n", $home_menu);
+                $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+
+                $fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
+                fputs($fp, $home_menu);
+                home_tabs($homep.$menuf.'_'.$lang.$ext);
+                fclose($fp);
+                if (file_exists($homep.$menuf.$ext)) {
+                    if (is_writable($homep.$menuf.$ext)) {
+                        $fpo = fopen($homep.$menuf.$ext,'w');
+                        fputs($fpo, $home_menu);
+                        home_tabs($homep.$menuf.$ext);
+                        fclose($fpo);
+                    }
+                }
+                header('Location: '.$selfUrl);
+                exit();
+                break;
+            case 'edit_top':
+                // This request is only the preparation for the update of the home_top
+                $home_top = '';
+                if (is_file($homep.$topf.'_'.$lang.$ext) && is_readable($homep.$topf.'_'.$lang.$ext)) {
+                    $home_top = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext);
+                } elseif (is_file($homep.$topf.$lang.$ext) && is_readable($homep.$topf.$lang.$ext)) {
+                    $home_top = @(string)file_get_contents($homep.$topf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                $home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
+                break;
+            case 'edit_notice':
+                // This request is only the preparation for the update of the home_notice
+                $home_notice = '';
+                if (is_file($homep.$noticef.'_'.$lang.$ext) && is_readable($homep.$noticef.'_'.$lang.$ext)) {
+                    $home_notice = @file($homep.$noticef.'_'.$lang.$ext);
+                } elseif (is_file($homep.$noticef.$lang.$ext) && is_readable($homep.$noticef.$lang.$ext)) {
+                    $home_notice = @file($homep.$noticef.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                if (empty($home_notice)) {
+                    $home_notice = array();
+                }
+                $notice_title = strip_tags($home_notice[0]);
+                $notice_title = api_to_system_encoding($notice_title, api_detect_encoding($notice_title));
+                $notice_text = strip_tags(str_replace('<br />', "\n", $home_notice[1]), '<a>');
+                $notice_text = api_to_system_encoding($notice_text, api_detect_encoding(strip_tags($notice_text)));
+                break;
+            case 'edit_news':
+                // This request is the preparation for the update of the home_news page
+                $home_news = '';
+                if (is_file($homep.$newsf.'_'.$lang.$ext) && is_readable($homep.$newsf.'_'.$lang.$ext)) {
+                    $home_news = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
+                } elseif (is_file($homep.$newsf.$lang.$ext) && is_readable($homep.$newsf.$lang.$ext)) {
+                    $home_news = @(string)file_get_contents($homep.$newsf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                $home_news = api_to_system_encoding($home_news, api_detect_encoding(strip_tags($home_news)));
+                break;
+            case 'insert_link':
+                // This request is the preparation for the addition of an item in home_menu
+                $home_menu = '';
+                $menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
+                if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.'_'.$lang.$ext);
+                } elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                if (!empty($home_menu)) {
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                }
+                $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+                break;
+            case 'insert_tabs':
+                // This request is the preparation for the addition of an item in home_menu
+                $home_menu = '';
+                if (is_file($homep.$mtloggedin.'_'.$lang.$ext) && is_readable($homep.$mtloggedin.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
+                } elseif (is_file($homep.$mtloggedin.$lang.$ext) && is_readable($homep.$mtloggedin.$lang.$ext)) {
+                    $home_menu = @file($homep.$mtloggedin.$lang.$ext);
+                } elseif (touch($homep.$mtloggedin.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                if (!empty($home_menu)) {
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                }
+                $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+                break;
+            case 'edit_tabs':
+            case 'edit_link':
+                // This request is the preparation for the edition of the links array
+                $home_menu = '';
+                $menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
+                if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.'_'.$lang.$ext);
+                } elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+
+                if (empty($home_menu)) {
+                    if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
+                        $home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
+                    }
+                }
+
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                if (!empty($home_menu)) {
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                }
+
+                $link_index = intval($_GET['link_index']);
+
+                $target_blank = false;
+                $link_name = '';
+                $link_url = '';
+
+                //$home_menu_new = array();
+                //
+                //Cleaning array
+                //foreach ($home_menu as $item) {
+                //	if(!empty($item)) {
+                //		$home_menu_new[] = $item;
+                //	}
+                //}
+                //$home_menu = $home_menu_new;
+
+                // Cleaning the array
+                $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+
+                // For each line of the home_menu file
+                foreach ($home_menu as $key => $enreg) {
+
+                    // Check if the current item is the one we want to update
+                    if ($key == $link_index) {
+                        // This is the link we want to update
+                        // Check if the target should be "_blank"
+                        if (strstr($enreg, 'target="_blank"')) {
+                            $target_blank = true;
+                        }
+
+                        if (strstr($enreg, 'hide_menu')) {
+                            $add_in_tab = false;
+                        } else {
+                            $add_in_tab = true;
+                        }
+
+                        // Remove dangerous HTML tags from the link itself (this is an
+                        // additional measure in case a link previously contained
+                        // unsecure tags)
+                        $link_name = strip_tags($enreg);
+
+                        // Get the contents of "href" attribute in $link_url
+                        $enreg = explode('href="',$enreg);
+                        list($link_url) = explode('"', $enreg[sizeof($enreg) - 1]);
+
+                        // If the link contains the web root of this portal, then strip
+                        // it off and keep only the name of the file that needs edition
+                        if (strstr($link_url, '?include=')) {
+                            $link_url = explode('?include=', $link_url);
+
+                            $filename = $link_url[sizeof($link_url) - 1];
+
+                            if (!strstr($filename, '/') && strstr($filename, '.html')) {
+                                // Get oonly the contents of the link file
+                                $link_html = @file($homep.$filename);
+                                $link_html = implode('', $link_html);
+                                $link_url = '';
+                            } else {
+                                $filename = '';
+                            }
+                        }
+                        break;
+                    }
+                }
+                break;
+        }//end of second switch($action) (when POST['formSent'] was not set, yet)
+    }// end of "else" in if($_POST['formSent']) condition
 } else {
-	//if $action is empty, then prepare a list of the course categories to display (?)
-	$Categories = getCategoriesToDisplayInHomePage();
+    //if $action is empty, then prepare a list of the course categories to display (?)
+    $Categories = getCategoriesToDisplayInHomePage();
 }
 
 // Display section
@@ -782,25 +782,25 @@ 
 Display::display_header($tool_name);
 
 switch ($action) {
-	case 'open_link':
-		if (!empty($link)) {
-			// $link is only set in case of action=open_link and is filtered
-			$open = @(string)file_get_contents($homep.$link);
-			$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
-			echo $open;
-		}
-		break;
-	case 'edit_notice':
-		// Display for edit_notice case
-		?>
+    case 'open_link':
+        if (!empty($link)) {
+            // $link is only set in case of action=open_link and is filtered
+            $open = @(string)file_get_contents($homep.$link);
+            $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
+            echo $open;
+        }
+        break;
+    case 'edit_notice':
+        // Display for edit_notice case
+        ?>
 		<form action="<?php echo $selfUrl; ?>?action=<?php echo $action; ?>" method="post" class="form-horizontal">
 			<legend><?php echo $tool_name; ?></legend>
 			<input type="hidden" name="formSent" value="1"/>
 			<?php
-			if (!empty($errorMsg)) {
-				Display::display_normal_message($errorMsg);
-			}
-			?>
+            if (!empty($errorMsg)) {
+                Display::display_normal_message($errorMsg);
+            }
+            ?>
                         <div class="row">
                             <div class="col-md-12">
                                 <p><?php echo get_lang('LetThoseFieldsEmptyToHideTheNotice'); ?></p>
@@ -838,170 +838,170 @@ 
                         </div>
 		</form>
 		<?php
-		break;
-	case 'insert_tabs':
-	case 'edit_tabs':
-	case 'insert_link':
-	case 'edit_link':
-		$menuf = ($action == 'insert_tabs' || $action == 'edit_tabs') ? $mtloggedin : $menuf;
-		if (!empty($errorMsg)) {
-			Display::display_normal_message($errorMsg);
-		}
-		$default = array();
-		$form = new FormValidator('configure_homepage_'.$action, 'post', $selfUrl.'?action='.$action, '', array('style' => 'margin: 0px;'));
-		$renderer =& $form->defaultRenderer();
-
-		$form->addElement('header', '', $tool_name);
-		$form->addElement('hidden', 'formSent', '1');
-		$form->addElement('hidden', 'link_index', ($action == 'edit_link' || $action == 'edit_tabs') ? $link_index : '0');
-		$form->addElement('hidden', 'filename', ($action == 'edit_link' || $action == 'edit_tabs') ? (!empty($filename) ? $filename : '') : '');
-
-		$form->addElement('text', 'link_name', get_lang('LinkName'), array('size' => '30', 'maxlength' => '50'));
-		if (!empty($link_name)) {
-			$default['link_name'] = $link_name;
-		}
-		$default['link_url'] = empty($link_url) ? 'http://' : api_htmlentities($link_url, ENT_QUOTES);
-		$linkUrlComment = ($action == 'insert_tabs') ? get_lang('Optional').'<br />'.get_lang('GlobalLinkUseDoubleColumnPrivateToShowPrivately') : '';
-		$form->addElement('text', 'link_url', array(get_lang('LinkURL'), $linkUrlComment), array('size' => '30', 'maxlength' => '100', 'style' => 'width: 350px;'));
-
-		$options = array('-1' => get_lang('FirstPlace'));
-
-		$selected = '';
-
-		if ($action == 'insert_link' || $action == 'insert_tabs') {
-			$add_in_tab = 1;
-			if (is_array($home_menu)){
-				foreach ($home_menu as $key => $enreg) {
-					if (strlen($enreg = trim(strip_tags($enreg))) > 0) {
-						$options[$key] = get_lang('After').' &quot;'.$enreg.'&quot;';
-						$formSentCheck = (!empty($_POST['formSent']) ? true : false);
-						$selected = $formSentCheck && $insert_where == $key ? $key : '';
-					}
-				}
-			}
-			$default['insert_link'] = $selected;
-			$form->addElement('select', 'insert_where', get_lang('InsertThisLink') , $options);
-		}
-
-		$target_blank_checkbox = $form->addElement('checkbox', 'target_blank', null, get_lang('OpenInNewWindow'), 1);
-
-		if ($action == 'insert_tabs' || $action == 'edit_tabs') {
-			$form->addElement('checkbox', 'add_in_tab', null, get_lang('AddInMenu'), 1);
-			$default['add_in_tab'] = $add_in_tab;
-		}
-
-		if (!empty($target_blank)) { $target_blank_checkbox->setChecked(true); }
-
-		if ($action == 'edit_link' && (empty($link_url) || $link_url == 'http://' || $link_url == 'https://')) {
-			$default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : $link_html;
-			$form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
+        break;
+    case 'insert_tabs':
+    case 'edit_tabs':
+    case 'insert_link':
+    case 'edit_link':
+        $menuf = ($action == 'insert_tabs' || $action == 'edit_tabs') ? $mtloggedin : $menuf;
+        if (!empty($errorMsg)) {
+            Display::display_normal_message($errorMsg);
+        }
+        $default = array();
+        $form = new FormValidator('configure_homepage_'.$action, 'post', $selfUrl.'?action='.$action, '', array('style' => 'margin: 0px;'));
+        $renderer =& $form->defaultRenderer();
+
+        $form->addElement('header', '', $tool_name);
+        $form->addElement('hidden', 'formSent', '1');
+        $form->addElement('hidden', 'link_index', ($action == 'edit_link' || $action == 'edit_tabs') ? $link_index : '0');
+        $form->addElement('hidden', 'filename', ($action == 'edit_link' || $action == 'edit_tabs') ? (!empty($filename) ? $filename : '') : '');
+
+        $form->addElement('text', 'link_name', get_lang('LinkName'), array('size' => '30', 'maxlength' => '50'));
+        if (!empty($link_name)) {
+            $default['link_name'] = $link_name;
+        }
+        $default['link_url'] = empty($link_url) ? 'http://' : api_htmlentities($link_url, ENT_QUOTES);
+        $linkUrlComment = ($action == 'insert_tabs') ? get_lang('Optional').'<br />'.get_lang('GlobalLinkUseDoubleColumnPrivateToShowPrivately') : '';
+        $form->addElement('text', 'link_url', array(get_lang('LinkURL'), $linkUrlComment), array('size' => '30', 'maxlength' => '100', 'style' => 'width: 350px;'));
+
+        $options = array('-1' => get_lang('FirstPlace'));
+
+        $selected = '';
+
+        if ($action == 'insert_link' || $action == 'insert_tabs') {
+            $add_in_tab = 1;
+            if (is_array($home_menu)){
+                foreach ($home_menu as $key => $enreg) {
+                    if (strlen($enreg = trim(strip_tags($enreg))) > 0) {
+                        $options[$key] = get_lang('After').' &quot;'.$enreg.'&quot;';
+                        $formSentCheck = (!empty($_POST['formSent']) ? true : false);
+                        $selected = $formSentCheck && $insert_where == $key ? $key : '';
+                    }
+                }
+            }
+            $default['insert_link'] = $selected;
+            $form->addElement('select', 'insert_where', get_lang('InsertThisLink') , $options);
+        }
+
+        $target_blank_checkbox = $form->addElement('checkbox', 'target_blank', null, get_lang('OpenInNewWindow'), 1);
+
+        if ($action == 'insert_tabs' || $action == 'edit_tabs') {
+            $form->addElement('checkbox', 'add_in_tab', null, get_lang('AddInMenu'), 1);
+            $default['add_in_tab'] = $add_in_tab;
+        }
+
+        if (!empty($target_blank)) { $target_blank_checkbox->setChecked(true); }
+
+        if ($action == 'edit_link' && (empty($link_url) || $link_url == 'http://' || $link_url == 'https://')) {
+            $default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : $link_html;
+            $form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
             $form->addButtonSave(get_lang('Save'),'submit');
 
-		} else {
-			if (in_array($action, array('edit_tabs','insert_tabs'))) {
-				$default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : (!empty($link_html) ? $link_html : '');
-				$form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
-			}
-			$form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'), array('id' => 'all_langs'));
-			$form->addElement('html','<table id="table_langs" style="margin-left:159px;"><tr>');
-			$i = 0;
-			foreach ($_languages['name'] as $key => $value) {
-				$i++;
-				$lang_name = $_languages['folder'][$key];
-				$html_langs = '<td width="300">';
-				$html_langs .= '<label><input type="checkbox" id="lang" name="'.$lang_name.'" />&nbsp;'.$lang_name.'<label/>';
-				$html_langs .= '</td>';
-				if ($i % 5 == 0) {
-					$html_langs .= '</tr><tr>';
-				}
-				$form->addElement('html', $html_langs);
-			}
-			$form->addElement('html','</tr></table><br/>');
+        } else {
+            if (in_array($action, array('edit_tabs','insert_tabs'))) {
+                $default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : (!empty($link_html) ? $link_html : '');
+                $form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
+            }
+            $form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'), array('id' => 'all_langs'));
+            $form->addElement('html','<table id="table_langs" style="margin-left:159px;"><tr>');
+            $i = 0;
+            foreach ($_languages['name'] as $key => $value) {
+                $i++;
+                $lang_name = $_languages['folder'][$key];
+                $html_langs = '<td width="300">';
+                $html_langs .= '<label><input type="checkbox" id="lang" name="'.$lang_name.'" />&nbsp;'.$lang_name.'<label/>';
+                $html_langs .= '</td>';
+                if ($i % 5 == 0) {
+                    $html_langs .= '</tr><tr>';
+                }
+                $form->addElement('html', $html_langs);
+            }
+            $form->addElement('html','</tr></table><br/>');
             $form->addButtonSave(get_lang('Save'),'submit');
-		}
-
-		$form->setDefaults($default);
-		$form->display();
-
-		break;
-	case 'edit_top':
-	case 'edit_news':
-		if ($action == 'edit_top') {
-			$name = $topf;
-			$open = $home_top;
-		} else {
-			$name = $newsf;
-			$open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
-		}
-		$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
-
-		if (!empty($errorMsg)) {
-			Display::display_normal_message($errorMsg); //main API
-		}
-
-		$default = array();
-		$form = new FormValidator(
-			'configure_homepage_'.$action,
-			'post',
-			$selfUrl.'?action='.$action,
-			'',
-			array('style' => 'margin: 0px;')
-		);
-		$renderer =& $form->defaultRenderer();
-		$renderer->setHeaderTemplate('');
-		$renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
-		$renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
-		$renderer->setRequiredNoteTemplate('');
-		$form->addElement('hidden', 'formSent', '1');
-
-		if ($action == 'edit_news') {
-			$_languages = api_get_languages();
-			$html = '<tr><td>'.get_lang('ChooseNewsLanguage').' : ';
-			$html .= '<select name="news_languages">';
-			$html .= '<option value="all">'.get_lang('ApplyAllLanguages').'</option>';
-			foreach ($_languages['name'] as $key => $value) {
-				$english_name = $_languages['folder'][$key];
-				if ($language == $english_name) {
-					$html .= '<option value="'.$english_name.'" selected="selected">'.$value.'</option>';
-				} else {
-					$html .= '<option value="'.$english_name.'">'.$value.'</option>';
-				}
-			}
-			$html .= '</select></td></tr>';
-			$form->addElement('html', $html);
-		}
-
-		$default[$name] = str_replace('{rel_path}', api_get_path(REL_PATH), $open);
-		$form->addHtmlEditor($name, '', true, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
-		$form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'),array('id' => 'all_langs'));
-		$form->addElement('html','<table id="table_langs" style="margin-left:5px;"><tr>');
-
-		$currentLanguage = api_get_interface_language();
-		$i = 0;
-		foreach ($_languages['name'] as $key => $value) {
-			$lang_name = $_languages['folder'][$key];
-			$i++;
-
-			$checked = null;
-			if ($languageGet == $lang_name)  {
-				$checked = "checked";
-			}
-			$html_langs = '<td width="300">';
-			$html_langs .= '<label><input type="checkbox" '.$checked.' id="lang" name="'.$lang_name.'" />&nbsp;'.$value.'<label/>';
-			$html_langs .= '</td>';
-			if ($i % 5 == 0) {
-				$html_langs .= '</tr><tr>';
-			}
-			$form->addElement('html', $html_langs);
-		}
-		$form->addElement('html','</tr></table><br/>');
-		$form->addButtonSave(get_lang('Save'));
-		$form->setDefaults($default);
-		$form->display();
-
-		break;
-	default: // When no action applies, default page to update campus homepage
-		?>
+        }
+
+        $form->setDefaults($default);
+        $form->display();
+
+        break;
+    case 'edit_top':
+    case 'edit_news':
+        if ($action == 'edit_top') {
+            $name = $topf;
+            $open = $home_top;
+        } else {
+            $name = $newsf;
+            $open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
+        }
+        $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
+
+        if (!empty($errorMsg)) {
+            Display::display_normal_message($errorMsg); //main API
+        }
+
+        $default = array();
+        $form = new FormValidator(
+            'configure_homepage_'.$action,
+            'post',
+            $selfUrl.'?action='.$action,
+            '',
+            array('style' => 'margin: 0px;')
+        );
+        $renderer =& $form->defaultRenderer();
+        $renderer->setHeaderTemplate('');
+        $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
+        $renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
+        $renderer->setRequiredNoteTemplate('');
+        $form->addElement('hidden', 'formSent', '1');
+
+        if ($action == 'edit_news') {
+            $_languages = api_get_languages();
+            $html = '<tr><td>'.get_lang('ChooseNewsLanguage').' : ';
+            $html .= '<select name="news_languages">';
+            $html .= '<option value="all">'.get_lang('ApplyAllLanguages').'</option>';
+            foreach ($_languages['name'] as $key => $value) {
+                $english_name = $_languages['folder'][$key];
+                if ($language == $english_name) {
+                    $html .= '<option value="'.$english_name.'" selected="selected">'.$value.'</option>';
+                } else {
+                    $html .= '<option value="'.$english_name.'">'.$value.'</option>';
+                }
+            }
+            $html .= '</select></td></tr>';
+            $form->addElement('html', $html);
+        }
+
+        $default[$name] = str_replace('{rel_path}', api_get_path(REL_PATH), $open);
+        $form->addHtmlEditor($name, '', true, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
+        $form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'),array('id' => 'all_langs'));
+        $form->addElement('html','<table id="table_langs" style="margin-left:5px;"><tr>');
+
+        $currentLanguage = api_get_interface_language();
+        $i = 0;
+        foreach ($_languages['name'] as $key => $value) {
+            $lang_name = $_languages['folder'][$key];
+            $i++;
+
+            $checked = null;
+            if ($languageGet == $lang_name)  {
+                $checked = "checked";
+            }
+            $html_langs = '<td width="300">';
+            $html_langs .= '<label><input type="checkbox" '.$checked.' id="lang" name="'.$lang_name.'" />&nbsp;'.$value.'<label/>';
+            $html_langs .= '</td>';
+            if ($i % 5 == 0) {
+                $html_langs .= '</tr><tr>';
+            }
+            $form->addElement('html', $html_langs);
+        }
+        $form->addElement('html','</tr></table><br/>');
+        $form->addButtonSave(get_lang('Save'));
+        $form->setDefaults($default);
+        $form->display();
+
+        break;
+    default: // When no action applies, default page to update campus homepage
+        ?>
 
 <section id="page-home">
     <div class="row">
@@ -1157,53 +1157,53 @@ 
             ?>
 
             <?php
-		if (file_exists($homep.$newsf.'_'.$lang.$ext)) {
+        if (file_exists($homep.$newsf.'_'.$lang.$ext)) {
                     $open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
                     $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
                     echo $open;
-		} else {
+        } else {
                     $open = @(string)file_get_contents($homep.$newsf.$ext);
                     $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
                     echo $open;
-		}
+        }
             ?>
 
             <?php
                 // Add new page
-		$home_menu = '';
-		if (file_exists($homep.$mtloggedin.'_'.$lang.$ext)) {
+        $home_menu = '';
+        if (file_exists($homep.$mtloggedin.'_'.$lang.$ext)) {
                     $home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
-		} else {
+        } else {
                     $home_menu = @file($homep.$mtloggedin.$ext);
-		}
-		if (empty($home_menu)) {
+        }
+        if (empty($home_menu)) {
                     if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
-			$home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
+            $home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
                     }
-		}
-		if (empty($home_menu)) {
+        }
+        if (empty($home_menu)) {
                     $home_menu = array();
-		}
-		if (!empty($home_menu)) {
+        }
+        if (!empty($home_menu)) {
                     $home_menu = implode("\n", $home_menu);
                     $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
                     $home_menu = explode("\n", $home_menu);
-		}
-		$link_list = '';
-		$tab_counter = 0;
+        }
+        $link_list = '';
+        $tab_counter = 0;
                     foreach ($home_menu as $enreg) {
                     $enreg = trim($enreg);
-			if (!empty($enreg)) {
+            if (!empty($enreg)) {
                             $edit_link   = ' <a href="'.$selfUrl.'?action=edit_tabs&amp;link_index='.$tab_counter.'" ><span>'.Display::return_icon('edit.png', get_lang('Edit')).'</span></a>';
                             $delete_link = ' <a href="'.$selfUrl.'?action=delete_tabs&amp;link_index='.$tab_counter.'"  onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)).'\')) return false;"><span>'.Display::return_icon('delete.png', get_lang('Delete')).'</span></a>';
                             $tab_string = str_replace(array('href="'.api_get_path(WEB_PATH).'index.php?include=', '</li>'),
                                 array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename($selfUrl).'?action=open_link&link=', $edit_link.$delete_link.'</li>'),
-				$enreg);
+                $enreg);
                             $tab_string = str_replace(array('<li>', '</li>','class="hide_menu"', 'hide_menu'), '', $tab_string);
-				$link_list .= Display::tag('li', $tab_string, array('class' => 'list-group-item'));
-				$tab_counter++;
-			}
-		}
+                $link_list .= Display::tag('li', $tab_string, array('class' => 'list-group-item'));
+                $tab_counter++;
+            }
+        }
             ?>
             <div class="actions">
 		<a href="<?php echo $selfUrl; ?>?action=insert_tabs">
@@ -1211,9 +1211,9 @@ 
                 </a>
             </div>
             <?php
-		echo '<ul id="list-hiperlink" class="list-group">';
-		echo $link_list;
-		echo '</ul>';
+        echo '<ul id="list-hiperlink" class="list-group">';
+        echo $link_list;
+        echo '</ul>';
             ?>
         </div>
     </div>

custompages/language.inc.php

Indentation +8 added lines, -8 removed lines

@@ -29,11 +29,11 @@ 
     krsort($langs, SORT_NUMERIC);
     // Choosing the best match
     foreach($langs as $weight => $codes) {
-		foreach ($codes as $code) {
-        	if (in_array($code, $available_langs)) {
-            	return $code;
-        	}
-		}
+        foreach ($codes as $code) {
+            if (in_array($code, $available_langs)) {
+                return $code;
+            }
+        }
     }
     // No match
     return null;
@@ -44,7 +44,7 @@ 
  * use this if you want to avoid translation caching issues
  */
 function cp_get_lang($variable) {
-	return get_lang($variable, null, $_SESSION['user_language_choice']);
+    return get_lang($variable, null, $_SESSION['user_language_choice']);
 }
 /**
  * Code
@@ -63,12 +63,12 @@ 
 
 // Chamilo overrides this parameters at some places, e.g. in the logout link
 if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {
-	$lang_match = $_REQUEST['language'];
+    $lang_match = $_REQUEST['language'];
 }
 
 // Maybe a language had already been selected, we should honor this
 if (isset($_SESSION['user_language_choice']) && in_array($_SESSION['user_language_choice'], $chamilo_langs)) {
-	$lang_match = $_SESSION['user_language_choice'];
+    $lang_match = $_SESSION['user_language_choice'];
 }
 
 // We need to set the relevant session variables to the best match, to use Chamilo's i18n lib.

custompages/first_login-dist.php

Indentation +23 added lines, -23 removed lines

@@ -14,7 +14,7 @@ 
  * Security checks
  */
 if (! isset($_SESSION['conditional_login']['uid']))
-  die("Not Authorised");
+    die("Not Authorised");
 
 if (isset($_POST['password'])) {
     $u = api_get_user_info($_SESSION['conditional_login']['uid']);
@@ -27,26 +27,26 @@ 
         exit();
     }
     $password = $_POST['password'];
-	$updated = UserManager::update_user(
-		$u['user_id'],
-		$u['firstname'],
-		$u['lastname'],
-		$u['username'],
-		$password,
-		$u['auth_source'],
-		$u['email'],
-		$u['status'],
-		$u['official_code'],
-		$u['phone'],
-		$u['picture_uri'],
-		$u['expiration_date'],
-		$u['active'],
-		$u['creator_id'],
-		$u['hr_dept_id'],
-		null,
-		$u['language'],
-		''
-	);
+    $updated = UserManager::update_user(
+        $u['user_id'],
+        $u['firstname'],
+        $u['lastname'],
+        $u['username'],
+        $password,
+        $u['auth_source'],
+        $u['email'],
+        $u['status'],
+        $u['official_code'],
+        $u['phone'],
+        $u['picture_uri'],
+        $u['expiration_date'],
+        $u['active'],
+        $u['creator_id'],
+        $u['hr_dept_id'],
+        null,
+        $u['language'],
+        ''
+    );
 
     if ($updated !== false) {
         UserManager::update_extra_field_value($u['user_id'], 'already_logged_in', 'true');
@@ -104,8 +104,8 @@ 
 		<div id="changepassword-form-box" class="form-box">
       <div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword');?> </div>
 		<?php if (isset($error_message)) {
-			echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
-		}?>
+            echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
+        }?>
 			<form id="changepassword-form" class="form" method="post">
 				<div>
           <label for="password">*<?php echo custompages_get_lang('Password');?></label>

custompages/language.php

Indentation +22 added lines, -22 removed lines

@@ -9,30 +9,30 @@ 
  * Get the preferred language base on the browser headers
  */
 function get_preferred_language($available_langs) {
-	$langs = array();
-	foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $httplang) {
-		$rawlang = explode(';q=', $httplang);
-		if (strpos($rawlang[0], '-') !== FALSE) {
-			$rawlang[0] = substr($rawlang[0], 0, strpos($rawlang[0], '-'));
-		}
-		if (count($rawlang) == 1) {
-			$rawlang[1] = 1.0;
-		}
-		$langs[$rawlang[1]] = $rawlang[0];
-	}
-	krsort($langs, SORT_NUMERIC);
-	foreach($langs as $weight => $code) {
-		if (in_array($code, $available_langs)) {
-			return $code;
-		}
-	}
-	return null;
+    $langs = array();
+    foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $httplang) {
+        $rawlang = explode(';q=', $httplang);
+        if (strpos($rawlang[0], '-') !== FALSE) {
+            $rawlang[0] = substr($rawlang[0], 0, strpos($rawlang[0], '-'));
+        }
+        if (count($rawlang) == 1) {
+            $rawlang[1] = 1.0;
+        }
+        $langs[$rawlang[1]] = $rawlang[0];
+    }
+    krsort($langs, SORT_NUMERIC);
+    foreach($langs as $weight => $code) {
+        if (in_array($code, $available_langs)) {
+            return $code;
+        }
+    }
+    return null;
 }
 /**
  * Get a language variable in a specific language
  */
 function custompages_get_lang($variable) {
-	return get_lang($variable, null, $_SESSION['user_language_choice']);
+    return get_lang($variable, null, $_SESSION['user_language_choice']);
 }
 
 $available_langs = array('en', 'fr', 'es', 'gl', 'eu');
@@ -49,15 +49,15 @@ 
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];
 // recover previous value ...
 if (isset($_SESSION['user_language_choice']))
-	$lang_match = $_SESSION['user_language_choice'];
+    $lang_match = $_SESSION['user_language_choice'];
 
 // Chamilo parameter, on logout
 if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {
-	$lang_match = $_REQUEST['language'];
+    $lang_match = $_REQUEST['language'];
 }
 // Incoming link parameter
 if (isset($_REQUEST['lang']) && !empty($_REQUEST['lang']) && in_array($_REQUEST['lang'], $available_langs)) {
-	$lang_match = $chamilo_langs[$_REQUEST['lang']];
+    $lang_match = $chamilo_langs[$_REQUEST['lang']];
 }
 
 $detect = api_get_setting('auto_detect_language_custom_pages');