From 1270a3a7ed06d54fff01bc210bb14f5fea386702 Mon Sep 17 00:00:00 2001
From: thepurpleblob <thepurpleblob>
Date: Thu, 16 Jun 2005 10:15:02 +0000
Subject: [PATCH] Replaced _variable() style calls with _param() style calls
 plus other mods to suit.

---
 mod/label/index.php                            | 2 +-
 mod/label/view.php                             | 4 ++--
 mod/resource/fetch.php                         | 4 ++--
 mod/resource/index.php                         | 2 +-
 mod/resource/type/directory/resource.class.php | 4 ++--
 mod/resource/type/html/resource.class.php      | 3 ++-
 mod/resource/type/text/resource.class.php      | 3 ++-
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/mod/label/index.php b/mod/label/index.php
index 0141b614cd0..523c08930f0 100644
--- a/mod/label/index.php
+++ b/mod/label/index.php
@@ -3,7 +3,7 @@
     require_once("../../config.php");
     require_once("lib.php");
 
-    require_variable($id);   // course
+    $id = require_param('id',PARAM_INT);   // course
 
     redirect("$CFG->wwwroot/course/view.php?id=$id");
 
diff --git a/mod/label/view.php b/mod/label/view.php
index 683275aee2e..95c6e5dd65e 100644
--- a/mod/label/view.php
+++ b/mod/label/view.php
@@ -2,8 +2,8 @@
 
     require_once("../../config.php");
 
-    optional_variable($id);    // Course Module ID, or
-    optional_variable($l);     // Label ID
+    $id = optional_param('id',0,PARAM_INT);    // Course Module ID, or
+    $l = optional_param('l',0,PARAM_INT);     // Label ID
 
     if ($id) {
         if (! $cm = get_record("course_modules", "id", $id)) {
diff --git a/mod/resource/fetch.php b/mod/resource/fetch.php
index da82f9d2e69..9d4e4fef626 100644
--- a/mod/resource/fetch.php
+++ b/mod/resource/fetch.php
@@ -4,8 +4,8 @@
     require_once("../../config.php");
     require_once("lib.php");
 
-    require_variable($id);     // Course Module ID
-    require_variable($url);    // url to fetch
+    $id = required_param('id',0,PARAM_INT);     // Course Module ID
+    $url = required_param('url');    // url to fetch
 
     if (! $cm = get_record("course_modules", "id", $id)) {
         error("Course Module ID was incorrect");
diff --git a/mod/resource/index.php b/mod/resource/index.php
index 2387a8af311..6a1771a76b3 100644
--- a/mod/resource/index.php
+++ b/mod/resource/index.php
@@ -2,7 +2,7 @@
 
     require_once("../../config.php");
 
-    require_variable($id);   // course
+    $id = required_param( 'id', 0, PARAM_INT ); // course
 
     if (!empty($CFG->forcelogin)) {
         require_login();
diff --git a/mod/resource/type/directory/resource.class.php b/mod/resource/type/directory/resource.class.php
index 1b42667f067..f2d0b0d1853 100644
--- a/mod/resource/type/directory/resource.class.php
+++ b/mod/resource/type/directory/resource.class.php
@@ -19,8 +19,8 @@ function display() {
     $resource = $this->resource; 
 
     require_once($CFG->libdir.'/filelib.php');
- 
-    $subdir = isset($_GET['subdir']) ? $_GET['subdir'] : '';
+
+    $subdir = optional_param( 'subdir','' ); 
 
     add_to_log($course->id, "resource", "view", "view.php?id={$cm->id}", $resource->id, $cm->id);
 
diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
index 518734d9c27..7c922587525 100644
--- a/mod/resource/type/html/resource.class.php
+++ b/mod/resource/type/html/resource.class.php
@@ -89,7 +89,8 @@ function display() {
 
     $pagetitle = strip_tags($course->shortname.': '.format_string($resource->name));
     $formatoptions->noclean = true;
-    $inpopup = !empty($_GET["inpopup"]);
+    $inpopup_param = optional_param( 'inpopup','' );
+    $inpopup = !empty($inpopup_param);
 
     if ($resource->popup) {
         if ($inpopup) {                    /// Popup only
diff --git a/mod/resource/type/text/resource.class.php b/mod/resource/type/text/resource.class.php
index cbeb7e8b029..3f7ce76c23d 100644
--- a/mod/resource/type/text/resource.class.php
+++ b/mod/resource/type/text/resource.class.php
@@ -87,7 +87,8 @@ function display() {
 
     $pagetitle = strip_tags($course->shortname.': '.format_string($resource->name));
     $formatoptions->noclean = true;
-    $inpopup = !empty($_GET["inpopup"]);
+    $inpopup_param = optional_param( 'inpopup', '' );
+    $inpopup = !empty($inpopup_param);
 
     if ($resource->popup) {
         if ($inpopup) {                    /// Popup only