mod-scorm MDL-19815 Added set_url calls, replaced deprecated functions

diff --git a/mod/scorm/aicc.php b/mod/scorm/aicc.php
index 0f46d6c228135b876b39a5250e88027918408e32..e7d91b960941a9c4a7ecfbdb6faa77f31d7fe084 100755 (executable)
--- 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 15781f5f70c09dcf4f14e5b9f0c429144658daab..ab462de72214c1fffa803432c7bbc601028e5c8f 100755 (executable)
--- 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 b0dc915331a151f8637425bd8698ad383030c2e6..7bef611e607825d9f46da5591c82807a504e0591 100755 (executable)
--- a/mod/scorm/index.php
+++ b/mod/scorm/index.php
@@ -1,10 +1,12 @@
-<?php // $Id$
+<?php
 
     require_once("../../config.php");
     require_once("locallib.php");
 
     $id = required_param('id', PARAM_INT);   // course id
 
+    $PAGE->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 df4343ca732a99d1760819fe44422f09d70847b1..f15cc7e428f750d67018a2247f86e399dacdd6dc 100755 (executable)
--- a/mod/scorm/loadSCO.php
+++ b/mod/scorm/loadSCO.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
     require_once('../../config.php');
     require_once('locallib.php');
 
@@ -32,6 +32,8 @@
         print_error('missingparameter');
     }
 
+    $PAGE->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 e0548c546ad62881aade670da75756cf4f1ef154..e4e0e1395e1e337f1f08b34737b26a3e7b172b85 100644 (file)
--- 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 5419d3daeaaeb87bf01f862fabcdd233bf198b8a..68e95f2d218fbe0d6637fa8194e95133801689cf 100755 (executable)
--- a/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@ -1,4 +1,4 @@
-<?PHP  // $Id$
+<?PHP
 
 /// This page prints a particular instance of aicc/scorm package
 
@@ -38,6 +38,18 @@
         print_error('missingparameter');
     }
 
+    $url = new moodle_url($CFG->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 = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$scorm->course.'" title="'.$strexit.'">'.$strexit.'</a> ';
 
-    $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 @@
 <?php
             //Added incase javascript popups are blocked
             $link = '<a href="'.$CFG->wwwroot.'/mod/scorm/loadSCO.php?id='.$cm->id.$scoidstr.$modestr.'" target="new">'.get_string('popupblockedlinkname','scorm').'</a>';
-            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'));
     }
 ?>
             </div> <!-- SCORM object -->

diff --git a/mod/scorm/report.php b/mod/scorm/report.php
index e7ebebccac1293476b40392d668d7929f29fefa4..967a05992d01fe37ac2d813e81e20cee27084377 100755 (executable)
--- a/mod/scorm/report.php
+++ b/mod/scorm/report.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 
 // This script uses installed report plugins to print quiz reports
 
@@ -13,7 +13,19 @@
     $action     = optional_param('action', '', PARAM_ALPHA);
     $attemptids = optional_param('attemptid', array(), PARAM_RAW); //get array of responses to delete.
 
+    $url = new moodle_url($CFG->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 a6bc100563926a570049285eeb0a9696d27d4e52..84081aa9fd2f3a3d453bdd9745565376836e6c95 100755 (executable)
--- a/mod/scorm/view.php
+++ b/mod/scorm/view.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 
     require_once("../../config.php");
     require_once('locallib.php');
@@ -31,6 +31,12 @@
         print_error('missingparameter');
     }
 
+    $url = new moodle_url($CFG->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)) {