diff --git a/lib/messagelib.php b/lib/messagelib.php index 4a5941abcdb..a45afa2b494 100644 --- a/lib/messagelib.php +++ b/lib/messagelib.php @@ -354,7 +354,7 @@ function message_set_default_message_preference($component, $messagename, $filep /** * Returns the active providers for the current user, based on capability - * + * * This function has been deprecated please use {@see message_get_providers_for_user()} instead. * * @deprecated since 2.1 diff --git a/mod/scorm/report.php b/mod/scorm/report.php index 92ed305694b..45fff4bc565 100644 --- a/mod/scorm/report.php +++ b/mod/scorm/report.php @@ -28,7 +28,7 @@ $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); $scorm = $DB->get_record('scorm', array('id'=>$cm->instance), '*', MUST_EXIST); - + $PAGE->set_url($url); require_login($course->id, false, $cm); @@ -370,7 +370,7 @@ $countsql .= ' AND '.$twhere; // Fetch the attempts if (!$download) { - $attempts = $DB->get_records_sql($select.$from.$where.$sort, $params, + $attempts = $DB->get_records_sql($select.$from.$where.$sort, $params, $table->get_page_start(), $table->get_page_size()); echo '
'; if ($candelete) { @@ -405,11 +405,11 @@ $countsql .= ' AND '.$twhere; } if (in_array('picture', $columns)) { $user = (object)array( - 'id'=>$scouser->userid, - 'picture'=>$scouser->picture, - 'imagealt'=>$scouser->imagealt, - 'email'=>$scouser->email, - 'firstname'=>$scouser->firstname, + 'id'=>$scouser->userid, + 'picture'=>$scouser->picture, + 'imagealt'=>$scouser->imagealt, + 'email'=>$scouser->email, + 'firstname'=>$scouser->firstname, 'lastname'=>$scouser->lastname); $row[] = $OUTPUT->user_picture($user, array('courseid'=>$course->id)); } diff --git a/mod/scorm/userreport.php b/mod/scorm/userreport.php index 63115bc5a7b..530fcc4c43f 100644 --- a/mod/scorm/userreport.php +++ b/mod/scorm/userreport.php @@ -17,7 +17,7 @@ /** * This page displays the user data from a single attempt - * + * * @package mod * @subpackage scorm * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} @@ -110,10 +110,10 @@ if ($scoes = $DB->get_records_select('scorm_scoes', "scorm=? ORDER BY id", array // Print general score data $table = new html_table(); $table->head = array( - get_string('title', 'scorm'), - get_string('status', 'scorm'), - get_string('time', 'scorm'), - get_string('score', 'scorm'), + get_string('title', 'scorm'), + get_string('status', 'scorm'), + get_string('time', 'scorm'), + get_string('score', 'scorm'), ''); $table->align = array('left', 'center', 'center', 'right', 'left'); $table->wrap = array('nowrap', 'nowrap', 'nowrap', 'nowrap', 'nowrap'); @@ -183,17 +183,17 @@ if (!empty($b)) { $existelements = false; if ($scorm->version == 'SCORM_1.3') { $elements = array( - 'raw' => 'cmi.score.raw', - 'min' => 'cmi.score.min', - 'max' => 'cmi.score.max', - 'status' => 'cmi.completion_status', + 'raw' => 'cmi.score.raw', + 'min' => 'cmi.score.min', + 'max' => 'cmi.score.max', + 'status' => 'cmi.completion_status', 'time' => 'cmi.total_time'); } else { $elements = array( - 'raw' => 'cmi.core.score.raw', - 'min' => 'cmi.core.score.min', - 'max' => 'cmi.core.score.max', - 'status' => 'cmi.core.lesson_status', + 'raw' => 'cmi.core.score.raw', + 'min' => 'cmi.core.score.min', + 'max' => 'cmi.core.score.max', + 'status' => 'cmi.core.lesson_status', 'time' => 'cmi.core.total_time'); } $printedelements = array(); @@ -224,9 +224,9 @@ if (!empty($b)) { // Print Interactions data $table = new html_table(); $table->head = array( - get_string('identifier', 'scorm'), - get_string('type', 'scorm'), - get_string('result', 'scorm'), + get_string('identifier', 'scorm'), + get_string('type', 'scorm'), + get_string('result', 'scorm'), get_string('student_response', 'scorm')); $table->align = array('center', 'center', 'center', 'center'); $table->wrap = array('nowrap', 'nowrap', 'nowrap', 'nowrap'); @@ -240,9 +240,9 @@ if (!empty($b)) { $existinteraction = true; $printedelements[]=$interactionid; $elements = array( - $interactionid, - 'cmi.interactions.'.$i.'.type', - 'cmi.interactions.'.$i.'.result', + $interactionid, + 'cmi.interactions.'.$i.'.type', + 'cmi.interactions.'.$i.'.result', 'cmi.interactions.'.$i.'.learner_response'); $row = array(); foreach ($elements as $element) { @@ -265,10 +265,10 @@ if (!empty($b)) { // Print Objectives data $table = new html_table(); $table->head = array( - get_string('identifier', 'scorm'), - get_string('status', 'scorm'), - get_string('raw', 'scorm'), - get_string('min', 'scorm'), + get_string('identifier', 'scorm'), + get_string('status', 'scorm'), + get_string('raw', 'scorm'), + get_string('min', 'scorm'), get_string('max', 'scorm')); $table->align = array('center', 'center', 'center', 'center', 'center'); $table->wrap = array('nowrap', 'nowrap', 'nowrap', 'nowrap', 'nowrap'); @@ -283,9 +283,9 @@ if (!empty($b)) { $existobjective = true; $printedelements[]=$objectiveid; $elements = array( - $objectiveid, - 'cmi.objectives.'.$i.'.status', - 'cmi.objectives.'.$i.'.score.raw', + $objectiveid, + 'cmi.objectives.'.$i.'.status', + 'cmi.objectives.'.$i.'.score.raw', 'cmi.objectives.'.$i.'.score.min', 'cmi.objectives.'.$i.'.score.max'); $row = array(); @@ -338,4 +338,4 @@ if (!empty($b)) { } // Print footer -echo $OUTPUT->footer(); \ No newline at end of file +echo $OUTPUT->footer();