Removing ALLOWED_TO_INCLUDE constant

main/exercice/admin.php

@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 /**
  * 	Exercise administration
@@ -44,10 +45,10 @@
  * 	@author Olivier Brouckaert
  * Modified by Hubert Borderiou 21-10-2011 Question by category
  */
+
 /**
  * Code
  */
-
 use \ChamiloSession as Session;
 
 require_once 'exercise.class.php';
@@ -71,11 +72,9 @@ if (!$is_allowedToEdit) {
     api_not_allowed(true);
 }
 
-// Allows script inclusions
-define(ALLOWED_TO_INCLUDE,1);
-
 require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php';
 require_once api_get_path(LIBRARY_PATH) . 'document.lib.php';
+
 /*  stripslashes POST data  */
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
     foreach ($_POST as $key => $val) {
@@ -155,7 +154,8 @@ if ($_GET['action'] == 'exportqti2' && !empty($_GET['questionId'])) {
     $archive_path = api_get_path(SYS_ARCHIVE_PATH);
     $temp_dir_short = uniqid();
     $temp_zip_dir = $archive_path . "/" . $temp_dir_short;
-	if(!is_dir($temp_zip_dir)) mkdir($temp_zip_dir, api_get_permissions_for_new_directories());
+    if (!is_dir($temp_zip_dir))
+        mkdir($temp_zip_dir, api_get_permissions_for_new_directories());
     $temp_zip_file = $temp_zip_dir . "/" . api_get_unique_id() . ".zip";
     $temp_xml_file = $temp_zip_dir . "/qti2export_" . $qid . '.xml';
     file_put_contents($temp_xml_file, $export);

main/exercice/adminhp.php

@@ -30,9 +30,6 @@ if (isset($_REQUEST["cancel"])) {
 $newName = (!empty($_REQUEST['newName'])?$_REQUEST['newName']:'');
 $hotpotatoesName = (!empty($_REQUEST['hotpotatoesName'])?$_REQUEST['hotpotatoesName']:'');
 
-// allows script inclusions
-define(ALLOWED_TO_INCLUDE,1);
-
 $is_allowedToEdit = api_is_allowed_to_edit(null,true);
 
 // document path

main/exercice/answer_admin.inc.php

@@ -13,10 +13,6 @@
  */
 use \ChamiloSession as Session;
 
-// ALLOWED_TO_INCLUDE is defined in admin.php
-if (!defined('ALLOWED_TO_INCLUDE')) {
-    exit();
-}
 if (!is_object($objQuestion)) {
     $objQuestion = Question :: read($_GET['modifyAnswers']);
 }

main/exercice/exercice.php

@@ -128,21 +128,7 @@ if (!empty($gradebook) && $gradebook=='view') {
 	$interbreadcrumb[] = array ('url' => '../gradebook/' . $_SESSION['gradebook_dest'],'name' => get_lang('ToolGradebook'));
 }
 
-if ($show != 'result') {
 $nameTools = get_lang('Exercices');
-} else {
-	if ($is_allowedToEdit || $is_tutor) {
-		$nameTools = get_lang('StudentScore');
-		$interbreadcrumb[] = array("url" => "exercice.php?gradebook=$gradebook","name" => get_lang('Exercices'));
-	    $objExerciseTmp = new Exercise();
-        if ($objExerciseTmp->read($exerciseId)) {
-            $interbreadcrumb[] = array("url" => "admin.php?exerciseId=".$exerciseId, "name" => $objExerciseTmp->name);
-        }
-	} else {
-		$nameTools = get_lang('YourScore');
-		$interbreadcrumb[] = array ("url" => "exercice.php?gradebook=$gradebook","name" => get_lang('Exercices'));
-	}
-}
 
 if ($is_allowedToEdit && !empty ($choice) && $choice == 'exportqti2') {
 	require_once 'export/qti2/qti2_export.php';
@@ -554,7 +540,9 @@ if (!empty($exercise_list)) {
                     $title = $cut_title;
                 }
 
-                $count = intval(count_exercise_result_not_validated($my_exercise_id, $course_code, $session_id));
+                /*
+                 * Exercise results counter
+                 * $count = intval(count_exercise_result_not_validated($my_exercise_id, $course_code, $session_id));
 
                 $class_tip = '';
                 if (!empty($count)) {
@@ -565,8 +553,9 @@ if (!empty($exercise_list)) {
 
                 if ($added_to_lp) {
                     //$title .= Display::div(get_lang('AddedToLPCannotBeAccessed'), array('class'=> 'lp_content_type_label'));
-                }
+                }*/
                 
+                $class_tip = null;
                 $url = '<a '.$alt_title.' class="'.$class_tip.'" id="tooltip_'.$row['id'].'" href="overview.php?'.api_get_cidreq().$myorigin.$mylpid.$mylpitemid.'&exerciseId='.$row['id'].'"><img src="../img/quiz.gif" /> '.$title.' </a>';
 
                 $item =  Display::tag('td', $url.' '.$session_img.$lp_blocked);

main/exercice/hotspot_admin.inc.php

@@ -9,13 +9,9 @@
 
 /**
  * Code 
- * ALLOWED_TO_INCLUDE is defined in admin.php
  */
 use \ChamiloSession as Session;
 
-if (!defined('ALLOWED_TO_INCLUDE')) {
-    exit();
-}
 $modifyAnswers = intval($_GET['hotspotadmin']);
 
 if (!is_object($objQuestion)) {

main/exercice/question_admin.inc.php

@@ -12,11 +12,6 @@
  * Code
  */
 
-// ALLOWED_TO_INCLUDE is defined in admin.php
-if(!defined('ALLOWED_TO_INCLUDE')) {
-	exit();
-}
-
 $course_id = api_get_course_int_id();
 
 // INIT QUESTION

main/exercice/question_list_admin.inc.php

@@ -16,10 +16,6 @@
 * Modified by Hubert Borderiou 21-10-2011 (Question by category)
 */
 
-// ALLOWED_TO_INCLUDE is defined in admin.php
-if (!defined('ALLOWED_TO_INCLUDE')) {
-	exit();
-}
 // deletes a question from the exercise (not from the data base)
 if ($deleteQuestion) {
 	// if the question exists

main/inc/lib/events.lib.inc.php

@@ -1258,8 +1258,6 @@ function count_exercise_result_not_validated($exercise_id, $course_code, $sessio
     $session_id     = intval($session_id);
     $exercise_id    = intval($exercise_id);
 
-    $status = Database::escape_string($status);
-
     $sql = "SELECT count(e.exe_id) as count FROM $table_track_exercises e LEFT JOIN $table_track_attempt a  ON e.exe_id = a.exe_id
             WHERE   exe_exo_id = $exercise_id AND
                     exe_cours_id = '$course_code' AND