L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2013-04-03 17:22:38 +08:00
parent 41b9392daa fe104762c9
commit 369496c31e
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/scorm/datamodels/debug.js.php
+8
View File
@@ -737,6 +737,14 @@ function LogAPICall(func, nam, val, rc) {
}
s += ' => ' + String(rc);
AppendToLog(s, rc);
<?php
if (scorm_debugging($scorm) && ($sco->scormtype == 'asset')) {
?>
hint = 'Item <?php echo $sco->identifier; ?> has been defined as an Asset: it should never call the SCORM API';
AppendToLog(hint, 101);
<?php
}
?>
}
mod/scorm/loadSCO.php
+11 -3
View File
@@ -161,11 +161,19 @@ if (scorm_external_link($sco->launch)) {
add_to_log($course->id, 'scorm', 'launch', 'view.php?id='.$cm->id, $result, $cm->id);
// which API are we looking for
$LMS_api = (scorm_version_check($scorm->version, SCORM_12) || empty($scorm->version)) ? 'API' : 'API_1484_11';
header('Content-Type: text/html; charset=UTF-8');
if ($sco->scormtype == 'asset') {
// HTTP 302 Found => Moved Temporarily.
header('Location: ' . $result);
// Provide a short feedback in case of slow network connection.
echo '<html><body><p>' . get_string('activitypleasewait', 'scorm'). '</p></body></html>';
exit;
}
// We expect a SCO: select which API are we looking for.
$LMS_api = (scorm_version_check($scorm->version, SCORM_12) || empty($scorm->version)) ? 'API' : 'API_1484_11';
?>
<html>
<head>