From 5c508e3f0c2bf29a8f9c5978889e7038a78a2069 Mon Sep 17 00:00:00 2001 From: samhemelryk Date: Thu, 24 Sep 2009 08:28:51 +0000 Subject: [PATCH] mod-scorm MDL-19815 Added set_url calls, replaced deprecated functions --- mod/scorm/aicc.php | 6 ++++++ mod/scorm/datamodel.php | 2 ++ mod/scorm/index.php | 4 +++- mod/scorm/loadSCO.php | 4 +++- mod/scorm/loaddatamodel.php | 6 ++++++ mod/scorm/player.php | 22 +++++++++++++++++----- mod/scorm/report.php | 17 ++++++++++++++++- mod/scorm/view.php | 10 ++++++++-- 8 files changed, 61 insertions(+), 10 deletions(-) diff --git a/mod/scorm/aicc.php b/mod/scorm/aicc.php index 0f46d6c228..e7d91b9609 100755 --- a/mod/scorm/aicc.php +++ b/mod/scorm/aicc.php @@ -19,6 +19,12 @@ $sessionid = required_param('session_id', PARAM_ALPHANUM); $aiccdata = optional_param('aicc_data', '', PARAM_RAW); + $url = new moodle_url($CFG->wwwroot.'/mod/scorm/aicc.php', array('command'=>$command,'session_id'=>$sessionid)); + if ($aiccdata !== 0) { + $url->param('aicc_data', $aiccdata); + } + $PAGE->set_url($url); + require_login(); if (!empty($command) && confirm_sesskey($sessionid)) { diff --git a/mod/scorm/datamodel.php b/mod/scorm/datamodel.php index 15781f5f70..ab462de722 100755 --- a/mod/scorm/datamodel.php +++ b/mod/scorm/datamodel.php @@ -33,6 +33,8 @@ print_error('missingparameter'); } + $PAGE->set_url(new moodle_url($CFG->wwwroot.'/mod/scorm/datamodel.php', array('scoid'=>$scoid,'attempt'=>$attempt, 'id'=>$cm->id))); + require_login($course->id, false, $cm); if (confirm_sesskey() && (!empty($scoid))) { diff --git a/mod/scorm/index.php b/mod/scorm/index.php index b0dc915331..7bef611e60 100755 --- a/mod/scorm/index.php +++ b/mod/scorm/index.php @@ -1,10 +1,12 @@ -set_url(new moodle_url($CFG->wwwroot.'/mod/scorm/index.php', array('id'=>$id))); + if (!empty($id)) { if (!$course = $DB->get_record('course', array('id'=>$id))) { print_error('invalidcourseid'); diff --git a/mod/scorm/loadSCO.php b/mod/scorm/loadSCO.php index df4343ca73..f15cc7e428 100755 --- a/mod/scorm/loadSCO.php +++ b/mod/scorm/loadSCO.php @@ -1,4 +1,4 @@ -set_url(new moodle_url($CFG->wwwroot.'/mod/scorm/loadSCO.php', array('scoid'=>$scoid, 'id'=>$cm->id))); + require_login($course->id, false, $cm); //check if scorm closed diff --git a/mod/scorm/loaddatamodel.php b/mod/scorm/loaddatamodel.php index e0548c546a..e4e0e1395e 100644 --- a/mod/scorm/loaddatamodel.php +++ b/mod/scorm/loaddatamodel.php @@ -33,6 +33,12 @@ print_error('missingparameter'); } + $url = new moodle_url($CFG->wwwroot.'/mod/scorm/loaddatamodel.php', array('scoid'=>$scoid, 'id'=>$cm->id,'attempt'=>$attempt)); + if ($mode !== '') { + $url->param('mode', $mode); + } + $PAGE->set_url($url); + require_login($course, false, $cm); if ($usertrack = scorm_get_tracks($scoid,$USER->id,$attempt)) { diff --git a/mod/scorm/player.php b/mod/scorm/player.php index 5419d3daea..68e95f2d21 100755 --- a/mod/scorm/player.php +++ b/mod/scorm/player.php @@ -1,4 +1,4 @@ -wwwroot.'/mod/scorm/player.php', array('scoid'=>$scoid, 'id'=>$cm->id)); + if ($mode !== 'normal') { + $url->param('mode', $mode); + } + if ($currentorg !== '') { + $url->param('currentorg', $currentorg); + } + if ($newattempt !== 'off') { + $url->param('newattempt', $newattempt); + } + $PAGE->set_url($url); + require_login($course->id, false, $cm); $strscorms = get_string('modulenameplural', 'scorm'); @@ -59,7 +71,7 @@ $PAGE->set_title($pagetitle); $PAGE->set_heading($course->fullname); $PAGE->navbar->add(format_string($scorm->name,true), new moodle_url($CFG->wwwroot.'/mode/scorm/view.php', array('id'=>$cm->id))); - $PAGE->set_button(update_module_button($cm->id, $course->id, $strscorm)); + $PAGE->set_button($OUTPUT->update_module_button($cm->id, 'scorm')); if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_COURSE,$course->id))) { echo $OUTPUT->header(); @@ -145,7 +157,7 @@ $exitlink = ''.$strexit.' '; - $PAGE->set_button($exitlink.update_module_button($cm->id, $course->id, $strscorm)); + $PAGE->set_button($exitlink.$OUTPUT->update_module_button($cm->id, 'scorm')); echo $PAGE->requires->data_for_js('scormplayerdata', Array('cwidth'=>$scorm->width,'cheight'=>$scorm->height))->in_head(); echo $PAGE->requires->js('mod/scorm/request.js')->in_head(); @@ -307,10 +319,10 @@ wwwroot.'/mod/scorm/loadSCO.php?id='.$cm->id.$scoidstr.$modestr.'" target="new">'.get_string('popupblockedlinkname','scorm').''; - print_simple_box(get_string('popupblocked','scorm',$link),'center'); + echo $OUTPUT->box(get_string('popupblocked','scorm',$link)); } } else { - print_simple_box(get_string('noprerequisites','scorm'),'center'); + echo $OUTPUT->box(get_string('noprerequisites','scorm')); } ?> diff --git a/mod/scorm/report.php b/mod/scorm/report.php index e7ebebccac..967a05992d 100755 --- a/mod/scorm/report.php +++ b/mod/scorm/report.php @@ -1,4 +1,4 @@ -wwwroot.'/mod/scorm/report.php'); + if ($user !== '') { + $url->param('user', $user); + } + if ($attempt !== '1') { + $url->param('attempt', $attempt); + } + if ($action !== '') { + $url->param('action', $action); + } + if (!empty($id)) { + $url->param('id', $id); if (! $cm = get_coursemodule_from_id('scorm', $id)) { print_error('invalidcoursemodule'); } @@ -25,12 +37,14 @@ } } else { if (!empty($b)) { + $url->param('b', $b); if (! $sco = $DB->get_record('scorm_scoes', array('id'=>$b))) { print_error('invalidactivity', 'scorm'); } $a = $sco->scorm; } if (!empty($a)) { + $url->param('a', $a); if (! $scorm = $DB->get_record('scorm', array('id'=>$a))) { print_error('invalidcoursemodule'); } @@ -42,6 +56,7 @@ } } } + $PAGE->set_url($url); require_login($course->id, false, $cm); diff --git a/mod/scorm/view.php b/mod/scorm/view.php index a6bc100563..84081aa9fd 100755 --- a/mod/scorm/view.php +++ b/mod/scorm/view.php @@ -1,4 +1,4 @@ -wwwroot.'/mod/scorm/view.php', array('id'=>$cm->id)); + if ($organization !== '') { + $url->param('organization', $organization); + } + $PAGE->set_url($url); + require_login($course->id, false, $cm); $context = get_context_instance(CONTEXT_COURSE, $course->id); @@ -55,7 +61,7 @@ // $PAGE->set_title($pagetitle); $PAGE->set_heading($course->fullname); - $PAGE->set_button(update_module_button($cm->id, $course->id, $strscorm)); + $PAGE->set_button($OUTPUT->update_module_button($cm->id, 'scorm')); echo $OUTPUT->header(); if (has_capability('mod/scorm:viewreport', $context)) { -- 2.39.5