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

MDL-68410 mod_scorm: safer status operator comparison.

Browse Source
This commit is contained in:
Paul Holden
2020-05-07 09:03:09 +08:00
committed by Jake Dallimore
parent 8aa0b41e9b
commit fadae3cfe9
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/scorm/lang/en/scorm.php
+1
View File
@@ -244,6 +244,7 @@ $string['trackweight'] = 'Weight';
$string['trackweight_help'] = 'Weight assigned to the question when calculating score.';
$string['invalidactivity'] = 'SCORM activity is incorrect';
$string['invalidmanifestname'] = 'Only imsmanifest.xml or .zip files may be selected';
$string['invalidstatus'] = 'Invalid status';
$string['invalidurl'] = 'Invalid URL specified';
$string['invalidurlhttpcheck'] = 'Invalid URL specified. Debug message:<pre>{$a->cmsg}</pre>';
$string['invalidhacpsession'] = 'Invalid HACP session';
mod/scorm/locallib.php
+14 -5
View File
@@ -1582,10 +1582,18 @@ function scorm_get_toc_object($user, $scorm, $currentorg='', $scoid='', $mode='n
if (isset($usertracks[$sco->identifier])) {
$usertrack = $usertracks[$sco->identifier];
$strstatus = get_string($usertrack->status, 'scorm');
// Check we have a valid status string identifier.
if ($statusstringexists = get_string_manager()->string_exists($usertrack->status, 'scorm')) {
$strstatus = get_string($usertrack->status, 'scorm');
} else {
$strstatus = get_string('invalidstatus', 'scorm');
}
if ($sco->scormtype == 'sco') {
$statusicon = $OUTPUT->pix_icon($usertrack->status, $strstatus, 'scorm');
// Assume if we didn't get a valid status string, we don't have an icon either.
$statusicon = $OUTPUT->pix_icon($statusstringexists ? $usertrack->status : 'incomplete',
$strstatus, 'scorm');
} else {
$statusicon = $OUTPUT->pix_icon('asset', get_string('assetlaunched', 'scorm'), 'scorm');
}
@@ -2368,12 +2376,13 @@ function scorm_eval_prerequisites($prerequisites, $usertracks) {
if (isset($statuses[$value])) {
$value = $statuses[$value];
}
$elementprerequisitematch = (strcmp($usertracks[$element]->status, $value) == 0);
if ($matches[2] == '<>') {
$oper = '!=';
$element = $elementprerequisitematch ? 'false' : 'true';
} else {
$oper = '==';
$element = $elementprerequisitematch ? 'true' : 'false';
}
$element = '(\''.$usertracks[$element]->status.'\' '.$oper.' \''.$value.'\')';
} else {
$element = 'false';
}