moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle

Browse source 
Conflicts:
	course/lib.php
This commit is contained in:
Sam Hemelryk 2013-08-21 12:08:46 +12:00
commit 6eee89bc8f
191 changed files with 280 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/scorm/datamodels/sequencinghandler.php
View file

@ -26,11 +26,11 @@ $request = optional_param('request', '', PARAM_RAW); // Scorm ID.
if (!empty($id)) {
$cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
$course = $DB->get_record("course", array("id" => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$scorm = $DB->get_record("scorm", array("id" => $cm->instance), '*', MUST_EXIST);
} else if (!empty($a)) {
$scorm = $DB->get_record("scorm", array("id" => $a), '*', MUST_EXIST);
$course = $DB->get_record("course", array("id" => $scorm->course), '*', MUST_EXIST);
$course = get_course($scorm->course);
$cm = get_coursemodule_from_instance("scorm", $scorm->id, $course->id, false, MUST_EXIST);
} else {
print_error('missingparameter');

4
mod/scorm/loaddatamodel.php
View file

@ -33,11 +33,11 @@ $attempt = required_param('attempt', PARAM_INT); // new attempt.
if (!empty($id)) {
$cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$scorm = $DB->get_record('scorm', array('id'=>$cm->instance), '*', MUST_EXIST);
} else if (!empty($a)) {
$scorm = $DB->get_record('scorm', array('id'=>$a), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$scorm->course), '*', MUST_EXIST);
$course = get_course($scorm->course);
$cm = get_coursemodule_from_instance('scorm', $scorm->id, $course->id, false, MUST_EXIST);
} else {
print_error('missingparameter');

2
mod/scorm/report.php
View file

@ -33,7 +33,7 @@ $download = optional_param('download', '', PARAM_RAW);
$mode = optional_param('mode', '', PARAM_ALPHA); // Report mode
$cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$scorm = $DB->get_record('scorm', array('id'=>$cm->instance), '*', MUST_EXIST);
$contextmodule = context_module::instance($cm->id);

2
mod/scorm/report/graphs/graph.php
View file

@ -33,7 +33,7 @@ $scoid = required_param('scoid', PARAM_INT);// sco ID
$sco = $DB->get_record('scorm_scoes', array('id'=>$scoid), '*', MUST_EXIST);
$scorm = $DB->get_record('scorm', array('id'=>$sco->scorm), '*', MUST_EXIST);
$cm = get_coursemodule_from_instance('scorm', $scorm->id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$scorm->course), '*', MUST_EXIST);
$course = get_course($scorm->course);
// Capability Checks

4
mod/scorm/userreport.php
View file

@ -44,7 +44,7 @@ if ($attempt !== '1') {
if (!empty($id)) {
$url->param('id', $id);
$cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$scorm = $DB->get_record('scorm', array('id' => $cm->instance), '*', MUST_EXIST);
} else {
if (!empty($b)) {
@ -55,7 +55,7 @@ if (!empty($id)) {
if (!empty($a)) {
$url->param('a', $a);
$scorm = $DB->get_record('scorm', array('id' => $a), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id' => $scorm->course), '*', MUST_EXIST);
$course = get_course($scorm->course);
$cm = get_coursemodule_from_instance('scorm', $scorm->id, $course->id, false, MUST_EXIST);
}
}