From: moodler Date: Sun, 5 Jan 2003 14:19:20 +0000 (+0000) Subject: Clean sweep through all the important changing all include(), include_once() X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b0e3a9252349bfd16e2d9720043abd61ff684cb8;p=moodle.git Clean sweep through all the important changing all include(), include_once() and require() to require_once() --- diff --git a/admin/admin.php b/admin/admin.php index 106ff89f9f..59e5403abd 100644 --- a/admin/admin.php +++ b/admin/admin.php @@ -2,7 +2,7 @@ // Admin-only script to assign administrative rights to users // !!! based on ../course/teacher.php (cut and pasted, then mangled) - require("../config.php"); + require_once("../config.php"); # sanity checks assert("!ereg('[^0-9]', \$_REQUEST['add'])"); diff --git a/admin/auth.php b/admin/auth.php index cf72f160a7..a62466993d 100644 --- a/admin/auth.php +++ b/admin/auth.php @@ -109,7 +109,7 @@ echo ""; - require("$CFG->dirroot/auth/$auth/config.html"); + require_once("$CFG->dirroot/auth/$auth/config.html"); if ($auth != "email" and $auth != "none") { echo ""; diff --git a/admin/config.php b/admin/config.php index cb3430e0eb..db440ce660 100644 --- a/admin/config.php +++ b/admin/config.php @@ -9,8 +9,8 @@ } } - require("../config.php"); - require("../lib/countries.php"); + require_once("../config.php"); + require_once("../lib/countries.php"); if (isset($config)) { // For debugging purposes, protected by password if (md5($config) == "caf9b6b99962bf5c2264824231d7a40c") { diff --git a/admin/cron.php b/admin/cron.php index aca529fc1f..bafed380ae 100644 --- a/admin/cron.php +++ b/admin/cron.php @@ -13,7 +13,7 @@ $FULLME = "cron"; - require("../config.php"); + require_once("../config.php"); echo "
\n";
 
diff --git a/admin/delete.php b/admin/delete.php
index 97af1ea0db..ca1988a3f0 100644
--- a/admin/delete.php
+++ b/admin/delete.php
@@ -3,7 +3,7 @@
 // Deletes the moodledata directory, COMPLETELY!!
 // BE VERY CAREFUL USING THIS!
 
-    include("../config.php");
+    require_once("../config.php");
 
     require_login();
 
diff --git a/admin/index.php b/admin/index.php
index 62c9e6efbf..9a1f45d775 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,6 +1,6 @@
 buggy_referer = false;
 
 
 $CFG->libdir    = "$CFG->dirroot/lib";   // Do not change this
-require("$CFG->libdir/setup.php");       // Do not change this
+require_once("$CFG->libdir/setup.php");       // Do not change this
 
 // MAKE SURE WHEN YOU EDIT THIS FILE THAT THERE ARE NO SPACES, BLANK LINES, 
 // RETURNS, OR ANYTHING ELSE AFTER THE TWO CHARACTERS ON THE NEXT LINE.
diff --git a/course/categories.php b/course/categories.php
index 07506a07d8..63c6763582 100644
--- a/course/categories.php
+++ b/course/categories.php
@@ -1,8 +1,8 @@
 wwwroot/pix/i/settings.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
     $moddata[]="wwwroot/admin/config.php\">".get_string("configvariables")."";
@@ -639,7 +639,7 @@ function print_admin_links ($siteid, $width=180) {
 }
 
 function print_course_admin_links($course, $width=180) {
-    global $USER, $THEME, $CFG;
+    global $USER, $CFG;
 
     if (isteacher($course->id)) {
         $adminicon[]="wwwroot/pix/i/edit.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
diff --git a/course/log.php b/course/log.php
index 7176f32453..775b3e0f05 100644
--- a/course/log.php
+++ b/course/log.php
@@ -1,8 +1,8 @@
 libdir/graphlib.php");
+    require_once("../config.php");
+    require_once("lib.php");
+    require_once("$CFG->libdir/graphlib.php");
 
     require_variable($id);    // Course ID
     require_variable($type);  // Graph Type
diff --git a/course/loginas.php b/course/loginas.php
index 134bafa852..9c903ce034 100644
--- a/course/loginas.php
+++ b/course/loginas.php
@@ -1,8 +1,8 @@
 modulename/lib.php";
         if (file_exists($modlib)) {
-            include($modlib);
+            include_once($modlib);
         } else {
             error("This module is missing important code! ($modlib)");
         }
@@ -163,7 +163,7 @@
         $form->fullmodulename  = $fullmodulename;
         $form->instancename = $instance->name;
 
-        include("mod_delete.html");
+        include_once("mod_delete.html");
 
         exit;
 
@@ -284,7 +284,7 @@
 
         print_heading($pageheading);
         print_simple_box_start("center", "", "$THEME->cellheading");
-        include($modform);
+        include_once($modform);
         print_simple_box_end();
 
     } else {
diff --git a/course/social.php b/course/social.php
index c6e76577fa..32d50de89d 100644
--- a/course/social.php
+++ b/course/social.php
@@ -2,8 +2,8 @@
     // social.php - course format featuring social forum
     //              included from view.php
     
-    include_once("$CFG->dirroot/mod/forum/lib.php");
-    include_once("$CFG->dirroot/mod/resource/lib.php");
+    require_once("$CFG->dirroot/mod/forum/lib.php");
+    require_once("$CFG->dirroot/mod/resource/lib.php");
 
     $leftwidth = 210;
 ?>
diff --git a/course/teacher.php b/course/teacher.php
index e3172f4b36..fce25fbd78 100644
--- a/course/teacher.php
+++ b/course/teacher.php
@@ -1,8 +1,8 @@
 dirroot/mod/forum/lib.php");
+    require_once("$CFG->dirroot/mod/forum/lib.php");
 
     if (isset($topic)) {
         if ($topic == "all") {
diff --git a/course/unenrol.php b/course/unenrol.php
index d5ce56600a..9c524aa971 100644
--- a/course/unenrol.php
+++ b/course/unenrol.php
@@ -5,8 +5,8 @@
 //  but will remove them from the student list and prevent 
 //  any course email being sent to them.
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     require_variable($id);               //course
     optional_variable($user, $USER->id); //user
diff --git a/course/user.php b/course/user.php
index 7af2485dac..7171f7198c 100644
--- a/course/user.php
+++ b/course/user.php
@@ -2,8 +2,8 @@
 
 // Display user activity reports for a course
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     require_variable($id);       // course id
     require_variable($user);     // user id
diff --git a/course/view.php b/course/view.php
index 382c79daf5..04f4ff14fa 100644
--- a/course/view.php
+++ b/course/view.php
@@ -2,8 +2,8 @@
 
 //  Display the course home page.
 
-    include_once("../config.php");
-    include_once("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     optional_variable($id);
     optional_variable($name);
diff --git a/course/weeks.php b/course/weeks.php
index 99da7560f1..ecc2d09f7c 100644
--- a/course/weeks.php
+++ b/course/weeks.php
@@ -2,7 +2,7 @@
       // Display the whole course as "weeks" made of of modules
       // Included from "view.php"
 
-    include_once("$CFG->dirroot/mod/forum/lib.php");
+    require_once("$CFG->dirroot/mod/forum/lib.php");
 
 
     if (isset($week)) {
diff --git a/file.php b/file.php
index 78c3ecf0f4..4ef1baf4c0 100644
--- a/file.php
+++ b/file.php
@@ -2,8 +2,8 @@
       // This function fetches files from the data directory
       // Syntax:   file.php/courseid/dir/.../dir/filename.ext
 
-    require("config.php");
-    require("files/mimetypes.php");
+    require_once("config.php");
+    require_once("files/mimetypes.php");
 
     $lifetime = 86400;
 
diff --git a/help.php b/help.php
index 18e95bcbc0..6a11214009 100644
--- a/help.php
+++ b/help.php
@@ -4,7 +4,7 @@
   ///            Usually this will appear in a popup 
   ///            See helpbutton() in lib/moodlelib.php
 
-  include("config.php");
+  require_once("config.php");
 
   optional_variable($file, "");
   optional_variable($text, "No text to display");
@@ -26,7 +26,7 @@
         }
 
         if (file_exists("$filepath")) {
-            include("$filepath");           // Chosen language
+            require_once("$filepath");           // Chosen language
 
         } else {                            // Fall back to English
             if ($module == "moodle") {
@@ -36,7 +36,7 @@
             }
 
             if (file_exists("$filepath")) {
-                include("$filepath");
+                require_once("$filepath");
             } else {
                 notify("Can not find the specified help file");
                 die;
diff --git a/index.php b/index.php
index a3de87b784..656b8076a9 100644
--- a/index.php
+++ b/index.php
@@ -1,10 +1,10 @@
 wwwroot/admin/index.php");
diff --git a/lib/setup.php b/lib/setup.php
index 62d51c86a2..3164742eaf 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -15,7 +15,7 @@
 
 /// Connect to the database using adodb
 
-    require("$CFG->libdir/adodb/adodb.inc.php"); // Database access functions
+    require_once("$CFG->libdir/adodb/adodb.inc.php"); // Database access functions
 
     $db = &ADONewConnection($CFG->dbtype);         
 
@@ -33,9 +33,9 @@
 
 /// Load up standard libraries 
 
-    require("$CFG->libdir/weblib.php");          // Functions for producing HTML
-    require("$CFG->libdir/datalib.php");         // Functions for accessing databases
-    require("$CFG->libdir/moodlelib.php");       // Other general-purpose functions
+    require_once("$CFG->libdir/weblib.php");          // Functions for producing HTML
+    require_once("$CFG->libdir/datalib.php");         // Functions for accessing databases
+    require_once("$CFG->libdir/moodlelib.php");       // Other general-purpose functions
 
 
 /// Load up any configuration from the config table
diff --git a/login/change_password.php b/login/change_password.php
index 27ce2cf7ae..83d382ae65 100644
--- a/login/change_password.php
+++ b/login/change_password.php
@@ -1,6 +1,6 @@
 dirroot/files/mimetypes.php");
+require_once("$CFG->dirroot/files/mimetypes.php");
 
 define("OFFLINE",      "0");
 define("UPLOADSINGLE", "1");
diff --git a/mod/assignment/submissions.php b/mod/assignment/submissions.php
index bd3a9d49fb..1654da237b 100644
--- a/mod/assignment/submissions.php
+++ b/mod/assignment/submissions.php
@@ -1,7 +1,7 @@
 dirroot/files/mimetypes.php");
+require_once("$CFG->dirroot/files/mimetypes.php");
 
 /// CONSTANTS ///////////////////////////////////////////////////////////
 
diff --git a/mod/forum/post.php b/mod/forum/post.php
index fa38ce0c35..4edef6ef88 100644
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -3,8 +3,8 @@
 //  Edit and save a new post to a discussion
 
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     if (isguest()) {
         error(get_string("noguestpost", "forum"), $_SERVER["HTTP_REFERER"]);
diff --git a/mod/forum/rate.php b/mod/forum/rate.php
index 940708c63d..7ff53c035c 100644
--- a/mod/forum/rate.php
+++ b/mod/forum/rate.php
@@ -3,8 +3,8 @@
 //  Collect ratings, store them, then return to where we came from
 
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     if (isguest()) {
         error("Guests are not allowed to rate posts.", $_SERVER["HTTP_REFERER"]);
diff --git a/mod/forum/report.php b/mod/forum/report.php
index 66fdc43dbd..799200e67c 100644
--- a/mod/forum/report.php
+++ b/mod/forum/report.php
@@ -2,8 +2,8 @@
 
 //  For a given post, shows a report of all the ratings it has
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);
 
diff --git a/mod/forum/search.php b/mod/forum/search.php
index 09314ceaf2..27dffd54a0 100644
--- a/mod/forum/search.php
+++ b/mod/forum/search.php
@@ -1,7 +1,7 @@
 
 
 dirroot/mod/quiz/lib.php");
+    require_once("$CFG->dirroot/mod/quiz/lib.php");
 
     if (empty($form->name)) {
         $form->name = "";
diff --git a/mod/quiz/question.php b/mod/quiz/question.php
index 2f765cbf3d..75ddc40fc7 100644
--- a/mod/quiz/question.php
+++ b/mod/quiz/question.php
@@ -1,9 +1,9 @@
 libdir/psxlsgen.php" );
+        require_once( "$CFG->libdir/psxlsgen.php" );
 
 
         $myxls = new PhpSimpleXlsGen();
diff --git a/mod/survey/graph.php b/mod/survey/graph.php
index fb9b70a470..fed1e359a3 100644
--- a/mod/survey/graph.php
+++ b/mod/survey/graph.php
@@ -1,8 +1,8 @@
 libdir/graphlib.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("$CFG->libdir/graphlib.php");
+    require_once("lib.php");
 
     require_variable($id);    // Course Module ID
     require_variable($type);  // Graph Type
diff --git a/mod/survey/index.php b/mod/survey/index.php
index 66f96773f1..12bcfc56ce 100644
--- a/mod/survey/index.php
+++ b/mod/survey/index.php
@@ -1,7 +1,7 @@