';
echo '| ';
- echo $OUTPUT->single_button(new moodle_url('/mod/scorm/report.php', $pageoptions + $displayoptions + array('download' => 'ODS')), get_string('downloadods'));
+ $PAGE->url->param('download', 'ODS');
+ echo $OUTPUT->single_button($PAGE->url, get_string('downloadods'));
echo " | \n";
echo '';
- echo $OUTPUT->single_button(new moodle_url('/mod/scorm/report.php', $pageoptions + $displayoptions + array('download' => 'Excel')), get_string('downloadexcel'));
+ $PAGE->url->param('download', 'Excel');
+ echo $OUTPUT->single_button($PAGE->url, get_string('downloadexcel'));
echo " | \n";
echo '';
- echo $OUTPUT->single_button(new moodle_url('/mod/scorm/report.php', $pageoptions + $displayoptions + array('download' => 'CSV')), get_string('downloadtext'));
+ $PAGE->url->param('download', 'CSV');
+ echo $OUTPUT->single_button($PAGE->url, get_string('downloadtext'));
+ $PAGE->url->param('download', '');
echo " | \n";
echo "";
echo " | \n";
@@ -499,7 +504,7 @@ function display($scorm, $cm, $course, $attemptids, $action, $download) {
}
}
if (!$download) {
- $mform->set_data($displayoptions + compact('detailedrep', 'pagesize'));
+ $mform->set_data(compact('detailedrep', 'pagesize'));
$mform->display();
}
} else {
@@ -514,15 +519,16 @@ function display($scorm, $cm, $course, $attemptids, $action, $download) {
} else {
echo $OUTPUT->notification(get_string('noactivity', 'scorm'));
}
- return 1;
}// function ends
- function canview($id, $contextmodule) {
- global $CFG;
- if (has_capability('mod/scorm:viewreport', $contextmodule)) {
- $return = '';
- $return.= ''.get_string('pluginname', 'scorm_basic').'';
- $return.= '
';
- return $return;
+
+ /**
+ * only users with mod/scorm:viewreport can see this plugin.
+ * @param stdclass $context - context object
+ * @return boolean
+ */
+ function canview($context) {
+ if (has_capability('mod/scorm:viewreport', $context)) {
+ return true;
}
return false;
}
diff --git a/mod/scorm/report/basic/version.php b/mod/scorm/report/basic/version.php
index 61c67d0a799d2..5612b98bdad23 100644
--- a/mod/scorm/report/basic/version.php
+++ b/mod/scorm/report/basic/version.php
@@ -25,4 +25,5 @@
defined('MOODLE_INTERNAL') || die();
-$plugin->version = 0.3;
+$plugin->version = 2011071100;
+$plugin->requires = 2011070800;
diff --git a/mod/scorm/report/default.php b/mod/scorm/report/default.php
index 049df81c8fcac..12481ac349747 100644
--- a/mod/scorm/report/default.php
+++ b/mod/scorm/report/default.php
@@ -30,18 +30,25 @@
/// to itself - all these will also be globally available.
////////////////////////////////////////////////////////////////////
-class scorm_default_report {
+defined('MOODLE_INTERNAL') || die();
- function display($scorm, $cm, $course, $attemptids, $action, $download) {
+class scorm_default_report {
+ /**
+ * displays the full report
+ * @param stdClass $scorm full SCORM object
+ * @param stdClass $cm - full course_module object
+ * @param stdClass $course - full course object
+ * @param string $download - type of download being requested
+ */
+ function display($scorm, $cm, $course, $download) {
/// This function just displays the report
return true;
}
- function settings($cm, $course, $quiz) {
- /// This function just displays the settings
+ /**
+ * allows the plugin to control who can see this plugin.
+ * @return boolean
+ */
+ function canview($contextmodule) {
return true;
}
- function canview($id, $contextmodule) {
- /// This function just displays the settings
- return false;
- }
}
diff --git a/mod/scorm/report/reportlib.php b/mod/scorm/report/reportlib.php
index ef5746d688fa5..34783f499b4d7 100644
--- a/mod/scorm/report/reportlib.php
+++ b/mod/scorm/report/reportlib.php
@@ -16,28 +16,33 @@
/**
* Returns an array of reports to which are currently readable.
- * @package scorm_basic
+ * @package scorm
* @author Ankit Kumar Agarwal
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+defined('MOODLE_INTERNAL') || die();
+
function scorm_report_list($context) {
- global $DB;
- static $reportlist = null;
- if (!is_null($reportlist)) {
+ global $CFG;
+ static $reportlist;
+ if (!empty($reportlist)) {
return $reportlist;
}
$reportdirs = get_plugin_list('scorm');
- $reportcaps = array();
foreach ($reportdirs as $reportname => $notused) {
- $pluginfile = 'report/'.$reportname.'/report.php';
+ $pluginfile = $CFG->dirroot.'/mod/scorm/report/'.$reportname.'/report.php';
if (is_readable($pluginfile)) {
include_once($pluginfile);
$reportclassname = "scorm_{$reportname}_report";
if (class_exists($reportclassname)) {
- $reportcaps[] = $reportname;
+ $report = new $reportclassname();
+
+ if ($report->canview($context)) {
+ $reportlist[] = $reportname;
+ }
}
}
}
- return $reportcaps;
+ return $reportlist;
}
diff --git a/mod/scorm/reportsettings_form.php b/mod/scorm/reportsettings_form.php
index 61ed1dc4da918..f01eea4c1ddff 100644
--- a/mod/scorm/reportsettings_form.php
+++ b/mod/scorm/reportsettings_form.php
@@ -28,11 +28,12 @@ function definition() {
$mform->addElement('header', 'preferencespage', get_string('preferencespage', 'scorm'));
$options = array();
+ /*Group support is broken - see MDL-28282
if ($this->_customdata['currentgroup'] || $COURSE->id != SITEID) {
$options[SCORM_REPORT_ATTEMPTS_ALL_STUDENTS] = get_string('optallstudents', 'scorm');
$options[SCORM_REPORT_ATTEMPTS_STUDENTS_WITH] = get_string('optattemptsonly', 'scorm');
$options[SCORM_REPORT_ATTEMPTS_STUDENTS_WITH_NO] = get_string('optnoattemptsonly', 'scorm');
- }
+ }*/
$mform->addElement('select', 'attemptsmode', get_string('show', 'scorm'), $options);
//-------------------------------------------------------------------------------
diff --git a/mod/scorm/tabs.php b/mod/scorm/tabs.php
index da25a91419607..8ef0bc285e828 100644
--- a/mod/scorm/tabs.php
+++ b/mod/scorm/tabs.php
@@ -15,12 +15,12 @@
// along with Moodle. If not, see .
/**
-* Sets up the tabs used by the scorm pages based on the users capabilities.
-*
-* @author Dan Marsden and others.
-* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
-* @package scorm
-*/
+ * Sets up the tabs used by the scorm pages based on the users capabilities.
+ *
+ * @author Dan Marsden and others.
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package scorm
+ */
if (empty($scorm)) {
error('You cannot call this script in that way');
@@ -32,7 +32,6 @@
$cm = get_coursemodule_from_instance('scorm', $scorm->id);
}
-
$contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
$tabs = array();
@@ -53,4 +52,12 @@
$tabs[] = $row;
}
+if ($currenttab == 'reports' && !empty($reportlist) && count($reportlist) > 1) {
+ $row2 = array();
+ foreach ($reportlist as $rep) {
+ $row2[] = new tabobject('scorm_'.$rep, $CFG->wwwroot."/mod/scorm/report.php?id=$cm->id&mode=$rep", get_string('pluginname', 'scorm_'.$rep));
+ }
+ $tabs[] = $row2;
+}
+
print_tabs($tabs, $currenttab, $inactive, $activated);