diff --git a/mod/scorm/datamodel.php b/mod/scorm/datamodel.php
index e176308cb9b..6107422e6c5 100644
--- a/mod/scorm/datamodel.php
+++ b/mod/scorm/datamodel.php
@@ -26,17 +26,17 @@ if (!empty($id)) {
if (! $cm = get_coursemodule_from_id('scorm', $id)) {
print_error('invalidcoursemodule');
}
- if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
+ if (! $course = $DB->get_record("course", array("id" => $cm->course))) {
print_error('coursemisconf');
}
- if (! $scorm = $DB->get_record("scorm", array("id"=>$cm->instance))) {
+ if (! $scorm = $DB->get_record("scorm", array("id" => $cm->instance))) {
print_error('invalidcoursemodule');
}
} else if (!empty($a)) {
- if (! $scorm = $DB->get_record("scorm", array("id"=>$a))) {
+ if (! $scorm = $DB->get_record("scorm", array("id" => $a))) {
print_error('invalidcoursemodule');
}
- if (! $course = $DB->get_record("course", array("id"=>$scorm->course))) {
+ if (! $course = $DB->get_record("course", array("id" => $scorm->course))) {
print_error('coursemisconf');
}
if (! $cm = get_coursemodule_from_instance("scorm", $scorm->id, $course->id)) {
@@ -46,7 +46,7 @@ if (!empty($id)) {
print_error('missingparameter');
}
-$PAGE->set_url('/mod/scorm/datamodel.php', array('scoid'=>$scoid, 'attempt'=>$attempt, 'id'=>$cm->id));
+$PAGE->set_url('/mod/scorm/datamodel.php', array('scoid' => $scoid, 'attempt' => $attempt, 'id' => $cm->id));
require_login($course, false, $cm);
diff --git a/mod/scorm/grade.php b/mod/scorm/grade.php
index 631b214ba97..e9a94e9c689 100644
--- a/mod/scorm/grade.php
+++ b/mod/scorm/grade.php
@@ -31,11 +31,11 @@ if (! $cm = get_coursemodule_from_id('scorm', $id)) {
print_error('invalidcoursemodule');
}
-if (! $scorm = $DB->get_record('scorm', array('id'=>$cm->instance))) {
+if (! $scorm = $DB->get_record('scorm', array('id' => $cm->instance))) {
print_error('invalidcoursemodule');
}
-if (! $course = $DB->get_record('course', array('id'=> $scorm->course))) {
+if (! $course = $DB->get_record('course', array('id' => $scorm->course))) {
print_error('coursemisconf');
}
diff --git a/mod/scorm/index.php b/mod/scorm/index.php
index 95a65d7b858..506ef5dd2fb 100644
--- a/mod/scorm/index.php
+++ b/mod/scorm/index.php
@@ -19,10 +19,10 @@ require_once($CFG->dirroot.'/mod/scorm/locallib.php');
$id = required_param('id', PARAM_INT); // course id
-$PAGE->set_url('/mod/scorm/index.php', array('id'=>$id));
+$PAGE->set_url('/mod/scorm/index.php', array('id' => $id));
if (!empty($id)) {
- if (!$course = $DB->get_record('course', array('id'=>$id))) {
+ if (!$course = $DB->get_record('course', array('id' => $id))) {
print_error('invalidcourseid');
}
} else {
@@ -89,7 +89,7 @@ foreach ($scorms as $scorm) {
if (has_capability('mod/scorm:viewreport', $context)) {
$trackedusers = scorm_get_count_users($scorm->id, $scorm->groupingid);
if ($trackedusers > 0) {
- $reportshow = ''.get_string('viewallreports', 'scorm', $trackedusers).' ';
+ $reportshow = html_writer::link('report.php?id='.$scorm->coursemodule, get_string('viewallreports', 'scorm', $trackedusers)).html_writer::end_div();
} else {
$reportshow = get_string('noreports', 'scorm');
}
@@ -98,19 +98,19 @@ foreach ($scorms as $scorm) {
$report = scorm_grade_user($scorm, $USER->id);
$reportshow = get_string('score', 'scorm').": ".$report;
}
- $options = (object)array('noclean'=>true);
+ $options = (object)array('noclean' => true);
if (!$scorm->visible) {
- //Show dimmed if the mod is hidden
- $table->data[] = array ($tt, "coursemodule\">".format_string($scorm->name)." ",
+ // Show dimmed if the mod is hidden
+ $table->data[] = array ($tt, html_writer::link('view.php?id='.$scorm->coursemodule, format_string($scorm->name), array('class' => 'dimmed')),
format_module_intro('scorm', $scorm, $scorm->coursemodule), $reportshow);
} else {
- //Show normal if the mod is visible
- $table->data[] = array ($tt, "coursemodule\">".format_string($scorm->name)." ",
+ // Show normal if the mod is visible
+ $table->data[] = array ($tt, html_writer::link('view.php?id='.$scorm->coursemodule, format_string($scorm->name)),
format_module_intro('scorm', $scorm, $scorm->coursemodule), $reportshow);
}
}
-echo "'."\n";
+ $report .= html_writer::start_div('mod-scorm');
foreach ($orgs as $org) {
$conditions = array();
$currentorg = '';
if (!empty($org->identifier)) {
- $report .= '
'.$org->title.'
';
+ $report .= html_writer::div($org->title, 'orgtitle');
$currentorg = $org->identifier;
$conditions['organization'] = $currentorg;
}
- $report .= "
";
+ $report .= html_writer::start_tag('ul', array('id' => '0', 'class' => $liststyle));
$conditions['scorm'] = $scorm->id;
if ($scoes = $DB->get_records('scorm_scoes', $conditions, "sortorder, id")) {
- // drop keys so that we can access array sequentially
+ // Drop keys so that we can access array sequentially.
$scoes = array_values($scoes);
- $level=0;
- $sublist=1;
- $parents[$level]='/';
+ $level = 0;
+ $sublist = 1;
+ $parents[$level] = '/';
foreach ($scoes as $pos => $sco) {
- if ($parents[$level]!=$sco->parent) {
- if ($level>0 && $parents[$level-1]==$sco->parent) {
- $report .= "\t\t \n";
+ if ($parents[$level] != $sco->parent) {
+ if ($level > 0 && $parents[$level - 1] == $sco->parent) {
+ $report .= html_writer::end_tag('ul').html_writer::end_tag('li');
$level--;
} else {
$i = $level;
$closelist = '';
while (($i > 0) && ($parents[$level] != $sco->parent)) {
- $closelist .= "\t\t\n";
+ $closelist .= html_writer::end_tag('ul').html_writer::end_tag('li');
$i--;
}
if (($i == 0) && ($sco->parent != $currentorg)) {
- $report .= "\t\t
\n";
+ $report .= html_writer::start_tag('li').html_writer::start_tag('ul', array('id' => $sublist, 'class' => $liststyle));
$level++;
} else {
$report .= $closelist;
$level = $i;
}
- $parents[$level]=$sco->parent;
+ $parents[$level] = $sco->parent;
}
}
- $report .= "\t\t";
- if (isset($scoes[$pos+1])) {
- $nextsco = $scoes[$pos+1];
+ $report .= html_writer::start_tag('li');
+ if (isset($scoes[$pos + 1])) {
+ $nextsco = $scoes[$pos + 1];
} else {
$nextsco = false;
}
- if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) {
+ if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level == 0) || (($level > 0) && ($nextsco->parent == $sco->identifier)))) {
$sublist++;
} else {
$report .= $OUTPUT->spacer(array("height" => "12", "width" => "13"));
@@ -455,52 +455,53 @@ function scorm_user_complete($course, $user, $mod, $scorm) {
if ($sco->launch) {
$score = '';
$totaltime = '';
- if ($usertrack=scorm_get_tracks($sco->id, $user->id)) {
+ if ($usertrack = scorm_get_tracks($sco->id, $user->id)) {
if ($usertrack->status == '') {
$usertrack->status = 'notattempted';
}
$strstatus = get_string($usertrack->status, 'scorm');
- $report .= " \n";
+ $report .= " $sco->title $score$totaltime".html_writer::end_tag('li');
if ($usertrack !== false) {
$sometoreport = true;
- $report .= "\t\t\t\n";
+ $report .= html_writer::start_tag('li').html_writer::start_tag('ul', array('class' => $liststyle));
foreach ($usertrack as $element => $value) {
if (substr($element, 0, 3) == 'cmi') {
- $report .= ''.$element.' => '.s($value).' ';
+ $report .= html_writer::tag('li', $element.' => '.s($value));
}
}
- $report .= "\t\t\t \n";
+ $report .= " $sco->title".html_writer::end_tag('li');
}
}
- for ($i=0; $i<$level; $i++) {
- $report .= "\t\t\n";
+ for ($i = 0; $i < $level; $i++) {
+ $report .= html_writer::end_tag('ul').html_writer::end_tag('li');
}
}
- $report .= "\t
\n";
+ $report .= html_writer::end_tag('ul').html_writer::empty_tag('br');
}
- $report .= "
';
+ $str = html_writer::start_div('scorm overview').
+ html_writer::div($strscorm. ': '.
+ html_writer::link($CFG->wwwroot.'/mod/scorm/view.php?id='.$scorm->coursemodule, $scorm->name,
+ array('title' => $strscorm, 'class' => $scorm->visible ? '' : 'dimmed')), 'name');
if ($scorm->timeclose) {
- $str .= '
'.$strduedate.': '.userdate($scorm->timeclose).'
';
+ $str .= html_writer::div($strduedate.': '.userdate($scorm->timeclose), 'info');
}
if ($showattemptstatus) {
require_once($CFG->dirroot.'/mod/scorm/locallib.php');
- $str .= '
'.scorm_get_attempt_status($USER, $scorm).'
';
+ $str .= html_writer::div(scorm_get_attempt_status($USER, $scorm), 'details');
}
- $str .= '
' . get_string('activitypleasewait', 'scorm'). '
';
+ echo html_writer::start_tag('html');
+ echo html_writer::tag('body', html_writer::tag('p', get_string('activitypleasewait', 'scorm')));
+ echo html_writer::end_tag('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';
+$LMSapi = (scorm_version_check($scorm->version, SCORM_12) || empty($scorm->version)) ? 'API' : 'API_1484_11';
+echo html_writer::start_tag('html');
+echo html_writer::start_tag('head');
+echo html_writer::tag('title', 'LoadSCO');
?>
-
-
- LoadSCO
-
-
-
-
-
-
-
-
+ else {
+ document.body.innerHTML = "
";
+ var e = document.getElementById("countdown");
+ var cSeconds = parseInt(e.innerHTML);
+ var timer = setInterval(function() {
+ if( cSeconds && myGetAPIHandle() == null ) {
+ e.innerHTML = --cSeconds;
+ } else {
+ clearInterval(timer);
+ document.body.innerHTML = "
";
+ location = "";
+ }
+ }, 1000);
+ }
+ }
+ //]]>
+
+
+
+ "doredirect();"));
+echo html_writer::end_tag('html');
diff --git a/mod/scorm/loaddatamodel.php b/mod/scorm/loaddatamodel.php
index f9d6ba1bff6..dea95f686da 100644
--- a/mod/scorm/loaddatamodel.php
+++ b/mod/scorm/loaddatamodel.php
@@ -34,17 +34,17 @@ $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);
- $scorm = $DB->get_record('scorm', array('id'=>$cm->instance), '*', 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)) {
- $scorm = $DB->get_record('scorm', array('id'=>$a), '*', MUST_EXIST);
- $course = $DB->get_record('course', array('id'=>$scorm->course), '*', MUST_EXIST);
+ $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/loaddatamodel.php', array('scoid'=>$scoid, 'id'=>$cm->id));
+$PAGE->set_url('/mod/scorm/loaddatamodel.php', array('scoid' => $scoid, 'id' => $cm->id));
require_login($course, false, $cm);
diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index 20f81301364..5eba60a94a4 100644
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -25,7 +25,7 @@
require_once("$CFG->dirroot/mod/scorm/lib.php");
require_once("$CFG->libdir/filelib.php");
-/// Constants and settings for module scorm
+// Constants and settings for module scorm.
define('SCORM_UPDATE_NEVER', '0');
define('SCORM_UPDATE_EVERYDAY', '2');
define('SCORM_UPDATE_EVERYTIME', '3');
@@ -51,7 +51,7 @@ define('LASTATTEMPT', '3');
define('TOCJSLINK', 1);
define('TOCFULLURL', 2);
-/// Local Library of functions for module scorm
+// Local Library of functions for module scorm.
/**
* @package mod_scorm
@@ -81,12 +81,12 @@ class scorm_package_file_info extends file_info_stored {
function scorm_get_popup_options_array() {
$cfgscorm = get_config('scorm');
- return array('scrollbars'=> isset($cfgscorm->scrollbars) ? $cfgscorm->scrollbars : 0,
- 'directories'=> isset($cfgscorm->directories) ? $cfgscorm->directories : 0,
- 'location'=> isset($cfgscorm->location) ? $cfgscorm->location : 0,
- 'menubar'=> isset($cfgscorm->menubar) ? $cfgscorm->menubar : 0,
- 'toolbar'=> isset($cfgscorm->toolbar) ? $cfgscorm->toolbar : 0,
- 'status'=> isset($cfgscorm->status) ? $cfgscorm->status : 0);
+ return array('scrollbars' => isset($cfgscorm->scrollbars) ? $cfgscorm->scrollbars : 0,
+ 'directories' => isset($cfgscorm->directories) ? $cfgscorm->directories : 0,
+ 'location' => isset($cfgscorm->location) ? $cfgscorm->location : 0,
+ 'menubar' => isset($cfgscorm->menubar) ? $cfgscorm->menubar : 0,
+ 'toolbar' => isset($cfgscorm->toolbar) ? $cfgscorm->toolbar : 0,
+ 'status' => isset($cfgscorm->status) ? $cfgscorm->status : 0);
}
/**
@@ -177,7 +177,7 @@ function scorm_get_attempts_array() {
$attempts = array(0 => get_string('nolimit', 'scorm'),
1 => get_string('attempt1', 'scorm'));
- for ($i=2; $i<=6; $i++) {
+ for ($i = 2; $i <= 6; $i++) {
$attempts[$i] = get_string('attemptsx', 'scorm', $i);
}
@@ -205,7 +205,7 @@ function scorm_get_attemptstatus_array() {
*/
function scorm_parse($scorm, $full) {
global $CFG, $DB;
- $cfg_scorm = get_config('scorm');
+ $cfgscorm = get_config('scorm');
if (!isset($scorm->cmid)) {
$cm = get_coursemodule_from_instance('scorm', $scorm->id);
@@ -233,14 +233,15 @@ function scorm_parse($scorm, $full) {
$newhash = null;
}
} else {
- if (!$cfg_scorm->allowtypelocalsync) {
- // sorry - localsync disabled
+ if (!$cfgscorm->allowtypelocalsync) {
+ // Sorry - localsync disabled.
return;
}
if ($scorm->reference !== '' and (!$full or $scorm->sha1hash !== sha1($scorm->reference))) {
$fs->delete_area_files($context->id, 'mod_scorm', 'package');
- $file_record = array('contextid'=>$context->id, 'component'=>'mod_scorm', 'filearea'=>'package', 'itemid'=>0, 'filepath'=>'/');
- if ($packagefile = $fs->create_file_from_url($file_record, $scorm->reference, array('calctimeout' => true))) {
+ $filerecord = array('contextid' => $context->id, 'component' => 'mod_scorm', 'filearea' => 'package',
+ 'itemid' => 0, 'filepath' => '/');
+ if ($packagefile = $fs->create_file_from_url($filerecord, $scorm->reference, array('calctimeout' => true))) {
$newhash = sha1($scorm->reference);
} else {
$newhash = null;
@@ -256,7 +257,7 @@ function scorm_parse($scorm, $full) {
return;
}
} else if (strpos($scorm->version, 'AICC') !== false) {
- // TODO: add more sanity checks - something really exists in scorm_content area
+ // TODO: add more sanity checks - something really exists in scorm_content area.
return;
}
}
@@ -280,36 +281,36 @@ function scorm_parse($scorm, $full) {
} else if ($manifest = $fs->get_file($context->id, 'mod_scorm', 'content', 0, '/', 'imsmanifest.xml')) {
require_once("$CFG->dirroot/mod/scorm/datamodels/scormlib.php");
- // SCORM
+ // SCORM.
if (!scorm_parse_scorm($scorm, $manifest)) {
$scorm->version = 'ERROR';
}
} else {
require_once("$CFG->dirroot/mod/scorm/datamodels/aicclib.php");
- // AICC
+ // AICC.
if (!scorm_parse_aicc($scorm)) {
$scorm->version = 'ERROR';
}
$scorm->version = 'AICC';
}
- } else if ($scorm->scormtype === SCORM_TYPE_EXTERNAL and $cfg_scorm->allowtypeexternal) {
+ } else if ($scorm->scormtype === SCORM_TYPE_EXTERNAL and $cfgscorm->allowtypeexternal) {
require_once("$CFG->dirroot/mod/scorm/datamodels/scormlib.php");
- // SCORM only, AICC can not be external
+ // SCORM only, AICC can not be external.
if (!scorm_parse_scorm($scorm, $scorm->reference)) {
$scorm->version = 'ERROR';
}
$newhash = sha1($scorm->reference);
- } else if ($scorm->scormtype === SCORM_TYPE_AICCURL and $cfg_scorm->allowtypeexternalaicc) {
+ } else if ($scorm->scormtype === SCORM_TYPE_AICCURL and $cfgscorm->allowtypeexternalaicc) {
require_once("$CFG->dirroot/mod/scorm/datamodels/aicclib.php");
- // AICC
+ // AICC.
if (!scorm_parse_aicc($scorm)) {
$scorm->version = 'ERROR';
}
$scorm->version = 'AICC';
} else {
- // sorry, disabled type
+ // Sorry, disabled type.
return;
}
@@ -341,14 +342,14 @@ function scorm_repeater($what, $times) {
return null;
}
$return = '';
- for ($i=0; $i<$times; $i++) {
+ for ($i = 0; $i < $times; $i++) {
$return .= $what;
}
return $return;
}
function scorm_external_link($link) {
- // check if a link is external
+ // Check if a link is external.
$result = false;
$link = strtolower($link);
if (substr($link, 0, 7) == 'http://') {
@@ -370,13 +371,13 @@ function scorm_external_link($link) {
function scorm_get_sco($id, $what=SCO_ALL) {
global $DB;
- if ($sco = $DB->get_record('scorm_scoes', array('id'=>$id))) {
+ if ($sco = $DB->get_record('scorm_scoes', array('id' => $id))) {
$sco = ($what == SCO_DATA) ? new stdClass() : $sco;
- if (($what != SCO_ONLY) && ($scodatas = $DB->get_records('scorm_scoes_data', array('scoid'=>$id)))) {
+ if (($what != SCO_ONLY) && ($scodatas = $DB->get_records('scorm_scoes_data', array('scoid' => $id)))) {
foreach ($scodatas as $scodata) {
$sco->{$scodata->name} = $scodata->value;
}
- } else if (($what != SCO_ONLY) && (!($scodatas = $DB->get_records('scorm_scoes_data', array('scoid'=>$id))))) {
+ } else if (($what != SCO_ONLY) && (!($scodatas = $DB->get_records('scorm_scoes_data', array('scoid' => $id))))) {
$sco->parameters = '';
}
return $sco;
@@ -395,7 +396,7 @@ function scorm_get_sco($id, $what=SCO_ALL) {
function scorm_get_scoes($id, $organisation=false) {
global $DB;
- $queryarray = array('scorm'=>$id);
+ $queryarray = array('scorm' => $id);
if (!empty($organisation)) {
$queryarray['organization'] = $organisation;
}
@@ -403,7 +404,7 @@ function scorm_get_scoes($id, $organisation=false) {
// Drop keys so that it is a simple array as expected.
$scoes = array_values($scoes);
foreach ($scoes as $sco) {
- if ($scodatas = $DB->get_records('scorm_scoes_data', array('scoid'=>$sco->id))) {
+ if ($scodatas = $DB->get_records('scorm_scoes_data', array('scoid' => $sco->id))) {
foreach ($scodatas as $scodata) {
$sco->{$scodata->name} = $scodata->value;
}
@@ -421,14 +422,18 @@ function scorm_insert_track($userid, $scormid, $scoid, $attempt, $element, $valu
$id = null;
if ($forcecompleted) {
- //TODO - this could be broadened to encompass SCORM 2004 in future
+ // TODO - this could be broadened to encompass SCORM 2004 in future.
if (($element == 'cmi.core.lesson_status') && ($value == 'incomplete')) {
- if ($track = $DB->get_record_select('scorm_scoes_track', 'userid=? AND scormid=? AND scoid=? AND attempt=? AND element=\'cmi.core.score.raw\'', array($userid, $scormid, $scoid, $attempt))) {
+ if ($track = $DB->get_record_select('scorm_scoes_track',
+ 'userid=? AND scormid=? AND scoid=? AND attempt=? AND element=\'cmi.core.score.raw\'',
+ array($userid, $scormid, $scoid, $attempt))) {
$value = 'completed';
}
}
if ($element == 'cmi.core.score.raw') {
- if ($tracktest = $DB->get_record_select('scorm_scoes_track', 'userid=? AND scormid=? AND scoid=? AND attempt=? AND element=\'cmi.core.lesson_status\'', array($userid, $scormid, $scoid, $attempt))) {
+ if ($tracktest = $DB->get_record_select('scorm_scoes_track',
+ 'userid=? AND scormid=? AND scoid=? AND attempt=? AND element=\'cmi.core.lesson_status\'',
+ array($userid, $scormid, $scoid, $attempt))) {
if ($tracktest->value == "incomplete") {
$tracktest->value = "completed";
$DB->update_record('scorm_scoes_track', $tracktest);
@@ -558,14 +563,14 @@ function scorm_get_tracks($scoid, $userid, $attempt='') {
global $DB;
if (empty($attempt)) {
- if ($scormid = $DB->get_field('scorm_scoes', 'scorm', array('id'=>$scoid))) {
+ if ($scormid = $DB->get_field('scorm_scoes', 'scorm', array('id' => $scoid))) {
$attempt = scorm_get_last_attempt($scormid, $userid);
} else {
$attempt = 1;
}
}
- if ($tracks = $DB->get_records('scorm_scoes_track', array('userid'=>$userid, 'scoid'=>$scoid,
- 'attempt'=>$attempt), 'element ASC')) {
+ if ($tracks = $DB->get_records('scorm_scoes_track', array('userid' => $userid, 'scoid' => $scoid,
+ 'attempt' => $attempt), 'element ASC')) {
$usertrack = scorm_format_interactions($tracks);
$usertrack->userid = $userid;
$usertrack->scoid = $scoid;
@@ -669,14 +674,14 @@ function scorm_grade_user_attempt($scorm, $userid, $attempt=1) {
}
foreach ($scoes as $sco) {
- if ($userdata=scorm_get_tracks($sco->id, $userid, $attempt)) {
+ if ($userdata = scorm_get_tracks($sco->id, $userid, $attempt)) {
if (($userdata->status == 'completed') || ($userdata->status == 'passed')) {
$attemptscore->scoes++;
}
- if (!empty($userdata->score_raw) || (isset($scorm->type) && $scorm->type=='sco' && isset($userdata->score_raw))) {
+ if (!empty($userdata->score_raw) || (isset($scorm->type) && $scorm->type == 'sco' && isset($userdata->score_raw))) {
$attemptscore->values++;
$attemptscore->sum += $userdata->score_raw;
- $attemptscore->max = ($userdata->score_raw > $attemptscore->max)?$userdata->score_raw:$attemptscore->max;
+ $attemptscore->max = ($userdata->score_raw > $attemptscore->max) ? $userdata->score_raw : $attemptscore->max;
if (isset($userdata->timemodified) && ($userdata->timemodified > $attemptscore->lastmodify)) {
$attemptscore->lastmodify = $userdata->timemodified;
} else {
@@ -691,7 +696,7 @@ function scorm_grade_user_attempt($scorm, $userid, $attempt=1) {
break;
case GRADEAVERAGE:
if ($attemptscore->values > 0) {
- $score = $attemptscore->sum/$attemptscore->values;
+ $score = $attemptscore->sum / $attemptscore->values;
} else {
$score = 0;
}
@@ -703,7 +708,7 @@ function scorm_grade_user_attempt($scorm, $userid, $attempt=1) {
$score = $attemptscore->scoes;
break;
default:
- $score = $attemptscore->max; // Remote Learner GRADEHIGHEST is default
+ $score = $attemptscore->max; // Remote Learner GRADEHIGHEST is default.
}
return $score;
@@ -711,7 +716,7 @@ function scorm_grade_user_attempt($scorm, $userid, $attempt=1) {
function scorm_grade_user($scorm, $userid) {
- // ensure we dont grade user beyond $scorm->maxattempt settings
+ // Ensure we dont grade user beyond $scorm->maxattempt settings.
$lastattempt = scorm_get_last_attempt($scorm->id, $userid);
if ($scorm->maxattempt != 0 && $lastattempt >= $scorm->maxattempt) {
$lastattempt = $scorm->maxattempt;
@@ -728,7 +733,7 @@ function scorm_grade_user($scorm, $userid) {
$maxscore = 0;
for ($attempt = 1; $attempt <= $lastattempt; $attempt++) {
$attemptscore = scorm_grade_user_attempt($scorm, $userid, $attempt);
- $maxscore = $attemptscore > $maxscore ? $attemptscore: $maxscore;
+ $maxscore = $attemptscore > $maxscore ? $attemptscore : $maxscore;
}
return $maxscore;
@@ -775,7 +780,7 @@ function scorm_count_launchable($scormid, $organization='') {
function scorm_get_last_attempt($scormid, $userid) {
global $DB;
- /// Find the last attempt number for the given user id and scorm id
+ // Find the last attempt number for the given user id and scorm id.
$sql = "SELECT MAX(attempt)
FROM {scorm_scoes_track}
WHERE userid = ? AND scormid = ?";
@@ -798,7 +803,7 @@ function scorm_get_last_attempt($scormid, $userid) {
function scorm_get_last_completed_attempt($scormid, $userid) {
global $DB;
- /// Find the last completed attempt number for the given user id and scorm id
+ // Find the last completed attempt number for the given user id and scorm id.
$sql = "SELECT MAX(attempt)
FROM {scorm_scoes_track}
WHERE userid = ? AND scormid = ?
@@ -841,9 +846,7 @@ function scorm_view_display ($user, $scorm, $action, $cm) {
if ($scorm->displaycoursestructure == 1) {
echo $OUTPUT->box_start('generalbox boxaligncenter toc', 'toc');
- ?>
-
- launch;
@@ -868,7 +871,7 @@ function scorm_view_display ($user, $scorm, $action, $cm) {
}
}
- $scorm->version = strtolower(clean_param($scorm->version, PARAM_SAFEDIR)); // Just to be safe
+ $scorm->version = strtolower(clean_param($scorm->version, PARAM_SAFEDIR)); // Just to be safe.
if (!file_exists($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'lib.php')) {
$scorm->version = 'scorm_12';
}
@@ -877,51 +880,49 @@ function scorm_view_display ($user, $scorm, $action, $cm) {
$result = scorm_get_toc($user, $scorm, $cm->id, TOCFULLURL, $orgidentifier);
$incomplete = $result->incomplete;
- // do we want the TOC to be displayed?
+ // Do we want the TOC to be displayed?
if ($scorm->displaycoursestructure == 1) {
echo $result->toc;
echo $OUTPUT->box_end();
}
- // is this the first attempt ?
+ // Is this the first attempt ?
$attemptcount = scorm_get_attempt_count($user->id, $scorm);
- // do not give the player launch FORM if the SCORM object is locked after the final attempt
+ // Do not give the player launch FORM if the SCORM object is locked after the final attempt.
if ($scorm->lastattemptlock == 0 || $result->attemptleft > 0) {
- ?>
-
-
-
- 'hidden', 'name' => 'scoid', 'value' => $scorm->launch));
+ echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'cm', 'value' => $cm->id));
+ echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'currentorg', 'value' => $orgidentifier));
+ echo html_writer::empty_tag('input', array('type' => 'submit', 'value' => get_string('enter', 'scorm')));
+ echo html_writer::end_tag('form');
+ echo html_writer::end_div();
}
}
@@ -930,7 +931,7 @@ function scorm_simple_play($scorm, $user, $context, $cmid) {
$result = false;
- if (has_capability('mod/scorm:viewreport', $context)) { //if this user can view reports, don't skipview so they can see links to reports.
+ if (has_capability('mod/scorm:viewreport', $context)) { // If this user can view reports, don't skipview so they can see links to reports.
return $result;
}
@@ -952,13 +953,13 @@ function scorm_simple_play($scorm, $user, $context, $cmid) {
if ($scorm->skipview >= SCORM_SKIPVIEW_FIRST) {
$sco = current($scoes);
$url = new moodle_url('/mod/scorm/player.php', array('a' => $scorm->id,
- 'currentorg'=>$orgidentifier,
- 'scoid'=>$sco->id));
+ 'currentorg' => $orgidentifier,
+ 'scoid' => $sco->id));
if ($scorm->skipview == SCORM_SKIPVIEW_ALWAYS || !scorm_has_tracks($scorm->id, $user->id)) {
if (!empty($scorm->forcenewattempt)) {
$result = scorm_get_toc($user, $scorm, $cmid, TOCFULLURL, $orgidentifier);
if ($result->incomplete === false) {
- $url->param('newattempt','on');
+ $url->param('newattempt', 'on');
}
}
redirect($url);
@@ -995,34 +996,34 @@ function scorm_get_count_users($scormid, $groupingid=null) {
*
* @param string $sversion SCORM API version
* @param array $userdata User track data
- * @param string $element_name Name of array element to get values for
+ * @param string $elementname Name of array element to get values for
* @param array $children list of sub elements of this array element that also need instantiating
* @return None
*/
-function scorm_reconstitute_array_element($sversion, $userdata, $element_name, $children) {
- // reconstitute comments_from_learner and comments_from_lms
+function scorm_reconstitute_array_element($sversion, $userdata, $elementname, $children) {
+ // Reconstitute comments_from_learner and comments_from_lms.
$current = '';
- $current_subelement = '';
- $current_sub = '';
+ $currentsubelement = '';
+ $currentsub = '';
$count = 0;
- $count_sub = 0;
+ $countsub = 0;
$scormseperator = '_';
- if (scorm_version_check($sversion, SCORM_13)) { //scorm 1.3 elements use a . instead of an _
+ if (scorm_version_check($sversion, SCORM_13)) { // Scorm 1.3 elements use a . instead of an _ .
$scormseperator = '.';
}
- // filter out the ones we want
- $element_list = array();
+ // Filter out the ones we want.
+ $elementlist = array();
foreach ($userdata as $element => $value) {
- if (substr($element, 0, strlen($element_name)) == $element_name) {
- $element_list[$element] = $value;
+ if (substr($element, 0, strlen($elementname)) == $elementname) {
+ $elementlist[$element] = $value;
}
}
- // sort elements in .n array order
- uksort($element_list, "scorm_element_cmp");
+ // Sort elements in .n array order.
+ uksort($elementlist, "scorm_element_cmp");
- // generate JavaScript
- foreach ($element_list as $element => $value) {
+ // Generate JavaScript.
+ foreach ($elementlist as $element => $value) {
if (scorm_version_check($sversion, SCORM_13)) {
$element = preg_replace('/\.(\d+)\./', ".N\$1.", $element);
preg_match('/\.(N\d+)\./', $element, $matches);
@@ -1031,15 +1032,15 @@ function scorm_reconstitute_array_element($sversion, $userdata, $element_name, $
preg_match('/\_(\d+)\./', $element, $matches);
}
if (count($matches) > 0 && $current != $matches[1]) {
- if ($count_sub > 0) {
- echo ' '.$element_name.$scormseperator.$current.'.'.$current_subelement.'._count = '.$count_sub.";\n";
+ if ($countsub > 0) {
+ echo ' '.$elementname.$scormseperator.$current.'.'.$currentsubelement.'._count = '.$countsub.";\n";
}
$current = $matches[1];
$count++;
- $current_subelement = '';
- $current_sub = '';
- $count_sub = 0;
- $end = strpos($element, $matches[1])+strlen($matches[1]);
+ $currentsubelement = '';
+ $currentsub = '';
+ $countsub = 0;
+ $end = strpos($element, $matches[1]) + strlen($matches[1]);
$subelement = substr($element, 0, $end);
echo ' '.$subelement." = new Object();\n";
// now add the children
@@ -1049,7 +1050,7 @@ function scorm_reconstitute_array_element($sversion, $userdata, $element_name, $
}
}
- // now - flesh out the second level elements if there are any
+ // Now - flesh out the second level elements if there are any.
if (scorm_version_check($sversion, SCORM_13)) {
$element = preg_replace('/(.*?\.N\d+\..*?)\.(\d+)\./', "\$1.N\$2.", $element);
preg_match('/.*?\.N\d+\.(.*?)\.(N\d+)\./', $element, $matches);
@@ -1058,35 +1059,35 @@ function scorm_reconstitute_array_element($sversion, $userdata, $element_name, $
preg_match('/.*?\_\d+\.(.*?)\_(\d+)\./', $element, $matches);
}
- // check the sub element type
- if (count($matches) > 0 && $current_subelement != $matches[1]) {
- if ($count_sub > 0) {
- echo ' '.$element_name.$scormseperator.$current.'.'.$current_subelement.'._count = '.$count_sub.";\n";
+ // Check the sub element type.
+ if (count($matches) > 0 && $currentsubelement != $matches[1]) {
+ if ($countsub > 0) {
+ echo ' '.$elementname.$scormseperator.$current.'.'.$currentsubelement.'._count = '.$countsub.";\n";
}
- $current_subelement = $matches[1];
- $current_sub = '';
- $count_sub = 0;
- $end = strpos($element, $matches[1])+strlen($matches[1]);
+ $currentsubelement = $matches[1];
+ $currentsub = '';
+ $countsub = 0;
+ $end = strpos($element, $matches[1]) + strlen($matches[1]);
$subelement = substr($element, 0, $end);
echo ' '.$subelement." = new Object();\n";
}
- // now check the subelement subscript
- if (count($matches) > 0 && $current_sub != $matches[2]) {
- $current_sub = $matches[2];
- $count_sub++;
- $end = strrpos($element, $matches[2])+strlen($matches[2]);
+ // Now check the subelement subscript.
+ if (count($matches) > 0 && $currentsub != $matches[2]) {
+ $currentsub = $matches[2];
+ $countsub++;
+ $end = strrpos($element, $matches[2]) + strlen($matches[2]);
$subelement = substr($element, 0, $end);
echo ' '.$subelement." = new Object();\n";
}
echo ' '.$element.' = \''.$value."';\n";
}
- if ($count_sub > 0) {
- echo ' '.$element_name.$scormseperator.$current.'.'.$current_subelement.'._count = '.$count_sub.";\n";
+ if ($countsub > 0) {
+ echo ' '.$elementname.$scormseperator.$current.'.'.$currentsubelement.'._count = '.$countsub.";\n";
}
if ($count > 0) {
- echo ' '.$element_name.'._count = '.$count.";\n";
+ echo ' '.$elementname.'._count = '.$count.";\n";
}
}
@@ -1103,11 +1104,11 @@ function scorm_element_cmp($a, $b) {
preg_match('/.?(\d+)\./', $b, $matches);
$right = intval($matches[1]);
if ($left < $right) {
- return -1; // smaller
+ return -1; // Smaller.
} else if ($left > $right) {
- return 1; // bigger
+ return 1; // Bigger.
} else {
- // look for a second level qualifier eg cmi.interactions_0.correct_responses_0.pattern
+ // Look for a second level qualifier eg cmi.interactions_0.correct_responses_0.pattern.
if (preg_match('/.*?(\d+)\.(.*?)\.(\d+)\./', $a, $matches)) {
$leftterm = intval($matches[2]);
$left = intval($matches[3]);
@@ -1115,20 +1116,20 @@ function scorm_element_cmp($a, $b) {
$rightterm = intval($matches[2]);
$right = intval($matches[3]);
if ($leftterm < $rightterm) {
- return -1; // smaller
+ return -1; // Smaller.
} else if ($leftterm > $rightterm) {
- return 1; // bigger
+ return 1; // Bigger.
} else {
if ($left < $right) {
- return -1; // smaller
+ return -1; // Smaller.
} else if ($left > $right) {
- return 1; // bigger
+ return 1; // Bigger.
}
}
}
}
- // fall back for no second level matches or second level matches are equal
- return 0; // equal to
+ // Fall back for no second level matches or second level matches are equal.
+ return 0; // Equal to.
}
}
@@ -1149,13 +1150,13 @@ function scorm_get_attempt_status($user, $scorm, $cm='') {
$attemptcount = count($attempts);
}
- $result = ''.get_string('noattemptsallowed', 'scorm').': ';
+ $result = html_writer::start_tag('p').get_string('noattemptsallowed', 'scorm').': ';
if ($scorm->maxattempt > 0) {
- $result .= $scorm->maxattempt . '
';
+ $result .= html_writer::end_tag('p');
if ($attemptcount >= $scorm->maxattempt and $scorm->maxattempt > 0) {
- $result .= ''.get_string('exceededmaxattempts', 'scorm').'
';
+ $result .= html_writer::tag('p', get_string('exceededmaxattempts', 'scorm'), array('class' => 'exceededmaxattempts'));
}
if (!empty($cm)) {
$context = context_module::instance($cm->id);
if (has_capability('mod/scorm:deleteownresponses', $context) &&
$DB->record_exists('scorm_scoes_track', array('userid' => $user->id, 'scormid' => $scorm->id))) {
- //check to see if any data is stored for this user:
- $deleteurl = new moodle_url($PAGE->url, array('action'=>'delete', 'sesskey' => sesskey()));
+ // Check to see if any data is stored for this user.
+ $deleteurl = new moodle_url($PAGE->url, array('action' => 'delete', 'sesskey' => sesskey()));
$result .= $OUTPUT->single_button($deleteurl, get_string('deleteallattempts', 'scorm'));
}
}
-
return $result;
}
@@ -1243,7 +1243,7 @@ function scorm_get_attempt_count($userid, $scorm, $returnobjects = false, $ignor
global $DB;
// Historically attempts that don't report these elements haven't been included in the average attempts grading method
- // we may want to change this in future, but to avoid unexpected grade decreases we're leaving this in. MDL-43222
+ // we may want to change this in future, but to avoid unexpected grade decreases we're leaving this in. MDL-43222 .
if (scorm_version_check($scorm->version, SCORM_13)) {
$element = 'cmi.score.raw';
} else if ($scorm->grademethod == GRADESCOES) {
@@ -1282,14 +1282,14 @@ function scorm_get_attempt_count($userid, $scorm, $returnobjects = false, $ignor
*/
function scorm_debugging($scorm) {
global $CFG, $USER;
- $cfg_scorm = get_config('scorm');
+ $cfgscorm = get_config('scorm');
- if (!$cfg_scorm->allowapidebug) {
+ if (!$cfgscorm->allowapidebug) {
return false;
}
$identifier = $USER->username.':'.$scorm->name;
- $test = $cfg_scorm->apidebugmask;
- // check the regex is only a short list of safe characters
+ $test = $cfgscorm->apidebugmask;
+ // Check the regex is only a short list of safe characters.
if (!preg_match('/^[\w\s\*\.\?\+\:\_\\\]+$/', $test)) {
return false;
}
@@ -1369,7 +1369,7 @@ function scorm_delete_attempt($userid, $scorm, $attemptid) {
* @return string human-readable date/time
*/
function scorm_format_duration($duration) {
- // fetch date/time strings
+ // Fetch date/time strings.
$stryears = get_string('years');
$strmonths = get_string('nummonths');
$strdays = get_string('days');
@@ -1378,19 +1378,19 @@ function scorm_format_duration($duration) {
$strseconds = get_string('seconds');
if ($duration[0] == 'P') {
- // if timestamp starts with 'P' - it's a SCORM 2004 format
+ // If timestamp starts with 'P' - it's a SCORM 2004 format
// this regexp discards empty sections, takes Month/Minute ambiguity into consideration,
// and outputs filled sections, discarding leading zeroes and any format literals
- // also saves the only zero before seconds decimals (if there are any) and discards decimals if they are zero
+ // also saves the only zero before seconds decimals (if there are any) and discards decimals if they are zero.
$pattern = array( '#([A-Z])0+Y#', '#([A-Z])0+M#', '#([A-Z])0+D#', '#P(|\d+Y)0*(\d+)M#', '#0*(\d+)Y#', '#0*(\d+)D#', '#P#',
'#([A-Z])0+H#', '#([A-Z])[0.]+S#', '#\.0+S#', '#T(|\d+H)0*(\d+)M#', '#0*(\d+)H#', '#0+\.(\d+)S#', '#0*([\d.]+)S#', '#T#' );
$replace = array( '$1', '$1', '$1', '$1$2 '.$strmonths.' ', '$1 '.$stryears.' ', '$1 '.$strdays.' ', '',
'$1', '$1', 'S', '$1$2 '.$strminutes.' ', '$1 '.$strhours.' ', '0.$1 '.$strseconds, '$1 '.$strseconds, '');
} else {
- // else we have SCORM 1.2 format there
- // first convert the timestamp to some SCORM 2004-like format for conveniency
+ // Else we have SCORM 1.2 format there
+ // first convert the timestamp to some SCORM 2004-like format for conveniency.
$duration = preg_replace('#^(\d+):(\d+):([\d.]+)$#', 'T$1H$2M$3S', $duration);
- // then convert in the same way as SCORM 2004
+ // Then convert in the same way as SCORM 2004.
$pattern = array( '#T0+H#', '#([A-Z])0+M#', '#([A-Z])[0.]+S#', '#\.0+S#', '#0*(\d+)H#', '#0*(\d+)M#', '#0+\.(\d+)S#', '#0*([\d.]+)S#', '#T#' );
$replace = array( 'T', '$1', '$1', 'S', '$1 '.$strhours.' ', '$1 '.$strminutes.' ', '0.$1 '.$strseconds, '$1 '.$strseconds, '' );
}
@@ -1418,7 +1418,7 @@ function scorm_get_toc_object($user, $scorm, $currentorg='', $scoid='', $mode='n
$result[0]->url = '';
}
- if ($scoes = scorm_get_scoes($scorm->id, $currentorg)){
+ if ($scoes = scorm_get_scoes($scorm->id, $currentorg)) {
// Retrieve user tracking data for each learning object.
$usertracks = array();
foreach ($scoes as $sco) {
@@ -1454,12 +1454,13 @@ 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');
+ $strstatus = get_string($usertrack->status, 'scorm');
if ($sco->scormtype == 'sco') {
- $statusicon = '\n";
+ $result->toc = html_writer::start_tag('ul');
- if (!$play && !empty($organizationsco)) {
- $result->toc .= "\t".$organizationsco->title." \n";
+ if (!$play && !empty($organizationsco)) {
+ $result->toc .= html_writer::start_tag('li').$organizationsco->title.html_writer::end_tag('li');
}
}
$prevsco = '';
if (!empty($scoes)) {
foreach ($scoes as $sco) {
- $result->toc .= "\t\n";
+ $result->toc .= html_writer::start_tag('li');
$scoid = $sco->id;
$sco->isvisible = true;
@@ -1638,7 +1642,7 @@ function scorm_format_toc_for_treeview($user, $scorm, $scoes, $usertracks, $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.')';
+ $score = '('.get_string('score', 'scorm').': '.$usertracks[$sco->identifier]->score_raw.')';
}
}
}
@@ -1650,37 +1654,38 @@ function scorm_format_toc_for_treeview($user, $scorm, $scoes, $usertracks, $cmid
if (!empty($prevsco) && scorm_version_check($scorm->version, SCORM_13) && !empty($prevsco->hidecontinue)) {
if ($sco->scormtype == 'sco') {
- $result->toc .= ''.$sco->statusicon.' '.format_string($sco->title).' ';
+ $result->toc .= html_writer::span($sco->statusicon.' '.format_string($sco->title));
} else {
- $result->toc .= ' '.format_string($sco->title).' ';
+ $result->toc .= html_writer::span(' '.format_string($sco->title));
}
} else if ($toclink == TOCFULLURL) {
$url = $CFG->wwwroot.'/mod/scorm/player.php?'.$sco->url;
if (!empty($sco->launch)) {
if ($sco->scormtype == 'sco') {
- $result->toc .= $sco->statusicon.' '.format_string($sco->title).' '.$score."\n";
+ $result->toc .= $sco->statusicon.' '.html_writer::link($url, format_string($sco->title)).$score;
} else {
- $result->toc .= ' '.format_string($sco->title).' '.$score."\n";
+ $result->toc .= ' '.html_writer::link($url, format_string($sco->title), array('data-scoid' => $sco->id)).$score;
}
} else {
if ($sco->scormtype == 'sco') {
- $result->toc .= $sco->statusicon.' '.format_string($sco->title).$score."\n";
+ $result->toc .= $sco->statusicon.' '.format_string($sco->title).$score;
} else {
- $result->toc .= ' '.format_string($sco->title).$score."\n";
+ $result->toc .= ' '.format_string($sco->title).$score;
}
}
} else {
if (!empty($sco->launch)) {
if ($sco->scormtype == 'sco') {
- $result->toc .= ''.$sco->statusicon.' '.format_string($sco->title).' '.$score.' ';
+ $result->toc .= html_writer::tag('a', $sco->statusicon.' '.format_string($sco->title).' '.$score,
+ array('data-scoid' => $sco->id, 'title' => $sco->url));
} else {
- $result->toc .= ' '.format_string($sco->title).' '.$score.' ';
+ $result->toc .= html_writer::tag('a', ' '.format_string($sco->title).' '.$score, array('data-scoid' => $sco->id, 'title' => $sco->url));
}
} else {
if ($sco->scormtype == 'sco') {
- $result->toc .= ''.$sco->statusicon.' '.format_string($sco->title).' ';
+ $result->toc .= html_writer::span($sco->statusicon.' '.format_string($sco->title));
} else {
- $result->toc .= ' '.format_string($sco->title).' ';
+ $result->toc .= html_writer::span(' '.format_string($sco->title));
}
}
}
@@ -1688,31 +1693,31 @@ function scorm_format_toc_for_treeview($user, $scorm, $scoes, $usertracks, $cmid
} else {
if ($play) {
if ($sco->scormtype == 'sco') {
- $result->toc .= ''.$sco->statusicon.' '.format_string($sco->title).' ';
+ $result->toc .= html_writer::span($sco->statusicon.' '.format_string($sco->title));
} else {
- $result->toc .= ' '.format_string($sco->title).'';
+ $result->toc .= ' '.format_string($sco->title).html_writer::end_span();
}
} else {
if ($sco->scormtype == 'sco') {
- $result->toc .= $sco->statusicon.' '.format_string($sco->title)."\n";
+ $result->toc .= $sco->statusicon.' '.format_string($sco->title);
} else {
- $result->toc .= ' '.format_string($sco->title)."\n";
+ $result->toc .= ' '.format_string($sco->title);
}
}
}
} else {
- $result->toc .= "\t\t ".format_string($sco->title)."\n";
+ $result->toc .= " ".format_string($sco->title);
}
if (!empty($sco->children)) {
- $result->toc .= "\n\t\t\n";
+ $result->toc .= html_writer::start_tag('ul');
$childresult = scorm_format_toc_for_treeview($user, $scorm, $sco->children, $usertracks, $cmid, $toclink, $currentorg, $attempt, $play, $organizationsco, true);
$result->toc .= $childresult->toc;
- $result->toc .= "\t\t \n";
- $result->toc .= "\t \n";
+ $result->toc .= html_writer::end_tag('ul');
+ $result->toc .= html_writer::end_tag('li');
} else {
- $result->toc .= "\t\n";
+ $result->toc .= html_writer::end_tag('li');
}
$prevsco = $sco;
}
@@ -1720,7 +1725,7 @@ function scorm_format_toc_for_treeview($user, $scorm, $scoes, $usertracks, $cmid
}
if (!$children) {
- $result->toc .= " \n";
+ $result->toc .= html_writer::end_tag('ul');
}
return $result;
@@ -1732,7 +1737,7 @@ function scorm_format_toc_for_droplist($scorm, $scoes, $usertracks, $currentorg=
$tocmenus[$organizationsco->id] = $organizationsco->title;
}
- $parents[$level]='/';
+ $parents[$level] = '/';
foreach ($scoes as $sco) {
if ($parents[$level] != $sco->parent) {
if ($newlevel = array_search($sco->parent, $parents)) {
@@ -1772,7 +1777,8 @@ function scorm_format_toc_for_droplist($scorm, $scoes, $usertracks, $currentorg=
return $tocmenus;
}
-function scorm_get_toc($user, $scorm, $cmid, $toclink=TOCJSLINK, $currentorg='', $scoid='', $mode='normal', $attempt='', $play=false, $tocheader=false) {
+function scorm_get_toc($user, $scorm, $cmid, $toclink=TOCJSLINK, $currentorg='', $scoid='', $mode='normal',
+ $attempt='', $play=false, $tocheader=false) {
global $CFG, $DB, $OUTPUT;
if (empty($attempt)) {
@@ -1783,14 +1789,14 @@ function scorm_get_toc($user, $scorm, $cmid, $toclink=TOCJSLINK, $currentorg='',
$organizationsco = null;
if ($tocheader) {
- $result->toc = "\n";
- $result->toc .= "
\n";
- $result->toc .= "
\n";
- $result->toc .= "
\n";
+ $result->toc = html_writer::start_div('yui3-g-r', array('id' => 'scorm_layout'));
+ $result->toc .= html_writer::start_div('yui3-u-1-5', array('id' => 'scorm_toc'));
+ $result->toc .= html_writer::div('', '', array('id' => 'scorm_toc_title'));
+ $result->toc .= html_writer::start_div('', array('id' => 'scorm_tree'));
}
if (!empty($currentorg)) {
- $organizationsco = $DB->get_record('scorm_scoes', array('scorm'=>$scorm->id, 'identifier'=>$currentorg));
+ $organizationsco = $DB->get_record('scorm_scoes', array('scorm' => $scorm->id, 'identifier' => $currentorg));
if (!empty($organizationsco->title)) {
if ($play) {
$result->toctitle = $organizationsco->title;
@@ -1800,7 +1806,8 @@ function scorm_get_toc($user, $scorm, $cmid, $toclink=TOCJSLINK, $currentorg='',
$scoes = scorm_get_toc_object($user, $scorm, $currentorg, $scoid, $mode, $attempt, $play, $organizationsco);
- $treeview = scorm_format_toc_for_treeview($user, $scorm, $scoes['scoes'][0]->children, $scoes['usertracks'], $cmid, $toclink, $currentorg, $attempt, $play, $organizationsco, false);
+ $treeview = scorm_format_toc_for_treeview($user, $scorm, $scoes['scoes'][0]->children, $scoes['usertracks'], $cmid,
+ $toclink, $currentorg, $attempt, $play, $organizationsco, false);
if ($tocheader) {
$result->toc .= $treeview->toc;
@@ -1835,12 +1842,12 @@ function scorm_get_toc($user, $scorm, $cmid, $toclink=TOCJSLINK, $currentorg='',
$result->attemptleft = $treeview->attemptleft;
if ($tocheader) {
- $result->toc .= "
\n";
- $result->toc .= "
\n";
- $result->toc .= "
\n";
- $result->toc .= "
";
- $result->toc .= "
\n";
- $result->toc .= "
'.$strexit.' ';
+if (empty($scorm->popup) || $displaymode == 'popup') {
+ $exitlink = html_writer::link($CFG->wwwroot.'/course/view.php?id='.$scorm->course, $strexit, array('title' => $strexit));
$PAGE->set_button($exitlink);
}
@@ -178,44 +178,35 @@ $PAGE->requires->string_for_js('popupsblocked', 'scorm');
$name = false;
-?>
-
+echo html_writer::start_div('', array('id' => 'scormpage'));
+echo html_writer::start_div('', array('id' => 'tocbox'));
+echo html_writer::div(html_writer::tag('script', '', array('id' => 'external-scormapi', 'type' => 'text/JavaScript')), '', array('id' => 'scormapi-parent'));
-
-
-
-
-hidetoc == SCORM_TOC_POPUP or $mode=='browse' or $mode=='review') {
- echo '
';
- echo $mode == 'browse' ? '
'.get_string('browsemode', 'scorm')."
\n" : '';
- echo $mode == 'review' ? '
'.get_string('reviewmode', 'scorm')."
\n" : '';
+if ($scorm->hidetoc == SCORM_TOC_POPUP or $mode == 'browse' or $mode == 'review') {
+ echo html_writer::start_div('', array('id' => 'scormtop'));
+ echo $mode == 'browse' ? html_writer::div(get_string('browsemode', 'scorm'), 'scorm-left', array('id' => 'scormmode')) : '';
+ echo $mode == 'review' ? html_writer::div(get_string('reviewmode', 'scorm'), 'scorm-left', array('id' => 'scormmode')) : '';
if ($scorm->hidetoc == SCORM_TOC_POPUP) {
- echo '
'.$result->tocmenu.'
';
+ echo html_writer::div($result->tocmenu, 'scorm-right', array('id' => 'scormnav'));
}
- echo '
';
+ echo html_writer::end_div();
}
-?>
-
- popup) || $displaymode == 'popup') {
- echo $result->toc;
- } else {
- //Added incase javascript popups are blocked we don't provide a direct link to the pop-up as JS communication can fail - the user must disable their pop-up blocker.
- $linkcourse = '
' . get_string('finishscormlinkname', 'scorm') . ' ';
- echo $OUTPUT->box(get_string('finishscorm', 'scorm', $linkcourse), 'generalbox', 'altfinishlink');
- }?>
-
-
-
-
-
-
-
- 'toctree'));
+
+if (empty($scorm->popup) || $displaymode == 'popup') {
+ echo $result->toc;
+} else {
+ // Added incase javascript popups are blocked we don't provide a direct link to the pop-up as JS communication can fail - the user must disable their pop-up blocker.
+ $linkcourse = html_writer::link($CFG->wwwroot.'/course/view.php?id='.$scorm->course, get_string('finishscormlinkname', 'scorm'));
+ echo $OUTPUT->box(get_string('finishscorm', 'scorm', $linkcourse), 'generalbox', 'altfinishlink');
+}
+echo html_writer::end_div(); //
+echo html_writer::end_div(); //
+echo html_writer::tag('noscript', html_writer::div(get_string('noscriptnoscorm', 'scorm'), '', array('id' => 'noscript')));
+
if ($result->prerequisites) {
- if ($scorm->popup != 0 && $displaymode !=='popup') {
+ if ($scorm->popup != 0 && $displaymode !== 'popup') {
// Clean the name for the window as IE is fussy
$name = preg_replace("/[^A-Za-z0-9]/", "", $scorm->name);
if (!$name) {
@@ -228,18 +219,14 @@ if ($result->prerequisites) {
js_writer::function_call('scorm_openpopup', Array($url->out(false),
$name, $scorm->options,
$scorm->width, $scorm->height)));
- ?>
-
-
-
- 'main', 'class' => 'scoframe', 'name' => 'main',
+ 'src' => 'loadSCO.php?id='.$cm->id.$scoidstr.$modestr)));
}
} else {
echo $OUTPUT->box(get_string('noprerequisites', 'scorm'));
}
-?>
-
';
+ echo html_writer::start_div('scormattemptcounts');
if ( $count->nbresults == $count->nbattempts ) {
echo get_string('reportcountattempts', 'scorm', $count);
- } else if ( $count->nbattempts>0 ) {
+ } else if ( $count->nbattempts > 0 ) {
echo get_string('reportcountallattempts', 'scorm', $count);
} else {
echo $count->nbusers.' '.get_string('users');
}
- echo '
';
+ echo html_writer::end_div();
}
- // Fetch the attempts
+ // Fetch the attempts.
if (!$download) {
$attempts = $DB->get_records_sql($select.$from.$where.$sort, $params,
$table->get_page_start(), $table->get_page_size());
- echo '';
+ echo html_writer::start_div('', array('id' => 'scormtablecontainer'));
if ($candelete) {
- // Start form
+ // Start form.
$strreallydel = addslashes_js(get_string('deleteattemptcheck', 'scorm'));
- echo '
';
+ echo html_writer::empty_tag('input', array('type' => 'submit',
+ 'value' => get_string('deleteselected', 'quiz_overview')));
+ echo html_writer::end_tag('td').html_writer::end_tag('tr').html_writer::end_tag('table');
+ // Close form.
+ echo html_writer::end_tag('div');
+ echo html_writer::end_tag('form');
}
- echo '
';
- echo '';
+ echo html_writer::start_tag('table', array('class' => 'boxaligncenter')).html_writer::start_tag('tr');
+ echo html_writer::start_tag('td');
echo $OUTPUT->single_button(new moodle_url($PAGE->url,
- array('download'=>'ODS') + $displayoptions),
+ array('download' => 'ODS') + $displayoptions),
get_string('downloadods'));
- echo " \n";
- echo '';
+ echo html_writer::end_tag('td');
+ echo html_writer::start_tag('td');
echo $OUTPUT->single_button(new moodle_url($PAGE->url,
- array('download'=>'Excel') + $displayoptions),
+ array('download' => 'Excel') + $displayoptions),
get_string('downloadexcel'));
- echo " \n";
- echo '';
+ echo html_writer::end_tag('td');
+ echo html_writer::start_tag('td');
echo $OUTPUT->single_button(new moodle_url($PAGE->url,
- array('download'=>'CSV') + $displayoptions),
+ array('download' => 'CSV') + $displayoptions),
get_string('downloadtext'));
- echo " \n";
- echo "";
- echo " \n";
- echo '
';
+ echo html_writer::end_tag('td');
+ echo html_writer::start_tag('td');
+ echo html_writer::end_tag('td');
+ echo html_writer::end_tag('tr').html_writer::end_tag('table');
}
}
} else {
if ($candelete && !$download) {
- echo '';
- echo '';
+ echo html_writer::end_div();
+ echo html_writer::end_tag('form');
$table->finish_output();
}
- echo '';
+ echo html_writer::end_div();
}
- // Show preferences form irrespective of attempts are there to report or not
+ // Show preferences form irrespective of attempts are there to report or not.
if (!$download) {
$mform->set_data(compact('detailedrep', 'pagesize', 'attemptsmode'));
$mform->display();
@@ -539,5 +548,5 @@ class scorm_basic_report extends scorm_default_report {
} else {
echo $OUTPUT->notification(get_string('noactivity', 'scorm'));
}
- }// function ends
+ }// Function ends.
}
diff --git a/mod/scorm/report/interactions/report.php b/mod/scorm/report/interactions/report.php
index a424d85eadd..f0baa834b4c 100644
--- a/mod/scorm/report/interactions/report.php
+++ b/mod/scorm/report/interactions/report.php
@@ -33,7 +33,7 @@ class scorm_interactions_report extends scorm_default_report {
* @param stdClass $course - full course object
* @param string $download - type of download being requested
*/
- function display($scorm, $cm, $course, $download) {
+ public function display($scorm, $cm, $course, $download) {
global $CFG, $DB, $OUTPUT, $PAGE;
$contextmodule = context_module::instance($cm->id);
@@ -43,14 +43,14 @@ class scorm_interactions_report extends scorm_default_report {
$PAGE->set_url(new moodle_url($PAGE->url, array('attemptsmode' => $attemptsmode)));
if ($action == 'delete' && has_capability('mod/scorm:deleteresponses', $contextmodule) && confirm_sesskey()) {
- if (scorm_delete_responses($attemptids, $scorm)) { //delete responses.
+ if (scorm_delete_responses($attemptids, $scorm)) { // Delete responses.
echo $OUTPUT->notification(get_string('scormresponsedeleted', 'scorm'), 'notifysuccess');
}
}
- // find out current groups mode
+ // Find out current groups mode.
$currentgroup = groups_get_activity_group($cm, true);
- // detailed report
+ // Detailed report.
$mform = new mod_scorm_report_interactions_settings($PAGE->url, compact('currentgroup'));
if ($fromform = $mform->get_data()) {
$pagesize = $fromform->pagesize;
@@ -71,7 +71,7 @@ class scorm_interactions_report extends scorm_default_report {
$pagesize = SCORM_REPORT_DEFAULT_PAGE_SIZE;
}
- // select group menu
+ // Select group menu.
$displayoptions = array();
$displayoptions['attemptsmode'] = $attemptsmode;
$displayoptions['qtext'] = $includeqtext;
@@ -79,7 +79,7 @@ class scorm_interactions_report extends scorm_default_report {
$displayoptions['right'] = $includeright;
$mform->set_data($displayoptions + array('pagesize' => $pagesize));
- if ($groupmode = groups_get_activity_groupmode($cm)) { // Groups are being used
+ if ($groupmode = groups_get_activity_groupmode($cm)) { // Groups are being used.
if (!$download) {
groups_print_activity_menu($cm, new moodle_url($PAGE->url, $displayoptions));
}
@@ -90,11 +90,11 @@ class scorm_interactions_report extends scorm_default_report {
// if the user has permissions and if the report mode is showing attempts.
$candelete = has_capability('mod/scorm:deleteresponses', $contextmodule)
&& ($attemptsmode != SCORM_REPORT_ATTEMPTS_STUDENTS_WITH_NO);
- // select the students
+ // Select the students.
$nostudents = false;
if (empty($currentgroup)) {
- // all users who can attempt scoes
+ // All users who can attempt scoes.
if (!$students = get_users_by_capability($contextmodule, 'mod/scorm:savetrack', 'u.id', '', '', '', '', '', false)) {
echo $OUTPUT->notification(get_string('nostudentsyet'));
$nostudents = true;
@@ -104,8 +104,10 @@ class scorm_interactions_report extends scorm_default_report {
}
unset($students);
} else {
- // all users who can attempt scoes and who are in the currently selected group
- if (!$groupstudents = get_users_by_capability($contextmodule, 'mod/scorm:savetrack', 'u.id', '', '', '', $currentgroup, '', false)) {
+ // All users who can attempt scoes and who are in the currently selected group.
+ if (!$groupstudents = get_users_by_capability($contextmodule,
+ 'mod/scorm:savetrack', 'u.id', '', '', '',
+ $currentgroup, '', false)) {
echo $OUTPUT->notification(get_string('nostudentsingroup'));
$nostudents = true;
$groupstudents = array();
@@ -114,13 +116,13 @@ class scorm_interactions_report extends scorm_default_report {
unset($groupstudents);
}
if ( !$nostudents ) {
- // Now check if asked download of data
+ // Now check if asked download of data.
$coursecontext = context_course::instance($course->id);
if ($download) {
- $filename = clean_filename("$course->shortname ".format_string($scorm->name, true,$formattextoptions));
+ $filename = clean_filename("$course->shortname ".format_string($scorm->name, true, $formattextoptions));
}
- // Define table columns
+ // Define table columns.
$columns = array();
$headers = array();
if (!$download && $candelete) {
@@ -151,32 +153,32 @@ class scorm_interactions_report extends scorm_default_report {
foreach ($scoes as $sco) {
if ($sco->launch != '') {
$columns[] = 'scograde'.$sco->id;
- $headers[] = format_string($sco->title,'',$formattextoptions);
+ $headers[] = format_string($sco->title, '', $formattextoptions);
}
}
$params = array();
list($usql, $params) = $DB->get_in_or_equal($allowedlist, SQL_PARAMS_NAMED);
- // Construct the SQL
+ // Construct the SQL.
$select = 'SELECT DISTINCT '.$DB->sql_concat('u.id', '\'#\'', 'COALESCE(st.attempt, 0)').' AS uniqueid, ';
$select .= 'st.scormid AS scormid, st.attempt AS attempt, ' .
user_picture::fields('u', array('idnumber'), 'userid') .
get_extra_user_fields_sql($coursecontext, 'u', '', array('email', 'idnumber')) . ' ';
- // This part is the same for all cases - join users and scorm_scoes_track tables
+ // This part is the same for all cases - join users and scorm_scoes_track tables.
$from = 'FROM {user} u ';
$from .= 'LEFT JOIN {scorm_scoes_track} st ON st.userid = u.id AND st.scormid = '.$scorm->id;
switch ($attemptsmode) {
case SCORM_REPORT_ATTEMPTS_STUDENTS_WITH:
- // Show only students with attempts
+ // Show only students with attempts.
$where = ' WHERE u.id ' .$usql. ' AND st.userid IS NOT NULL';
break;
case SCORM_REPORT_ATTEMPTS_STUDENTS_WITH_NO:
- // Show only students without attempts
+ // Show only students without attempts.
$where = ' WHERE u.id ' .$usql. ' AND st.userid IS NULL';
break;
case SCORM_REPORT_ATTEMPTS_ALL_STUDENTS:
- // Show all students with or without attempts
+ // Show all students with or without attempts.
$where = ' WHERE u.id ' .$usql. ' AND (st.userid IS NOT NULL OR st.userid IS NULL)';
break;
}
@@ -187,7 +189,7 @@ class scorm_interactions_report extends scorm_default_report {
$countsql .= $from.$where;
$questioncount = get_scorm_question_count($scorm->id);
$nbmaincolumns = count($columns);
- for($id = 0; $id < $questioncount; $id++) {
+ for ($id = 0; $id < $questioncount; $id++) {
if ($displayoptions['qtext']) {
$columns[] = 'question' . $id;
$headers[] = get_string('questionx', 'scormreport_interactions', $id);
@@ -212,7 +214,7 @@ class scorm_interactions_report extends scorm_default_report {
$table->sortable(true);
$table->collapsible(true);
- // This is done to prevent redundant data, when a user has multiple attempts
+ // This is done to prevent redundant data, when a user has multiple attempts.
$table->column_suppress('picture');
$table->column_suppress('fullname');
foreach ($extrafields as $field) {
@@ -225,7 +227,7 @@ class scorm_interactions_report extends scorm_default_report {
$table->no_sorting('checkbox');
$table->no_sorting('picture');
- for($id = 0; $id < $questioncount; $id++) {
+ for ($id = 0; $id < $questioncount; $id++) {
if ($displayoptions['qtext']) {
$table->no_sorting('question'.$id);
}
@@ -251,20 +253,20 @@ class scorm_interactions_report extends scorm_default_report {
$table->set_attribute('id', 'attempts');
$table->set_attribute('class', 'generaltable generalbox');
- // Start working -- this is necessary as soon as the niceties are over
+ // Start working -- this is necessary as soon as the niceties are over.
$table->setup();
} else if ($download == 'ODS') {
require_once("$CFG->libdir/odslib.class.php");
$filename .= ".ods";
- // Creating a workbook
+ // Creating a workbook.
$workbook = new MoodleODSWorkbook("-");
- // Sending HTTP headers
+ // Sending HTTP headers.
$workbook->send($filename);
- // Creating the first worksheet
+ // Creating the first worksheet.
$sheettitle = get_string('report', 'scorm');
$myxls = $workbook->add_worksheet($sheettitle);
- // format types
+ // Format types.
$format = $workbook->add_format();
$format->set_bold(0);
$formatbc = $workbook->add_format();
@@ -284,7 +286,7 @@ class scorm_interactions_report extends scorm_default_report {
$formatg->set_bold(1);
$formatg->set_color('green');
$formatg->set_align('center');
- // Here starts workshhet headers
+ // Here starts workshhet headers.
$colnum = 0;
foreach ($headers as $item) {
@@ -292,18 +294,18 @@ class scorm_interactions_report extends scorm_default_report {
$colnum++;
}
$rownum = 1;
- } else if ($download =='Excel') {
+ } else if ($download == 'Excel') {
require_once("$CFG->libdir/excellib.class.php");
$filename .= ".xls";
- // Creating a workbook
+ // Creating a workbook.
$workbook = new MoodleExcelWorkbook("-");
- // Sending HTTP headers
+ // Sending HTTP headers.
$workbook->send($filename);
- // Creating the first worksheet
+ // Creating the first worksheet.
$sheettitle = get_string('report', 'scorm');
$myxls = $workbook->add_worksheet($sheettitle);
- // format types
+ // Format types.
$format = $workbook->add_format();
$format->set_bold(0);
$formatbc = $workbook->add_format();
@@ -341,7 +343,7 @@ class scorm_interactions_report extends scorm_default_report {
} else {
$sort = '';
}
- // Fix some wired sorting
+ // Fix some wired sorting.
if (empty($sort)) {
$sort = ' ORDER BY uniqueid';
} else {
@@ -349,15 +351,15 @@ class scorm_interactions_report extends scorm_default_report {
}
if (!$download) {
- // Add extra limits due to initials bar
+ // Add extra limits due to initials bar.
list($twhere, $tparams) = $table->get_sql_where();
if ($twhere) {
- $where .= ' AND '.$twhere; //initial bar
+ $where .= ' AND '.$twhere; // Initial bar.
$params = array_merge($params, $tparams);
}
if (!empty($countsql)) {
- $count = $DB->get_record_sql($countsql,$params);
+ $count = $DB->get_record_sql($countsql, $params);
$totalinitials = $count->nbresults;
if ($twhere) {
$countsql .= ' AND '.$twhere;
@@ -368,35 +370,36 @@ class scorm_interactions_report extends scorm_default_report {
$table->pagesize($pagesize, $total);
- echo '';
+ echo html_writer::start_div('scormattemptcounts');
if ( $count->nbresults == $count->nbattempts ) {
echo get_string('reportcountattempts', 'scorm', $count);
- } else if ( $count->nbattempts>0 ) {
+ } else if ( $count->nbattempts > 0 ) {
echo get_string('reportcountallattempts', 'scorm', $count);
} else {
echo $count->nbusers.' '.get_string('users');
}
- echo '
';
+ echo html_writer::end_div();
}
- // Fetch the attempts
+ // Fetch the attempts.
if (!$download) {
$attempts = $DB->get_records_sql($select.$from.$where.$sort, $params,
$table->get_page_start(), $table->get_page_size());
- echo '';
+ echo html_writer::start_div('', array('id' => 'scormtablecontainer'));
if ($candelete) {
- // Start form
+ // Start form.
$strreallydel = addslashes_js(get_string('deleteattemptcheck', 'scorm'));
- echo '
';
+ echo html_writer::empty_tag('input', array('type' => 'submit',
+ 'value' => get_string('deleteselected', 'quiz_overview')));
+ echo html_writer::end_tag('td').html_writer::end_tag('tr').html_writer::end_tag('table');
+ // Close form.
+ echo html_writer::end_tag('div');
+ echo html_writer::end_tag('form');
}
- echo '
';
- echo '';
+ echo html_writer::start_tag('table', array('class' => 'boxaligncenter')).html_writer::start_tag('tr');
+ echo html_writer::start_tag('td');
echo $OUTPUT->single_button(new moodle_url($PAGE->url,
- array('download'=>'ODS') + $displayoptions),
+ array('download' => 'ODS') + $displayoptions),
get_string('downloadods'));
- echo " \n";
- echo '';
+ echo html_writer::end_tag('td');
+ echo html_writer::start_tag('td');
echo $OUTPUT->single_button(new moodle_url($PAGE->url,
- array('download'=>'Excel') + $displayoptions),
+ array('download' => 'Excel') + $displayoptions),
get_string('downloadexcel'));
- echo " \n";
- echo '';
+ echo html_writer::end_tag('td');
+ echo html_writer::start_tag('td');
echo $OUTPUT->single_button(new moodle_url($PAGE->url,
- array('download'=>'CSV') + $displayoptions),
+ array('download' => 'CSV') + $displayoptions),
get_string('downloadtext'));
- echo " \n";
- echo "";
- echo " \n";
- echo '
';
+ echo html_writer::end_tag('td');
+ echo html_writer::start_tag('td');
+ echo html_writer::end_tag('td');
+ echo html_writer::end_tag('tr').html_writer::end_tag('table');
}
}
} else {
if ($candelete && !$download) {
- echo '';
- echo '';
+ echo html_writer::end_div();
+ echo html_writer::end_tag('form');
$table->finish_output();
}
- echo '';
+ echo html_writer::end_div();
}
- // Show preferences form irrespective of attempts are there to report or not
+ // Show preferences form irrespective of attempts are there to report or not.
if (!$download) {
$mform->set_data(compact('detailedrep', 'pagesize', 'attemptsmode'));
$mform->display();
@@ -609,5 +617,5 @@ class scorm_interactions_report extends scorm_default_report {
} else {
echo $OUTPUT->notification(get_string('noactivity', 'scorm'));
}
- }// function ends
+ }// Function ends.
}
diff --git a/mod/scorm/report/objectives/report.php b/mod/scorm/report/objectives/report.php
index 4a450278319..7cb3666583e 100644
--- a/mod/scorm/report/objectives/report.php
+++ b/mod/scorm/report/objectives/report.php
@@ -295,7 +295,7 @@ class scorm_objectives_report extends scorm_default_report {
$colnum++;
}
$rownum = 1;
- } else if ($download =='Excel') {
+ } else if ($download == 'Excel') {
require_once("$CFG->libdir/excellib.class.php");
$filename .= ".xls";
@@ -371,35 +371,36 @@ class scorm_objectives_report extends scorm_default_report {
$table->pagesize($pagesize, $total);
- echo '';
+ echo html_writer::start_div('scormattemptcounts');
if ( $count->nbresults == $count->nbattempts ) {
echo get_string('reportcountattempts', 'scorm', $count);
- } else if ( $count->nbattempts>0 ) {
+ } else if ( $count->nbattempts > 0 ) {
echo get_string('reportcountallattempts', 'scorm', $count);
} else {
echo $count->nbusers.' '.get_string('users');
}
- echo '
';
+ echo html_writer::end_div();
}
// Fetch the attempts.
if (!$download) {
$attempts = $DB->get_records_sql($select.$from.$where.$sort, $params,
$table->get_page_start(), $table->get_page_size());
- echo '';
+ echo html_writer::start_div('', array('id' => 'scormtablecontainer'));
if ($candelete) {
// Start form.
$strreallydel = addslashes_js(get_string('deleteattemptcheck', 'scorm'));
- echo '
';
+ echo html_writer::end_tag('div');
+ echo html_writer::end_tag('form');
}
- echo '
';
- echo '';
+ echo html_writer::start_tag('table', array('class' => 'boxaligncenter')).html_writer::start_tag('tr');
+ echo html_writer::start_tag('td');
echo $OUTPUT->single_button(new moodle_url($PAGE->url,
- array('download'=>'ODS') + $displayoptions),
+ array('download' => 'ODS') + $displayoptions),
get_string('downloadods'));
- echo " \n";
- echo '';
+ echo html_writer::end_tag('td');
+ echo html_writer::start_tag('td');
echo $OUTPUT->single_button(new moodle_url($PAGE->url,
- array('download'=>'Excel') + $displayoptions),
+ array('download' => 'Excel') + $displayoptions),
get_string('downloadexcel'));
- echo " \n";
- echo '';
+ echo html_writer::end_tag('td');
+ echo html_writer::start_tag('td');
echo $OUTPUT->single_button(new moodle_url($PAGE->url,
- array('download'=>'CSV') + $displayoptions),
+ array('download' => 'CSV') + $displayoptions),
get_string('downloadtext'));
- echo " \n";
- echo "";
- echo " \n";
- echo '
';
+ echo html_writer::end_tag('td');
+ echo html_writer::start_tag('td');
+ echo html_writer::end_tag('td');
+ echo html_writer::end_tag('tr').html_writer::end_tag('table');
}
}
} else {
if ($candelete && !$download) {
- echo '';
- echo '';
+ echo html_writer::end_div();
+ echo html_writer::end_tag('form');
$table->finish_output();
}
- echo '';
+ echo html_writer::end_div();
}
// Show preferences form irrespective of attempts are there to report or not.
if (!$download) {
diff --git a/mod/scorm/reportsettings_form.php b/mod/scorm/reportsettings_form.php
index a34f1214a5a..edef8d64c01 100644
--- a/mod/scorm/reportsettings_form.php
+++ b/mod/scorm/reportsettings_form.php
@@ -15,16 +15,16 @@
// along with Moodle. If not, see "; + $report .= html_writer::img($OUTPUT->pix_url($usertrack->status, 'scorm'), $strstatus, array('title' => $strstatus)); } else { if ($sco->scormtype == 'sco') { - $report .= '
'; + $report .= html_writer::img($OUTPUT->pix_url('notattempted', 'scorm'), get_string('notattempted', 'scorm'), + array('title' => get_string('notattempted', 'scorm'))); } else { - $report .= '
'; + $report .= html_writer::img($OUTPUT->pix_url('asset', 'scorm'), get_string('asset', 'scorm'), array('title' => get_string('asset', 'scorm'))); } } - $report .= " $sco->title $score$totaltime
\n";
+ $report .= " $sco->title $score$totaltime".html_writer::end_tag('li');
if ($usertrack !== false) {
$sometoreport = true;
- $report .= "\t\t\t