From a6e5c89237b2e2b30294563c3dbf381a0b90d9f2 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Thu, 12 Jun 2003 12:00:15 +0000
Subject: [PATCH] Changes to includes to make it more robust on different
 versions of PHP while remaining secure

---
 mod/quiz/format/aon.php         | 2 +-
 mod/quiz/format/blackboard.php  | 4 +++-
 mod/quiz/format/custom.php      | 2 +-
 mod/quiz/format/default.php     | 1 +
 mod/quiz/format/missingword.php | 2 +-
 mod/quiz/format/qti.php         | 2 +-
 mod/quiz/format/webct.php       | 2 +-
 mod/quiz/import.php             | 1 +
 8 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mod/quiz/format/aon.php b/mod/quiz/format/aon.php
index 2f29092312..49bac2d662 100644
--- a/mod/quiz/format/aon.php
+++ b/mod/quiz/format/aon.php
@@ -20,7 +20,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////
 
-require("default.php");
+// Based on default.php, included by ../import.php
 
 class quiz_file_format extends quiz_default_format {
 
diff --git a/mod/quiz/format/blackboard.php b/mod/quiz/format/blackboard.php
index 66019c57ac..26cf627d82 100644
--- a/mod/quiz/format/blackboard.php
+++ b/mod/quiz/format/blackboard.php
@@ -6,7 +6,9 @@
 ///
 ///
 ////////////////////////////////////////////////////////////////////////////
-require ("default.php");
+
+// Based on default.php, included by ../import.php
+
 require_once ("$CFG->libdir/xmlize.php");
 
 class quiz_file_format extends quiz_default_format {
diff --git a/mod/quiz/format/custom.php b/mod/quiz/format/custom.php
index a8994465f8..05ed991b15 100644
--- a/mod/quiz/format/custom.php
+++ b/mod/quiz/format/custom.php
@@ -14,7 +14,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////
 
-require("default.php");
+// Based on default.php, included by ../import.php
 
 class quiz_file_format extends quiz_default_format {
 
diff --git a/mod/quiz/format/default.php b/mod/quiz/format/default.php
index f6289422a4..6666d71325 100644
--- a/mod/quiz/format/default.php
+++ b/mod/quiz/format/default.php
@@ -6,6 +6,7 @@
 /// Doesn't do everything on it's own -- it needs to be extended. //
 ////////////////////////////////////////////////////////////////////
 
+// Included by ../import.php
 
 class quiz_default_format {
 
diff --git a/mod/quiz/format/missingword.php b/mod/quiz/format/missingword.php
index 786960e348..14d3de825f 100644
--- a/mod/quiz/format/missingword.php
+++ b/mod/quiz/format/missingword.php
@@ -24,7 +24,7 @@
 ///
 ////////////////////////////////////////////////////////////////////////////
 
-require("default.php");
+// Based on default.php, included by ../import.php
 
 class quiz_file_format extends quiz_default_format {
 
diff --git a/mod/quiz/format/qti.php b/mod/quiz/format/qti.php
index a069297595..46bdfeec06 100644
--- a/mod/quiz/format/qti.php
+++ b/mod/quiz/format/qti.php
@@ -4,7 +4,7 @@
 /// IMS QTI FORMAT
 ////////////////////////////////////////////////////////////////////////////
 
-require("default.php");
+// Based on default.php, included by ../import.php
 
 class quiz_file_format extends quiz_default_format {
 
diff --git a/mod/quiz/format/webct.php b/mod/quiz/format/webct.php
index c19999e1fe..e0f506c214 100644
--- a/mod/quiz/format/webct.php
+++ b/mod/quiz/format/webct.php
@@ -4,7 +4,7 @@
 /// WEBCT FORMAT
 ////////////////////////////////////////////////////////////////////////////
 
-require("default.php");
+// Based on default.php, included by ../import.php
 
 class quiz_file_format extends quiz_default_format {
 
diff --git a/mod/quiz/import.php b/mod/quiz/import.php
index 43d70926e2..a723156b86 100644
--- a/mod/quiz/import.php
+++ b/mod/quiz/import.php
@@ -47,6 +47,7 @@
                 error("Format not known ($form->format)");
             }
 
+            require("format/default.php");  // Parent class
             require("format/$form->format".".php");
 
             $format = new quiz_file_format();
-- 
2.39.5