chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Several generalizations to avoid session calls from cli.

Browse Source 
In many places session is assumed to be available, when the data is already
available in the calling place, in special for course and session ids.
skala
Marco Villegas 12 years ago
parent 8903a0b7df
commit c01405b13a
5 changed files with 44 additions and 21 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 29
      main/exercice/exercise.class.php
  2. 6
      main/exercice/exercise.lib.php
  3. 7
      main/exercice/testcategory.class.php
  4. 2
      main/inc/lib/events.lib.inc.php
  5. 21
      main/inc/lib/exercise.lib.php

29
main/exercice/exercise.class.php
Unescape View File

@ -163,9 +163,10 @@ class Exercise
* @todo use Doctrine to manage read/writes
* @param int $id - exercise ID
* @param bool parse exercise question list
* @param int $chamilo_session_id - chamilo session ID
* @return boolean - true if exercise exists, otherwise false
*/
public function read($id, $parseQuestionList = true)
public function read($id, $parseQuestionList = true, $chamilo_session_id = null)
{
if (empty($this->course_id)) {
return false;
@ -243,7 +244,7 @@ class Exercise
$this->trackExercise = $this->getStatTrackExerciseInfo();
if ($parseQuestionList) {
$this->setQuestionList($this->loadDistributions);
$this->setQuestionList($this->loadDistributions, $chamilo_session_id);
}
return true;
}
@ -849,7 +850,8 @@ class Exercise
$questionsPerMainCategory = array();
foreach ($temp_question_list as $categoryId => $questionList) {
$parentId = $categoriesAddedInExercise[$categoryId]['parent_id'];
$cat = new Testcategory();
// Default values and the course_id passed.
$cat = new Testcategory(0, '', '', 0, 'simple', $this->course_id);
$cat->getCategory($parentId);
if (!isset($questionsPerMainCategory[$cat->parent_id])) {
@ -885,8 +887,8 @@ class Exercise
'category_with_questions_list' => array()
);
// Order/random categories
$cat = new Testcategory();
// Order/random categories. Default values and the course_id passed.
$cat = new Testcategory(0, '', '', 0, 'simple', $this->course_id);
$courseId = $this->course_id;
@ -1047,7 +1049,8 @@ class Exercise
if (!empty($questions_by_category)) {
foreach ($questions_by_category as $categoryId => $questionList) {
$cat = new Testcategory($categoryId);
// Default values and the course_id passed.
$cat = new Testcategory($categoryId, '', '', 0, 'simple', $this->course_id);
$cat = (array)$cat;
$cat['iid'] = $cat['id'];
$cat['name'] = $cat['title'];
@ -2968,7 +2971,8 @@ class Exercise
$safe_lp_item_id = 0,
$safe_lp_item_view_id = 0,
$questionList = array(),
$weight = 0
$weight = 0,
$chamilo_session_id = null
) {
$track_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
$safe_lp_id = intval($safe_lp_id);
@ -2994,10 +2998,13 @@ class Exercise
$questionList = array_map('intval', $questionList);
$weight = Database::escape_string($weight);
if (!$chamilo_session_id) {
$chamilo_session_id = api_get_session_id();
}
$sql = "INSERT INTO $track_exercises
($sql_fields exe_exo_id, exe_user_id, c_id, status, session_id, data_tracking, start_date, orig_lp_id, orig_lp_item_id, exe_weighting, quiz_distribution_id)
VALUES
( $sql_fields_values '".$this->id."','".api_get_user_id()."','".api_get_course_int_id()."', 'incomplete','".api_get_session_id()."','".implode(',', $questionList)."', '".api_get_utc_datetime()."', '$safe_lp_id', '$safe_lp_item_id', '$weight', '".$this->distributionId."')";
( $sql_fields_values '".$this->id."','".api_get_user_id()."','".$this->course_id."', 'incomplete','".$chamilo_session_id."','".implode(',', $questionList)."', '".api_get_utc_datetime()."', '$safe_lp_id', '$safe_lp_item_id', '$weight', '".$this->distributionId."')";
Database::query($sql);
$id = Database::insert_id();
@ -5595,13 +5602,15 @@ class Exercise
/**
* Sets the question list when the exercise->read() is executed
*/
public function setQuestionList($loadDistributions = false)
public function setQuestionList($loadDistributions = false, $sessionId = null)
{
// Getting question list.
$questionList = $this->selectQuestionList(true);
// Looking for distributions
$sessionId = api_get_session_id();
if (!$sessionId) {
$sessionId = api_get_session_id();
}
if (!empty($sessionId)) {
$dataExists = !empty($this->trackExercise) && isset($this->trackExercise['data_tracking']) && !empty($this->trackExercise['data_tracking']) ? true : false;

6
main/exercice/exercise.lib.php
Unescape View File

@ -789,8 +789,10 @@ function get_exercise_track_exercise_info($exe_id) {
/**
* Validates the time control key
*/
function exercise_time_control_is_valid($exercise_id, $lp_id = 0 , $lp_item_id = 0) {
$course_id = api_get_course_int_id();
function exercise_time_control_is_valid($exercise_id, $lp_id = 0 , $lp_item_id = 0, $course_id = null) {
if (!$course_id) {
$course_id = api_get_course_int_id();
}
$exercise_id = intval($exercise_id);
$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
$sql = "SELECT expired_time FROM $TBL_EXERCICES WHERE c_id = $course_id AND id = $exercise_id";

7
main/exercice/testcategory.class.php
Unescape View File

@ -36,7 +36,7 @@ class Testcategory
public function Testcategory($in_id = 0, $in_name = '', $in_description = "", $parent_id = 0, $type = 'simple', $course_id = null, $visibility = 1)
{
if ($in_id != 0 && $in_name == "") {
$tmpobj = new Testcategory();
$tmpobj = new Testcategory(0, '', '', 0, 'simple', $course_id);
$tmpobj->getCategory($in_id);
$this->id = $tmpobj->id;
$this->name = $tmpobj->name;
@ -44,12 +44,13 @@ class Testcategory
$this->description = $tmpobj->description;
$this->parent_id = $tmpobj->parent_id;
$this->parent_path = $this->name;
$this->c_id = $tmpobj->c_id;
$this->c_id = isset($course_id) ? $course_id : $tmpobj->c_id;
$this->root = $tmpobj->root;
$this->visibility = $tmpobj->visibility;
if (!empty($tmpobj->parent_id)) {
$category = new Testcategory($tmpobj->parent_id);
// Default values and the course_id passed.
$category = new Testcategory($tmpobj->parent_id, '', '', 0, 'simple', $course_id);
$this->parent_path = $category->parent_path.' > '.$this->name;
}
} else {

2
main/inc/lib/events.lib.inc.php
Unescape View File

@ -493,7 +493,7 @@ function saveQuestionAttempt(
}
//Validation in case of fraud with active control time
if (!ExerciseLib::exercise_time_control_is_valid($exercise_id, $learnpath_id, $learnpath_item_id)) {
if (!ExerciseLib::exercise_time_control_is_valid($exercise_id, $learnpath_id, $learnpath_item_id, $course_id, $session_id)) {
if ($debug) {
error_log("exercise_time_control_is_valid is false");
}

21
main/inc/lib/exercise.lib.php
Unescape View File

@ -48,16 +48,21 @@ class ExerciseLib
/**
* Validates the time control key
*/
public static function exercise_time_control_is_valid($exercise_id, $lp_id = 0, $lp_item_id = 0)
public static function exercise_time_control_is_valid($exercise_id, $lp_id = 0, $lp_item_id = 0, $course_id = null, $session_id = null)
{
$course_id = api_get_course_int_id();
if (!$course_id) {
$course_id = api_get_course_int_id();
}
if (!$session_id) {
$session_id = api_get_session_id();
}
$exercise_id = intval($exercise_id);
$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
$sql = "SELECT expired_time FROM $TBL_EXERCICES WHERE c_id = $course_id AND iid = $exercise_id";
$result = Database::query($sql);
$row = Database::fetch_array($result, 'ASSOC');
if (!empty($row['expired_time'])) {
$current_expired_time_key = ExerciseLib::get_time_control_key($exercise_id, $lp_id, $lp_item_id);
$current_expired_time_key = ExerciseLib::get_time_control_key($exercise_id, $lp_id, $lp_item_id, $course_id, $session_id);
if (isset($_SESSION['expired_time'][$current_expired_time_key])) {
$current_time = time();
$expired_time = api_strtotime($_SESSION['expired_time'][$current_expired_time_key], 'UTC');
@ -88,12 +93,18 @@ class ExerciseLib
/**
Generates the time control key
*/
public static function get_time_control_key($exercise_id, $lp_id = 0, $lp_item_id = 0)
public static function get_time_control_key($exercise_id, $lp_id = 0, $lp_item_id = 0, $course_id = null, $session_id = null)
{
$exercise_id = intval($exercise_id);
$lp_id = intval($lp_id);
$lp_item_id = intval($lp_item_id);
return api_get_course_int_id().'_'.api_get_session_id().'_'.$exercise_id.'_'.api_get_user_id().'_'.$lp_id.'_'.$lp_item_id;
if (!$course_id) {
$course_id = api_get_course_int_id();
}
if (!$session_id) {
$session_id = api_get_session_id();
}
return $course_id.'_'.$session_id.'_'.$exercise_id.'_'.api_get_user_id().'_'.$lp_id.'_'.$lp_item_id;
}
/**

Write Preview
Loading…
Cancel
Save