|
@@ -103,10 +103,8 @@ class learnpathItem
|
|
|
$user_id = api_get_user_id();
|
|
|
}
|
|
|
if (self::DEBUG > 0) {
|
|
|
- error_log(
|
|
|
- "learnpathItem constructor: id: $id user_id: ".
|
|
|
- "$user_id course_id: $course_id item_content: ".print_r($item_content, 1)
|
|
|
- );
|
|
|
+ error_log("learnpathItem constructor: id: $id user_id: $user_id course_id: $course_id");
|
|
|
+ error_log("item_content: ".print_r($item_content, 1));
|
|
|
}
|
|
|
$id = intval($id);
|
|
|
if (empty($item_content)) {
|
|
@@ -1989,8 +1987,8 @@ class learnpathItem
|
|
|
}
|
|
|
$restart = 1;
|
|
|
$mystatus = $this->get_status(true);
|
|
|
- if ($this->get_prevent_reinit() > 0
|
|
|
- ) { // If prevent_reinit == 1 (or more)
|
|
|
+ if ($this->get_prevent_reinit() > 0) {
|
|
|
+ // If prevent_reinit == 1 (or more)
|
|
|
// If status is not attempted or incomplete, authorize retaking (of the same) anyway. Otherwise:
|
|
|
if ($mystatus != $this->possible_status[0] && $mystatus != $this->possible_status[1]) {
|
|
|
$restart = -1;
|
|
@@ -2197,7 +2195,6 @@ class learnpathItem
|
|
|
}
|
|
|
} else {
|
|
|
// No ORs found, now look for ANDs.
|
|
|
-
|
|
|
if (self::DEBUG > 1) {
|
|
|
error_log('New LP - Didnt find any AND, looking for =', 0);
|
|
|
}
|
|
@@ -2586,12 +2583,8 @@ class learnpathItem
|
|
|
|
|
|
if ($returnstatus && $this->prevent_reinit == 1) {
|
|
|
// I would prefer check in the database.
|
|
|
- $lp_item_view = Database::get_course_table(
|
|
|
- TABLE_LP_ITEM_VIEW
|
|
|
- );
|
|
|
- $lp_view = Database::get_course_table(
|
|
|
- TABLE_LP_VIEW
|
|
|
- );
|
|
|
+ $lp_item_view = Database::get_course_table(TABLE_LP_ITEM_VIEW);
|
|
|
+ $lp_view = Database::get_course_table(TABLE_LP_VIEW);
|
|
|
|
|
|
$sql = 'SELECT iid FROM '.$lp_view.'
|
|
|
WHERE
|
|
@@ -2601,9 +2594,7 @@ class learnpathItem
|
|
|
session_id = '.$sessionId.'
|
|
|
LIMIT 0, 1';
|
|
|
$rs_lp = Database::query($sql);
|
|
|
- $lp_id = Database::fetch_row(
|
|
|
- $rs_lp
|
|
|
- );
|
|
|
+ $lp_id = Database::fetch_row($rs_lp);
|
|
|
$my_lp_id = $lp_id[0];
|
|
|
|
|
|
$sql = 'SELECT status FROM '.$lp_item_view.'
|
|
@@ -2618,23 +2609,15 @@ class learnpathItem
|
|
|
|
|
|
$returnstatus = ($status == $this->possible_status[2]) || ($status == $this->possible_status[3]);
|
|
|
if (!$returnstatus && empty($this->prereq_alert)) {
|
|
|
- $this->prereq_alert = get_lang(
|
|
|
- 'LearnpathPrereqNotCompleted'
|
|
|
- );
|
|
|
+ $this->prereq_alert = get_lang('LearnpathPrereqNotCompleted');
|
|
|
}
|
|
|
if (!$returnstatus) {
|
|
|
if (self::DEBUG > 1) {
|
|
|
- error_log(
|
|
|
- 'New LP - Prerequisite '.$prereqs_string.' not complete',
|
|
|
- 0
|
|
|
- );
|
|
|
+ error_log('New LP - Prerequisite '.$prereqs_string.' not complete');
|
|
|
}
|
|
|
} else {
|
|
|
if (self::DEBUG > 1) {
|
|
|
- error_log(
|
|
|
- 'New LP - Prerequisite '.$prereqs_string.' complete',
|
|
|
- 0
|
|
|
- );
|
|
|
+ error_log('New LP - Prerequisite '.$prereqs_string.' complete');
|
|
|
}
|
|
|
}
|
|
|
}
|