From: tjhunt <tjhunt>
Date: Wed, 6 May 2009 09:13:16 +0000 (+0000)
Subject: blocklib: MDL-19010 always include blocklib in setup.php, stip includes elsewhere
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=93d4a373f90dc8fdbe9adaf4b3aebe12d54400c3;p=moodle.git

blocklib: MDL-19010 always include blocklib in setup.php, stip includes elsewhere
---

diff --git a/admin/block.php b/admin/block.php
index da61afcf70..4d42f742e1 100644
--- a/admin/block.php
+++ b/admin/block.php
@@ -4,7 +4,6 @@
 
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->libdir.'/blocklib.php');
 
     $blockid = required_param('block', PARAM_INT);
 
diff --git a/admin/blocks.php b/admin/blocks.php
index eccd748a5c..196d8382a0 100644
--- a/admin/blocks.php
+++ b/admin/blocks.php
@@ -4,7 +4,6 @@
 
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->libdir.'/blocklib.php');
     require_once($CFG->libdir.'/tablelib.php');
 
     admin_externalpage_setup('manageblocks');
diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index 49de84a268..f56d5b2bd7 100644
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -992,7 +992,6 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
     /// Check all blocks and load (or upgrade them if necessary)
     /// first old *.php update and then the new upgrade.php script
-    require_once("$CFG->dirroot/lib/blocklib.php");
     if ( $verbose > CLI_NO ) {
         print_heading(get_string('upgradingblocksplugin','install'),'',1);
     }
@@ -1053,7 +1052,6 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
     /// Set up the site
     if (! $site = get_site()) {
         // We are about to create the site "course"
-        require_once($CFG->libdir.'/blocklib.php');
 
         if ( ( $interactive == CLI_FULL ) || ($interactive == CLI_SEMI && ( (!isset($INSTALL['sitefullname'])) || (!isset($INSTALL['siteshortname'])) || (!isset($INSTALL['sitesummary'])) || (!isset($INSTALL['sitenewsitems'])) )) ) {
             console_write('siteinfo');
diff --git a/admin/cron.php b/admin/cron.php
index a06ad3d824..fcc2c003f1 100644
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -430,7 +430,6 @@
             include_once("$CFG->dirroot/backup/backup_scheduled.php");
             include_once("$CFG->dirroot/backup/backuplib.php");
             include_once("$CFG->dirroot/backup/lib.php");
-            require_once ("$CFG->libdir/blocklib.php");
             mtrace("Running backups if required...");
     
             if (! schedule_backup_cron()) {
diff --git a/admin/settings.php b/admin/settings.php
index ae239ed427..c823812b34 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -2,7 +2,6 @@
 
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/blocklib.php');
 
 $section = required_param('section', PARAM_SAFEDIR);
 $return = optional_param('return','', PARAM_ALPHA);
diff --git a/admin/stickyblocks.php b/admin/stickyblocks.php
index 8b9eaf07ae..644f13f1e4 100644
--- a/admin/stickyblocks.php
+++ b/admin/stickyblocks.php
@@ -3,7 +3,6 @@
     require_once('../config.php');
     require_once($CFG->dirroot.'/my/pagelib.php');
     require_once($CFG->dirroot.'/lib/pagelib.php');
-    require_once($CFG->dirroot.'/lib/blocklib.php');
 
     $pt  = optional_param('pt', null, PARAM_SAFEDIR); //alhanumeric and -
 
diff --git a/auth/cas/cas_ldap_sync_users.php b/auth/cas/cas_ldap_sync_users.php
index 9abc5fc095..15454bc7c2 100644
--- a/auth/cas/cas_ldap_sync_users.php
+++ b/auth/cas/cas_ldap_sync_users.php
@@ -32,7 +32,6 @@ define('NO_MOODLE_COOKIES', true);
 require_once(dirname(dirname(dirname(__FILE__))).'/config.php'); // global moodle config file.
 
 require_once($CFG->dirroot.'/course/lib.php');
-require_once($CFG->dirroot.'/lib/blocklib.php');
 require_once($CFG->dirroot.'/mod/resource/lib.php');
 require_once($CFG->dirroot.'/mod/forum/lib.php');
 require_once($CFG->dirroot.'/lib/moodlelib.php');
diff --git a/auth/db/auth_db_sync_users.php b/auth/db/auth_db_sync_users.php
index 8ed5de05bc..d6eb5e7c71 100644
--- a/auth/db/auth_db_sync_users.php
+++ b/auth/db/auth_db_sync_users.php
@@ -31,7 +31,6 @@ define('NO_MOODLE_COOKIES', true);
 
 require_once(dirname(dirname(dirname(__FILE__))).'/config.php'); // global moodle config file.
 
-require_once($CFG->libdir.'/blocklib.php');
 require_once($CFG->dirroot.'/course/lib.php');
 require_once($CFG->dirroot.'/mod/resource/lib.php');
 require_once($CFG->dirroot.'/mod/forum/lib.php');
diff --git a/auth/ldap/auth_ldap_sync_users.php b/auth/ldap/auth_ldap_sync_users.php
index 528d3556d7..22a38d50f7 100755
--- a/auth/ldap/auth_ldap_sync_users.php
+++ b/auth/ldap/auth_ldap_sync_users.php
@@ -30,7 +30,6 @@ define('NO_MOODLE_COOKIES', true);
 
 require_once(dirname(dirname(dirname(__FILE__))).'/config.php'); // global moodle config file.
 
-require_once($CFG->libdir.'/blocklib.php');
 require_once($CFG->dirroot.'/course/lib.php');
 require_once($CFG->dirroot.'/mod/resource/lib.php');
 require_once($CFG->dirroot.'/mod/forum/lib.php');
diff --git a/backup/backup.php b/backup/backup.php
index 3c969b4de1..ba02d5cf97 100644
--- a/backup/backup.php
+++ b/backup/backup.php
@@ -6,7 +6,6 @@
     require_once ("../config.php");
     require_once ("lib.php");
     require_once ("backuplib.php");
-    require_once ("$CFG->libdir/blocklib.php");
     require_once ("$CFG->libdir/adminlib.php");
 
     $id = optional_param( 'id' );       // course id
diff --git a/backup/restore.php b/backup/restore.php
index 19a3024782..5639776408 100644
--- a/backup/restore.php
+++ b/backup/restore.php
@@ -10,7 +10,6 @@
     require_once("lib.php");
     require_once("restorelib.php");
     require_once("bb/restore_bb.php");
-    require_once("$CFG->libdir/blocklib.php");
     require_once("$CFG->libdir/wiki_to_markdown.php" );
     require_once("$CFG->libdir/adminlib.php");
 
diff --git a/backup/try.php b/backup/try.php
index 98caa18974..46b5f82a3f 100644
--- a/backup/try.php
+++ b/backup/try.php
@@ -3,7 +3,6 @@
     require_once ("backup_scheduled.php");
     require_once ("lib.php");
     require_once ("backuplib.php");
-    require_once ("$CFG->libdir/blocklib.php");
 
     require_login();
 
diff --git a/blog/header.php b/blog/header.php
index bf663f1a46..6674a016de 100755
--- a/blog/header.php
+++ b/blog/header.php
@@ -3,9 +3,7 @@
 /// Sets up blocks and navigation for index.php
 
 require_once($CFG->dirroot .'/blog/lib.php');
-require_once($CFG->libdir .'/pagelib.php');
 require_once($CFG->dirroot .'/blog/blogpage.php');
-require_once($CFG->libdir .'/blocklib.php');
 require_once($CFG->dirroot .'/course/lib.php');
 
 $blockaction = optional_param('blockaction','', PARAM_ALPHA);
diff --git a/blog/index.php b/blog/index.php
index f06fadf0bf..a9f8b3a81c 100755
--- a/blog/index.php
+++ b/blog/index.php
@@ -8,7 +8,6 @@
 
 require_once('../config.php');
 require_once($CFG->dirroot .'/blog/lib.php');
-require_once($CFG->libdir .'/blocklib.php');
 
 $id           = optional_param('id', 0, PARAM_INT);
 $start        = optional_param('formstart', 0, PARAM_INT);
diff --git a/blog/lib.php b/blog/lib.php
index d23cd343cf..5c31eefa05 100755
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -3,8 +3,6 @@
     /**
      * Library of functions and constants for blog
      */
-    require_once($CFG->libdir .'/blocklib.php');
-    require_once($CFG->libdir .'/pagelib.php');
     require_once($CFG->dirroot .'/blog/rsslib.php');
     require_once($CFG->dirroot .'/blog/blogpage.php');
     require_once($CFG->dirroot.'/tag/lib.php');
diff --git a/course/edit.php b/course/edit.php
index 6961566f64..d680a13e1b 100644
--- a/course/edit.php
+++ b/course/edit.php
@@ -3,7 +3,6 @@
 
     require_once('../config.php');
     require_once($CFG->dirroot.'/enrol/enrol.class.php');
-    require_once($CFG->libdir.'/blocklib.php');
     require_once('lib.php');
     require_once('edit_form.php');
 
diff --git a/course/pending.php b/course/pending.php
index 2f0ef7cdb7..8da7765918 100644
--- a/course/pending.php
+++ b/course/pending.php
@@ -31,8 +31,6 @@
  *//** */
 
     require_once(dirname(__FILE__) . '/../config.php');
-    require_once($CFG->libdir . '/pagelib.php');
-    require_once($CFG->libdir . '/blocklib.php');
     require_once($CFG->libdir . '/adminlib.php');
     require_once($CFG->dirroot . '/course/lib.php');
     require_once($CFG->dirroot . '/course/request_form.php');
diff --git a/course/rest.php b/course/rest.php
index e2b79856e0..5e803eb1f1 100644
--- a/course/rest.php
+++ b/course/rest.php
@@ -3,9 +3,6 @@
 
 require_once('../config.php');
 require_once($CFG->dirroot.'/course/lib.php');
-require_once($CFG->libdir .'/pagelib.php');
-require_once($CFG->libdir .'/blocklib.php');
-
 
 // Initialise ALL the incoming parameters here, up front.
 $courseid   = required_param('courseId', PARAM_INT);
diff --git a/course/view.php b/course/view.php
index 274a6eecc1..d34ab666b1 100644
--- a/course/view.php
+++ b/course/view.php
@@ -4,8 +4,6 @@
 
     require_once('../config.php');
     require_once('lib.php');
-    require_once($CFG->libdir.'/blocklib.php');
-    require_once($CFG->libdir.'/ajax/ajaxlib.php');
     require_once($CFG->dirroot.'/mod/forum/lib.php');
 
     $id          = optional_param('id', 0, PARAM_INT);
diff --git a/enrol/database/enrol_database_sync.php b/enrol/database/enrol_database_sync.php
index f8efcf0314..df599c8fa9 100644
--- a/enrol/database/enrol_database_sync.php
+++ b/enrol/database/enrol_database_sync.php
@@ -9,8 +9,7 @@
     require_once(dirname(dirname(dirname(__FILE__))).'/config.php'); // global moodle config file.
 
     require_once($CFG->dirroot . '/course/lib.php');
-    require_once($CFG->dirroot . '/lib/blocklib.php');
-    require_once($CFG->dirroot . "/enrol/database/enrol.php");
+    require_once($CFG->dirroot . '/enrol/database/enrol.php');
 
     // ensure errors are well explained
     $CFG->debug=E_ALL;
diff --git a/enrol/imsenterprise/enrol.php b/enrol/imsenterprise/enrol.php
index 325814fa87..4277b3b16b 100644
--- a/enrol/imsenterprise/enrol.php
+++ b/enrol/imsenterprise/enrol.php
@@ -4,9 +4,7 @@
 * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
 * @package enrol_imsenterprise
 */
-require_once("$CFG->libdir/blocklib.php");
 require_once($CFG->dirroot.'/group/lib.php');
-require_once($CFG->libdir.'/eventslib.php');
 
 // The following flags are set in the configuration
 // $CFG->enrol_imsfilelocation:        where is the file we are looking for?
diff --git a/index.php b/index.php
index 277c102947..fde77f3e9e 100644
--- a/index.php
+++ b/index.php
@@ -32,7 +32,6 @@
 
     require_once('config.php');
     require_once($CFG->dirroot .'/course/lib.php');
-    require_once($CFG->libdir .'/blocklib.php');
     require_once($CFG->libdir .'/filelib.php');
 
     // Bounds for block widths
diff --git a/lib/accesslib.php b/lib/accesslib.php
index 0e5393f630..78bd17c02c 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -129,8 +129,6 @@
  * @package roles
  */
 
-require_once $CFG->dirroot.'/lib/blocklib.php';
-
 // permission definitions
 define('CAP_INHERIT', 0);
 define('CAP_ALLOW', 1);
diff --git a/lib/adminlib.php b/lib/adminlib.php
index 504df0e6ea..77c7700f54 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -3893,9 +3893,7 @@ class admin_setting_manageportfolio extends admin_setting {
  */
 function admin_externalpage_setup($section, $extrabutton = '',
         $extraurlparams = array(), $actualurl = '') {
-
     global $CFG, $PAGE, $USER;
-    require_once($CFG->libdir.'/blocklib.php');
 
     if ($site = get_site()) {
         require_login();
diff --git a/lib/blocklib.php b/lib/blocklib.php
index 78234b953e..cf8120b013 100644
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -44,7 +44,6 @@ define('BLOCKS_PINNED_FALSE',1);
 define('BLOCKS_PINNED_BOTH',2);
 
 require_once($CFG->libdir.'/pagelib.php');
-require_once($CFG->dirroot.'/course/lib.php'); // needed to solve all those: Call to undefined function: print_recent_activity() when adding Recent Activity
 
 //This function retrieves a method-defined property of a class WITHOUT instantiating an object
 function block_method_result($blockname, $method, $param = NULL) {
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 5e63ebc0ae..872124f58f 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3611,7 +3611,6 @@ function remove_course_contents($courseid, $showfeedback=true) {
                 notify($strdeleted .' block_instance_old');
             }
 
-            require_once($CFG->libdir.'/blocklib.php');
             foreach ($blocks as $block) {  /// Delete any associated contexts for this block
 
                 delete_context(CONTEXT_BLOCK, $block->id);
diff --git a/lib/setup.php b/lib/setup.php
index 5f0c5a4511..63790b75c9 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -171,12 +171,15 @@ global $SCRIPT;
 
 /// Load up standard libraries
     require_once($CFG->libdir .'/textlib.class.php');   // Functions to handle multibyte strings
+    require_once($CFG->libdir .'/filterlib.php');       // Functions for filtering test as it is output
+    require_once($CFG->libdir .'/ajax/ajaxlib.php');    // Functions for managing our use of JavaScript and YUI
     require_once($CFG->libdir .'/weblib.php');          // Functions for producing HTML
     require_once($CFG->libdir .'/dmllib.php');          // Database access
     require_once($CFG->libdir .'/datalib.php');         // Legacy lib with a big-mix of functions.
     require_once($CFG->libdir .'/accesslib.php');       // Access control functions
     require_once($CFG->libdir .'/deprecatedlib.php');   // Deprecated functions included for backward compatibility
     require_once($CFG->libdir .'/moodlelib.php');       // Other general-purpose functions
+    require_once($CFG->libdir .'/blocklib.php');        // Library for controlling blocks
     require_once($CFG->libdir .'/eventslib.php');       // Events functions
     require_once($CFG->libdir .'/grouplib.php');        // Groups functions
     require_once($CFG->libdir .'/sessionlib.php');      // All session and cookie related stuff
diff --git a/lib/simpletest/testpagelib_moodlepage.php b/lib/simpletest/testpagelib_moodlepage.php
index 4c69a8b0d2..b06cdbbd6e 100644
--- a/lib/simpletest/testpagelib_moodlepage.php
+++ b/lib/simpletest/testpagelib_moodlepage.php
@@ -24,8 +24,7 @@
 ///////////////////////////////////////////////////////////////////////////
 
 /**
- * Tests for the parts of ../filterlib.php that handle creating filter objects,
- * and using them to filter strings.
+ * Tests for the moodle_page class in ../pagelib.php.
  *
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  * @package moodlecore
diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index 25e25b76eb..bde8d91fa3 100644
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -443,7 +443,6 @@ function upgrade_plugins_modules($startcallback, $endcallback) {
 function upgrade_plugins_blocks($startcallback, $endcallback) {
     global $CFG, $DB;
 
-    require_once($CFG->libdir.'/blocklib.php');
     require_once($CFG->dirroot.'/blocks/moodleblock.class.php');
 
     $blocktitles   = array(); // we do not want duplicate titles
diff --git a/lib/weblib.php b/lib/weblib.php
index ab3c3d074b..84dd92db17 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -38,11 +38,6 @@
  * @package moodlecore
  */
 
-/// We are going to uses filterlib functions here
-require_once("$CFG->libdir/filterlib.php");
-
-require_once("$CFG->libdir/ajax/ajaxlib.php");
-
 /// Constants
 
 /// Define text formatting types ... eventually we can add Wiki, BBcode etc
diff --git a/mod/chat/view.php b/mod/chat/view.php
index 49f265dbcc..48337573ee 100644
--- a/mod/chat/view.php
+++ b/mod/chat/view.php
@@ -4,7 +4,6 @@
 
     require_once('../../config.php');
     require_once('lib.php');
-    require_once($CFG->libdir.'/blocklib.php');
     require_once('pagelib.php');
 
     $id   = optional_param('id', 0, PARAM_INT);
diff --git a/mod/data/templates.php b/mod/data/templates.php
index 767ba3d56d..c7a8d2ffee 100755
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -24,7 +24,6 @@
 
     require_once('../../config.php');
     require_once('lib.php');
-    require_once($CFG->libdir.'/blocklib.php');
 
     $id    = optional_param('id', 0, PARAM_INT);  // course module id
     $d     = optional_param('d', 0, PARAM_INT);   // database id
diff --git a/mod/data/view.php b/mod/data/view.php
index 112a91c36a..85e3d25936 100755
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -24,7 +24,6 @@
 
     require_once('../../config.php');
     require_once('lib.php');
-    require_once($CFG->libdir.'/blocklib.php');
     require_once("$CFG->libdir/rsslib.php");
 
     require_once('pagelib.php');
diff --git a/mod/lesson/action/continue.php b/mod/lesson/action/continue.php
index 68fab67235..098d65a6df 100644
--- a/mod/lesson/action/continue.php
+++ b/mod/lesson/action/continue.php
@@ -9,7 +9,6 @@
     confirm_sesskey();
 
     require_once($CFG->dirroot.'/mod/lesson/pagelib.php');
-    require_once($CFG->libdir.'/blocklib.php');
 
     // left menu code
     // check to see if the user can see the left menu
diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index 8565fc905d..44898e72e3 100644
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -11,7 +11,6 @@
     require_once($CFG->dirroot.'/mod/lesson/locallib.php');
     require_once($CFG->dirroot.'/mod/lesson/lib.php');
     require_once($CFG->dirroot.'/mod/lesson/pagelib.php');
-    require_once($CFG->libdir.'/blocklib.php');
 
     $id      = required_param('id', PARAM_INT);             // Course Module ID
     $pageid  = optional_param('pageid', NULL, PARAM_INT);   // Lesson Page ID
diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index f0223bcd3a..e69c36b0ae 100644
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -3,7 +3,6 @@
 /// This page prints a particular instance of quiz
 
     require_once(dirname(__FILE__) . '/../../config.php');
-    require_once($CFG->libdir.'/blocklib.php');
     require_once($CFG->libdir.'/gradelib.php');
     require_once($CFG->dirroot.'/mod/quiz/locallib.php');
     require_once($CFG->dirroot.'/mod/quiz/pagelib.php');
diff --git a/mod/resource/lib.php b/mod/resource/lib.php
index a8ec4a9000..b18ba14132 100644
--- a/mod/resource/lib.php
+++ b/mod/resource/lib.php
@@ -81,11 +81,8 @@ class resource_base {
     * Display the resource with the course blocks.
     */
     function display_course_blocks_start() {
-
         global $CFG, $USER, $THEME;
 
-        require_once($CFG->libdir.'/blocklib.php');
-        require_once($CFG->libdir.'/pagelib.php');
         require_once($CFG->dirroot.'/course/lib.php'); //required by some blocks
 
         $PAGE = page_create_object(PAGE_COURSE_VIEW, $this->course->id);
diff --git a/my/index.php b/my/index.php
index 61d8c38c79..788063219c 100644
--- a/my/index.php
+++ b/my/index.php
@@ -3,7 +3,6 @@
     // this is the 'my moodle' page
 
     require_once('../config.php');
-    require_once($CFG->libdir.'/blocklib.php');
     require_once($CFG->dirroot.'/course/lib.php');
     require_once('pagelib.php');