mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-12 19:54:08 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master_MDL-28542'

Browse Source
This commit is contained in:
Petr Skoda 2011-08-02 14:30:20 +02:00
commit c03b42f521
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mod/scorm/locallib.php
View File

@ -678,6 +678,10 @@ function scorm_course_format_display($user, $course) {
if (! $cm = get_coursemodule_from_instance('scorm', $scorm->id, $course->id)) {
print_error('invalidcoursemodule');
}
$contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
if ((has_capability('mod/scorm:skipview', $contextmodule))) {
scorm_simple_play($scorm, $user, $contextmodule);
}
$colspan = '';
$headertext = '<table width="100%"><tr><td class="title">'.get_string('name').': <b>'.format_string($scorm->name).'</b>';
if (has_capability('moodle/course:manageactivities', $context)) {
@ -832,12 +836,11 @@ function scorm_simple_play($scorm, $user, $context) {
}
if ($scorm->skipview >= 1) {
$sco = current($scoes);
if (scorm_get_tracks($sco->id, $user->id) === false) {
header('Location: player.php?a='.$scorm->id.'&scoid='.$sco->id.'&currentorg='.$orgidentifier);
$result = true;
} else if ($scorm->skipview == 2) {
header('Location: player.php?a='.$scorm->id.'&scoid='.$sco->id.'&currentorg='.$orgidentifier);
$result = true;
$url = new moodle_url('/mod/scorm/player.php', array('a' => $scorm->id,
'currentorg'=>$orgidentifier,
'scoid'=>$sco->id));
if ($scorm->skipview == 2 || scorm_get_tracks($sco->id, $user->id) === false) {
redirect($url);
}
}
}

4
mod/scorm/view.php
View File

@ -71,8 +71,8 @@ $pagetitle = strip_tags($course->shortname.': '.format_string($scorm->name));
add_to_log($course->id, 'scorm', 'pre-view', 'view.php?id='.$cm->id, "$scorm->id", $cm->id);
if ((has_capability('mod/scorm:skipview', $contextmodule)) && scorm_simple_play($scorm, $USER, $contextmodule)) {
exit;
if ((has_capability('mod/scorm:skipview', $contextmodule))) {
scorm_simple_play($scorm, $USER, $contextmodule);
}
//