Changes to includes to make it more robust on different versions of PHP

while remaining secure

diff --git a/mod/quiz/format/aon.php b/mod/quiz/format/aon.php
index 2f290923120b45892cdec3241de5236967fb4a35..49bac2d66298df7163a2526c9a854e6aae7e14b7 100644 (file)
--- 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 66019c57ac5c4ae56ced2e398da3ed0bcdc63ece..26cf627d82c53c326e2b8eb59c55148939a46f10 100644 (file)
--- 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 a8994465f857d86d06f98737bc05cd2c8f8e7bf3..05ed991b1530ad150ef13370e5f2f31ea65989c6 100644 (file)
--- 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 f6289422a4c90f9a0630289af5312c046e1640a3..6666d71325f6475595bd9c8627c3f8df8d9889d4 100644 (file)
--- 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 786960e3481d773f3d29f2c1ae5ac9b88a40cc55..14d3de825f244d12e13ed6992750c3ef0e2f59d2 100644 (file)
--- 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 a0692975954f48175a78363c19f0276352f17211..46bdfeec06aa84f1a9f3de40e26854bd60f7326f 100644 (file)
--- 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 c19999e1fe47acc45edda630462ad4a3b4872b74..e0f506c2145e3f3397d639940d71707419593ddb 100644 (file)
--- 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 43d70926e295809710a47dbc26a1d0456b171384..a723156b86bf209fe0c13d88bc78c2a3751658a6 100644 (file)
--- 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();