Merging fixes from stable

diff --git a/mod/exercise/assessments.php b/mod/exercise/assessments.php
index 3c26c19728b34ca2eed9ead172737641e07e99b3..52490efb81600dcff65fa49202e8d549e87b3d0e 100644 (file)
--- a/mod/exercise/assessments.php
+++ b/mod/exercise/assessments.php
@@ -28,11 +28,11 @@
 
 ************************************************/
 
-    require("../../config.php");
-    require("lib.php");
-    require("locallib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
+    require_once("locallib.php");
 
-    require_variable($id);    // Course Module ID
+    $id = required_param('id', PARAM_INT);    // Course Module ID
 
     // get some esential stuff...
     if (! $cm = get_record("course_modules", "id", $id)) {
@@ -62,7 +62,7 @@
                   "", "", true);
 
     //...get the action
-    require_variable($action);
+    $action = required_param('action');
 
 
     /******************* admin amend Grading Grade ************************************/
@@ -174,7 +174,7 @@
     /****************** Assess resubmission (by teacher) ***************************/
     elseif ($action == 'assessresubmission') {
 
-        require_variable($sid);
+        $sid = required_param('sid');
 
         if (! $submission = get_record("exercise_submissions", "id", $sid)) {
             error("Assess submission is misconfigured - no submission record!");
@@ -212,7 +212,7 @@
     /****************** Assess submission (by teacher or student) ***************************/
     elseif ($action == 'assesssubmission') {
 
-        require_variable($sid);
+        $sid = required_param('sid');
 
         if (! $submission = get_record("exercise_submissions", "id", $sid)) {
             error("Assess submission is misconfigured - no submission record!");
@@ -633,8 +633,8 @@
             error("Only teachers can look at this page");
         }
 
-        require_variable($aid);
-        require_variable($sid);
+        $aid = required_param('aid', PARAM_INT);
+        $sid = required_param('sid', PARAM_INT);
         if (!$assessment = get_record("exercise_assessments", "id", $aid)) {
             error("Teacher assessment: User's assessment record not found");
         }
@@ -663,7 +663,7 @@
         $timenow = time();
         $form = data_submitted();
 
-        require_variable($aid);
+        $aid = required_param('aid', PARAM_INT);
         if (! $assessment = get_record("exercise_assessments", "id", $aid)) {
             error("exercise assessment is misconfigured");
         }
@@ -1089,7 +1089,7 @@
             error("Only teachers can look at this page");
             }
 
-        require_variable($aid);
+        $aid = required_param('aid', PARAM_INT);        
         // normalise gradinggrade
         $gradinggrade = $_POST['gradinggrade'] * 100 / $exercise->gradinggrade;
         if (!set_field("exercise_assessments", "gradinggrade", $gradinggrade, "id",

diff --git a/mod/exercise/index.php b/mod/exercise/index.php
index 9c6bea6569a9fa3dee7f95978d531d9cd98dddd9..28e55acdf8de5cadbacbbc04e885da74a8b57bd7 100644 (file)
--- a/mod/exercise/index.php
+++ b/mod/exercise/index.php
@@ -1,10 +1,10 @@
 <?php // $Id$
 
-    require("../../config.php");
-    require("lib.php");
-    require("locallib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
+    require_once("locallib.php");
 
-    require_variable($id);   // course
+    $id = required_param('id', PARAM_INT); // course
 
     if (! $course = get_record("course", "id", $id)) {
         error("Course ID is incorrect");

diff --git a/mod/exercise/submissions.php b/mod/exercise/submissions.php
index aa1fd8c11a1e0c779fe1a72e57c0451c69724603..2e5d536fef4783a129ea24ce112b3895e8972e92 100644 (file)
--- a/mod/exercise/submissions.php
+++ b/mod/exercise/submissions.php
@@ -19,12 +19,12 @@
 
 ************************************************/
 
-    require("../../config.php");
-    require("lib.php");
-    require("locallib.php");
-    require("version.php");
+    require_once("../../config.php");
+    require_once("lib.php");
+    require_once("locallib.php");
+    require_once("version.php");
 
-    require_variable($id);    // Course Module ID
+    $id = required_param('id', PARAM_INT); // Course Module ID
 
     // get some essential stuff...
     if (! $cm = get_record("course_modules", "id", $id)) {
@@ -52,7 +52,7 @@
                   "", "", true);
 
     //...get the action!
-    require_variable($action);
+    $action = required_param('action');
 
 
     /******************* admin amend title ************************************/

diff --git a/mod/exercise/upload.php b/mod/exercise/upload.php
index 09a2a50edcbefe0a4d02e7a574b0cbd23fdeb9d9..9dacfa8ea0cde6fb1a45a2a62a9d002b10dd0ae3 100644 (file)
--- a/mod/exercise/upload.php
+++ b/mod/exercise/upload.php
@@ -1,10 +1,10 @@
 <?php  // $Id: upload.php, v1.0 30th April 2003
 
-    require("../../config.php");
-    require("lib.php");
-    require("locallib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
+    require_once("locallib.php");
 
-    require_variable($id);          // course module ID
+    $id = required_param('id', PARAM_INT);           // course module ID
     $timenow = time();
 
     // get some esential stuff...

diff --git a/mod/exercise/view.php b/mod/exercise/view.php
index 6242b21820a71a4c02ecc80c80775e8de1d7d5e5..9359112c947045f745aaa16ec37a4348689d6cd5 100644 (file)
--- a/mod/exercise/view.php
+++ b/mod/exercise/view.php
@@ -15,9 +15,9 @@
 
 ************************************************/
 
-    require("../../config.php");
-    require("lib.php");
-    require("locallib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
+    require_once("locallib.php");
 
     $id = required_param('id', PARAM_INT);    // Course Module ID