mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-35418 SCORM: coding guideline tidy - removes a few unused vars as well.

Browse Source
This commit is contained in:
Dan Marsden 2012-09-13 20:57:02 +12:00
parent 41e205cd8e
commit 92be6fa471
5 changed files with 365 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

594
mod/scorm/datamodels/scorm_13lib.php
View File

File diff suppressed because it is too large Load Diff

4
mod/scorm/datamodels/scormlib.php
View File

@ -681,7 +681,7 @@ function scorm_optionals_data($item, $standarddata) {
function scorm_is_leaf($sco) {
global $DB;
if ($DB->get_records('scorm_scoes', array('scorm'=>$sco->scorm, 'parent'=>$sco->identifier))) {
if ($DB->record_exists('scorm_scoes', array('scorm' => $sco->scorm, 'parent' => $sco->identifier))) {
return false;
}
return true;
@ -710,7 +710,7 @@ function scorm_get_children($sco) {
function scorm_get_available_children($sco) {
global $DB;
$res = $DB->get_records('scorm_scoes', array('scorm'=>$sco->scorm, 'parent'=>$sco->identifier));
$res = $DB->get_records('scorm_scoes', array('scorm' => $sco->scorm, 'parent' => $sco->identifier));
if (!$res || $res == null) {
return false;
} else {

71
mod/scorm/datamodels/sequencinghandler.php
View File

@ -18,57 +18,46 @@ require_once('../../../config.php');
require_once($CFG->dirroot.'/mod/scorm/locallib.php');
$id = optional_param('id', '', PARAM_INT); // Course Module ID, or
$a = optional_param('a', '', PARAM_INT); // scorm ID
$scoid = required_param('scoid', PARAM_INT); // sco ID
$attempt = required_param('attempt', PARAM_INT); // attempt number
$function = required_param('function', PARAM_RAW); // function to call
$request = optional_param('request', '', PARAM_RAW); // scorm ID
$a = optional_param('a', '', PARAM_INT); // scorm ID.
$scoid = required_param('scoid', PARAM_INT); // Sco ID.
$attempt = required_param('attempt', PARAM_INT); // Attempt number.
$function = required_param('function', PARAM_RAW); // Function to call.
$request = optional_param('request', '', PARAM_RAW); // Scorm ID.
if (!empty($id)) {
if (! $cm = get_coursemodule_from_id('scorm', $id)) {
print_error('invalidcoursemodule');
}
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
print_error('coursemisconf');
}
if (! $scorm = $DB->get_record("scorm", array("id"=>$cm->instance))) {
print_error('invalidcoursemodule');
}
$cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
$course = $DB->get_record("course", array("id" => $cm->course), '*', MUST_EXIST);
$scorm = $DB->get_record("scorm", array("id" => $cm->instance), '*', MUST_EXIST);
} else if (!empty($a)) {
if (! $scorm = $DB->get_record("scorm", array("id"=>$a))) {
print_error('invalidcoursemodule');
}
if (! $course = $DB->get_record("course", array("id"=>$scorm->course))) {
print_error('coursemisconf');
}
if (! $cm = get_coursemodule_from_instance("scorm", $scorm->id, $course->id)) {
print_error('invalidcoursemodule');
}
$scorm = $DB->get_record("scorm", array("id" => $a), '*', MUST_EXIST);
$course = $DB->get_record("course", array("id" => $scorm->course), '*', MUST_EXIST);
$cm = get_coursemodule_from_instance("scorm", $scorm->id, $course->id, false, MUST_EXIST);
} else {
print_error('missingparameter');
}
$PAGE->set_url('/mod/scorm/datamodels/sequencinghandler.php', array('scoid'=>$scoid, 'attempt'=>$attempt, 'id'=>$cm->id, 'function' => $function, 'request' => $request));
$PAGE->set_url('/mod/scorm/datamodels/sequencinghandler.php',
array('scoid'=>$scoid, 'attempt'=>$attempt, 'id'=>$cm->id, 'function' => $function, 'request' => $request));
require_login($course, false, $cm);
if (!empty($scoid) && !empty($function)) {
require_once($CFG->dirroot.'/mod/scorm/datamodels/scorm_13lib.php');
require_once($CFG->dirroot.'/mod/scorm/datamodels/scorm_13lib.php');
if (has_capability('mod/scorm:savetrack', get_context_instance(CONTEXT_MODULE, $cm->id))) {
$result = null;
switch ($function) {
case 'scorm_seq_flow' :
if ($request == 'forward' || $request == 'backward') {
$seq = scorm_seq_navigation ($scoid, $USER->id, $request.'_', $attempt);
$sco = scorm_get_sco($scoid);
$seq = scorm_seq_flow($sco, $request, $seq, true, $USER->id);
if (!empty($seq->nextactivity)) {
scorm_seq_end_attempt($sco, $USER->id, $seq);
}
}
echo json_encode($seq);
break;
}
}
if (has_capability('mod/scorm:savetrack', context_module::instance($cm->id))) {
$result = null;
switch ($function) {
case 'scorm_seq_flow' :
if ($request == 'forward' || $request == 'backward') {
$seq = scorm_seq_navigation ($scoid, $USER->id, $request.'_', $attempt);
$sco = scorm_get_sco($scoid);
$seq = scorm_seq_flow($sco, $request, $seq, true, $USER->id);
if (!empty($seq->nextactivity)) {
scorm_seq_end_attempt($sco, $USER->id, $seq);
}
}
echo json_encode($seq);
break;
}
}
}

2
mod/scorm/loaddatamodel.php
View File

@ -85,7 +85,7 @@ if (!$sco = scorm_get_sco($scoid)) {
print_error('cannotfindsco', 'scorm');
}
if (scorm_version_check($scorm->version, SCORM_13)) {
$objectives = $DB->get_records('scorm_seq_objective', array('scoid'=>$scoid));
$objectives = $DB->get_records('scorm_seq_objective', array('scoid' => $scoid));
$index = 0;
foreach ($objectives as $objective) {
if (!empty($objective->minnormalizedmeasure)) {

26
mod/scorm/locallib.php
View File

@ -418,14 +418,18 @@ function scorm_insert_track($userid, $scormid, $scoid, $attempt, $element, $valu
}
}
if (($element == 'cmi.success_status') && ($value == 'passed' || $value == 'failed')) {
if ($DB->get_record('scorm_scoes_data', array('scoid'=>$scoid, 'name'=>'objectivesetbycontent'))) {
if ($DB->get_record('scorm_scoes_data', array('scoid' => $scoid, 'name' => 'objectivesetbycontent'))) {
$objectiveprogressstatus = true;
$objectivesatisfiedstatus = false;
if ($value == 'passed') {
$objectivesatisfiedstatus = true;
}
if ($track = $DB->get_record('scorm_scoes_track', array('userid'=>$userid, 'scormid'=>$scormid, 'scoid'=>$scoid, 'attempt'=>$attempt, 'element'=>'objectiveprogressstatus'))) {
if ($track = $DB->get_record('scorm_scoes_track', array('userid' => $userid,
'scormid' => $scormid,
'scoid' => $scoid,
'attempt' => $attempt,
'element' => 'objectiveprogressstatus'))) {
$track->value = $objectiveprogressstatus;
$track->timemodified = time();
$DB->update_record('scorm_scoes_track', $track);
@ -442,7 +446,11 @@ function scorm_insert_track($userid, $scormid, $scoid, $attempt, $element, $valu
$id = $DB->insert_record('scorm_scoes_track', $track);
}
if ($objectivesatisfiedstatus) {
if ($track = $DB->get_record('scorm_scoes_track', array('userid'=>$userid, 'scormid'=>$scormid, 'scoid'=>$scoid, 'attempt'=>$attempt, 'element'=>'objectivesatisfiedstatus'))) {
if ($track = $DB->get_record('scorm_scoes_track', array('userid' => $userid,
'scormid' => $scormid,
'scoid' => $scoid,
'attempt' => $attempt,
'element' => 'objectivesatisfiedstatus'))) {
$track->value = $objectivesatisfiedstatus;
$track->timemodified = time();
$DB->update_record('scorm_scoes_track', $track);
@ -471,8 +479,12 @@ function scorm_insert_track($userid, $scormid, $scoid, $attempt, $element, $valu
}
if ($track = $DB->get_record('scorm_scoes_track', array('userid'=>$userid, 'scormid'=>$scormid, 'scoid'=>$scoid, 'attempt'=>$attempt, 'element'=>$element))) {
if ($element != 'x.start.time' ) { //don't update x.start.time - keep the original value.
if ($track = $DB->get_record('scorm_scoes_track', array('userid' => $userid,
'scormid' => $scormid,
'scoid' => $scoid,
'attempt' => $attempt,
'element' => $element))) {
if ($element != 'x.start.time' ) { // Don't update x.start.time - keep the original value.
$track->value = $value;
$track->timemodified = time();
$DB->update_record('scorm_scoes_track', $track);
@ -1388,7 +1400,7 @@ function scorm_get_toc_object($user, $scorm, $currentorg='', $scoid='', $mode='n
$usertracks = array();
foreach ($scoes as $sco) {
if (!empty($sco->launch)) {
if ($usertrack = scorm_get_tracks($sco->id,$user->id, $attempt)) {
if ($usertrack = scorm_get_tracks($sco->id, $user->id, $attempt)) {
if ($usertrack->status == '') {
$usertrack->status = 'notattempted';
}
@ -1595,7 +1607,7 @@ function scorm_format_toc_for_treeview($user, $scorm, $scoes, $usertracks, $cmid
$score = '';
if (isset($usertracks[$sco->identifier])) {
$viewscore = has_capability('mod/scorm:viewscores', get_context_instance(CONTEXT_MODULE, $cmid));
$viewscore = has_capability('mod/scorm:viewscores', context_module::instance($cmid));
if (isset($usertracks[$sco->identifier]->score_raw) && $viewscore) {
if ($usertracks[$sco->identifier]->score_raw != '') {
$score = '('.get_string('score','scorm').': '.$usertracks[$sco->identifier]->score_raw.')';