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

Minor - Format code, fix fatal error.

Browse Source
1.10.x
Julio Montoya 10 years ago
parent b861230ad2
commit 08e852db4d
4 changed files with 21 additions and 23 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. 1
      main/newscorm/learnpath.class.php
  2. 9
      main/newscorm/learnpathItem.class.php
  3. 30
      main/newscorm/lp_ajax_save_item.php
  4. 4
      main/newscorm/lp_upload.php

1
main/newscorm/learnpath.class.php
Unescape View File

@ -2753,7 +2753,6 @@ class learnpath
$prereq = preg_replace('/[^a-zA-Z_0-9](' . $id . ')[^a-zA-Z_0-9]/', 'ITEM_' . $this->refs_list[$id], $prereq);
}
}
//error_log('New LP - In learnpath::get_scorm_prereq_string(): returning modified string: ' . $prereq, 0);
return $prereq;
}

9
main/newscorm/learnpathItem.class.php
Unescape View File

@ -2843,9 +2843,9 @@ class learnpathItem
if ($this->type == 'sco' || $this->type == 'au') {
$status = $this->get_status(true);
if ($this->prevent_reinit == 1 AND
$status != $this->possible_status[0] AND
$status != $this->possible_status[1]
if ($this->prevent_reinit == 1 &&
$status != $this->possible_status[0] && // not attempted
$status != $this->possible_status[1] //incomplete
) {
if (self::debug > 1) {
error_log(
@ -2862,7 +2862,8 @@ class learnpathItem
0
);
}
//get all new settings from the URL
// Get all new settings from the URL
if ($from_outside) {
if (self::debug > 1) {
error_log(

30
main/newscorm/lp_ajax_save_item.php
Unescape View File

@ -189,7 +189,7 @@ function save_item(
/*
* This is a specific implementation for SCORM 1.2, matching page 26 of SCORM 1.2's RTE
* "Normally the SCO determines its own status and passes it to the LMS.
* 1) If cmi.core.credit is set to “credit” and there is a mastery
* 1) If cmi.core.credit is set to "credit" and there is a mastery
* score in the manifest (adlcp:masteryscore), the LMS can change
* the status to either passed or failed depending on the
* student's score compared to the mastery score.
@ -207,18 +207,18 @@ function save_item(
* There is some additional requirements that must be adhered to
* successfully handle these cases:
* Upon initial launch
* the LMS should set the cmi.core.lesson_status to “not attempted”.
* the LMS should set the cmi.core.lesson_status to "not attempted".
* Upon receiving the LMSFinish() call or the user navigates away,
* the LMS should set the cmi.core.lesson_status for the SCO to “completed”.
* After setting the cmi.core.lesson_status to “completed”,
* the LMS should set the cmi.core.lesson_status for the SCO to "completed".
* After setting the cmi.core.lesson_status to "completed",
* the LMS should now check to see if a Mastery Score has been
* specified in the cmi.student_data.mastery_score, if supported,
* or the manifest that the SCO is a member of.
* If a Mastery Score is provided and the SCO did set the
* cmi.core.score.raw, the LMS shall compare the cmi.core.score.raw
* to the Mastery Score and set the cmi.core.lesson_status to
* either “passed” or “failed”. If no Mastery Score is provided,
* the LMS will leave the cmi.core.lesson_status as “completed”
* either "passed" or "failed". If no Mastery Score is provided,
* the LMS will leave the cmi.core.lesson_status as "completed"
*/
$masteryScore = $myLPI->get_mastery_score();
if ($masteryScore == -1 or empty($masteryScore)) {
@ -227,7 +227,7 @@ function save_item(
$credit = $myLPI->get_credit();
/**
* 1) If cmi.core.credit is set to “credit” and there is a mastery
* 1) If cmi.core.credit is set to "credit" and there is a mastery
* score in the manifest (adlcp:masteryscore), the LMS can change
* the status to either passed or failed depending on the
* student's score compared to the mastery score.
@ -256,6 +256,7 @@ function save_item(
}
//if no status was set directly, we keep the previous one
}
/**
* 3) If the student is taking the SCO for no-credit, there is no
* change to the lesson_status, with one exception. If the
@ -270,6 +271,7 @@ function save_item(
}
//if no status was set directly, we keep the previous one
}
/**
* If a SCO sets the cmi.core.lesson_status then there is no problem.
* However, the SCORM does not force the SCO to set the
@ -279,26 +281,26 @@ function save_item(
if (!$statusIsSet && empty($status) && !$statusSignalReceived) {
/**
* Upon initial launch the LMS should set the
* cmi.core.lesson_status to “not attempted”.
* cmi.core.lesson_status to "not attempted".
*/
// this case should be handled by LMSInitialize() and xajax_switch_item()
/**
* Upon receiving the LMSFinish() call or the user navigates
* away, the LMS should set the cmi.core.lesson_status for the
* SCO to “completed”.
* SCO to "completed".
*/
if ($lmsFinish or $userNavigatesAway) {
$myStatus = 'completed';
/**
* After setting the cmi.core.lesson_status to “completed”,
* After setting the cmi.core.lesson_status to "completed",
* the LMS should now check to see if a Mastery Score has been
* specified in the cmi.student_data.mastery_score, if supported,
* or the manifest that the SCO is a member of.
* If a Mastery Score is provided and the SCO did set the
* cmi.core.score.raw, the LMS shall compare the cmi.core.score.raw
* to the Mastery Score and set the cmi.core.lesson_status to
* either “passed” or “failed”. If no Mastery Score is provided,
* the LMS will leave the cmi.core.lesson_status as “completed”
* either "passed" or "failed". If no Mastery Score is provided,
* the LMS will leave the cmi.core.lesson_status as "completed”
*/
if ($masteryScore && (isset($score) && $score != -1)) {
if ($score >= $masteryScore) {
@ -432,10 +434,6 @@ function save_item(
}
$return .= "update_progress_bar('$myComplete', '$myTotal', '$myProgressMode');";
if ($debug > 0) {
$return .= "logit_lms('Saved data for item ".$item_id.", user ".$user_id." (status=".$myStatus.")',2);";
}
if (!isset($_SESSION['login_as'])) {
// If $_SESSION['login_as'] is set, then the user is an admin logged as the user.
$tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);

4
main/newscorm/lp_upload.php
Unescape View File

@ -23,10 +23,10 @@ $uncompress = 1;
* because if the file size exceed the maximum file upload
* size set in php.ini, all variables from POST are cleared !
*/
$user_file = Request::is_post() ? Request::file('user_file') : array();
$user_file = isset($_GET['user_file']) ? $_GET['user_file'] : array();
$user_file = $user_file ? $user_file : array();
$is_error = isset($user_file['error']) ? $user_file['error'] : false;
if (Request::is_post() && $is_error) {
if (isset($_POST) && $is_error) {
return api_failure::set_failure('upload_file_too_big');
unset($_FILES['user_file']);
} else if ($_SERVER['REQUEST_METHOD'] == 'POST' && count($_FILES) > 0 && !empty($_FILES['user_file']['name'])) {

Write Preview
Loading…
Cancel
Save