MDL-17428 Do not include in the middle of file in global scope

diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index cb9edd5..9b21688 100644 (file)
--- a/admin/settings/plugins.php
+++ b/admin/settings/plugins.php
@@ -2,6 +2,8 @@
 
 if ($hassiteconfig || has_capability('moodle/question:config', $systemcontext)) {
 
+    require_once($CFG->libdir. '/portfoliolib.php');
+
     $ADMIN->add('modules', new admin_category('modsettings', get_string('activitymodules')));
     $ADMIN->add('modsettings', new admin_page_managemods());
     if ($modules = $DB->get_records('modules')) {
@@ -141,8 +143,6 @@ if ($hassiteconfig || has_capability('moodle/question:config', $systemcontext))
         }
     }
 
-    require_once($CFG->libdir. '/portfoliolib.php');
-
     $catname =get_string('portfolios', 'portfolio');
     $manage = get_string('manageportfolios', 'portfolio');
     $url = "$CFG->wwwroot/$CFG->admin/portfolio.php";

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 9c34a67..6ac6fc1 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -8,6 +8,7 @@
 
 require_once($CFG->libdir.'/eventslib.php');
 require_once($CFG->libdir.'/formslib.php');
+require_once($CFG->libdir.'/portfoliolib.php');
 
 DEFINE ('ASSIGNMENT_COUNT_WORDS', 1);
 DEFINE ('ASSIGNMENT_COUNT_LETTERS', 2);
@@ -3135,7 +3136,6 @@ function assignment_get_extra_capabilities() {
     return array('moodle/site:accessallgroups', 'moodle/site:viewfullnames');
 }
 
-require_once($CFG->libdir . '/portfoliolib.php');
 class assignment_portfolio_caller extends portfolio_module_caller_base {
 
     /**

diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index 13bfd7e..1b3feb4 100644 (file)
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -2,6 +2,7 @@
 
 /// Library of functions and constants for module chat
 require_once($CFG->libdir.'/pagelib.php');
+require_once($CFG->libdir.'/portfoliolib.php');
 
 $CFG->chat_ajax_debug  = false;
 $CFG->chat_use_cache   = false;
@@ -867,7 +868,6 @@ function chat_get_extra_capabilities() {
     return array('moodle/site:accessallgroups', 'moodle/site:viewfullnames');
 }
 
-require_once($CFG->libdir . '/portfoliolib.php');
 class chat_portfolio_caller extends portfolio_module_caller_base {
 
     private $chat;

diff --git a/mod/data/lib.php b/mod/data/lib.php
index d7664bf..5af8222 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -22,6 +22,8 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
+require_once($CFG->libdir . '/portfoliolib.php');
+
 // Some constants
 define ('DATA_MAX_ENTRIES', 50);
 define ('DATA_PERPAGE_SINGLE', 1);
@@ -1030,7 +1032,6 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r
         if (($template == 'singletemplate' || $template == 'listtemplate')
             && ((has_capability('mod/data:exportentry', $context)
                 || (data_isowner($record->id) && has_capability('mod/data:exportownentry', $context))))) {
-            require_once($CFG->libdir . '/portfoliolib.php');
             $button = new portfolio_add_button();
             $button->set_callback_options('data_portfolio_caller', array('id' => $cm->id, 'recordid' => $record->id));
             list($formats, $files) = data_portfolio_caller::formats($fields, $record);
@@ -2540,7 +2541,6 @@ function data_pluginfile($course, $cminfo, $context, $filearea, $args) {
     return false;
 }
 
-require_once($CFG->libdir . '/portfoliolib.php');
 class data_portfolio_caller extends portfolio_module_caller_base {
 
     protected $recordid;

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 034c294..119e7e8 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -2,6 +2,7 @@
 
 require_once($CFG->libdir.'/filelib.php');
 require_once($CFG->libdir.'/eventslib.php');
+require_once($CFG->libdir.'/portfoliolib.php');
 
 /// CONSTANTS ///////////////////////////////////////////////////////////
 
@@ -3900,7 +3901,6 @@ function forum_print_attachments($post, $cm, $type) {
     $canexport = (has_capability('mod/forum:exportpost', $context) || ($post->userid == $USER->id && has_capability('mod/forum:exportownpost', $context)));
 
     if ($files = $fs->get_area_files($context->id, 'forum_attachment', $post->id, "timemodified", false)) {
-        require_once($CFG->libdir . '/portfoliolib.php');
         $button = new portfolio_add_button();
         foreach ($files as $file) {
             $filename = $file->get_filename();
@@ -7172,7 +7172,6 @@ function forum_get_extra_capabilities() {
     return array('moodle/site:accessallgroups', 'moodle/site:viewfullnames', 'moodle/site:trustcontent');
 }
 
-require_once($CFG->libdir . '/portfoliolib.php');
 class forum_portfolio_caller extends portfolio_module_caller_base {
 
     protected $postid;

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index fe12d72..419c85b 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -3,6 +3,8 @@
 /// Library of functions and constants for module glossary
 /// (replace glossary with the name of your module and delete this line)
 
+require_once($CFG->libdir.'/portfoliolib.php');
+
 define("GLOSSARY_SHOW_ALL_CATEGORIES", 0);
 define("GLOSSARY_SHOW_NOT_CATEGORISED", -1);
 
@@ -814,7 +816,6 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h
     if (has_capability('mod/glossary:exportentry', $context)
         || ($entry->userid == $USER->id
             && has_capability('mod/glossary:exportownentry', $context))) {
-        require_once($CFG->libdir . '/portfoliolib.php');
         $button = new portfolio_add_button();
         $button->set_callback_options('glossary_entry_portfolio_caller',  array('id' => $cm->id, 'entryid' => $entry->id));
         $return .= $button->to_html(PORTFOLIO_ADD_ICON_LINK);
@@ -2306,7 +2307,6 @@ function glossary_supports($feature) {
     }
 }
 
-require_once($CFG->libdir . '/portfoliolib.php');
 class glossary_csv_portfolio_caller extends portfolio_module_caller_base {
 
     private $glossary;

diff --git a/mod/resource/lib.php b/mod/resource/lib.php
index 8ed7f60..787f6df 100644 (file)
--- a/mod/resource/lib.php
+++ b/mod/resource/lib.php
@@ -1,5 +1,7 @@
 <?php  // $Id$
 
+require_once($CFG->libdir.'/portfoliolib.php');
+
 define('RESOURCE_LOCALPATH', 'LOCALPATH');
 
 global $RESOURCE_WINDOW_OPTIONS; // must be global because it might be included from a function!
@@ -705,7 +707,6 @@ function resource_get_extra_capabilities() {
     return array('moodle/site:accessallgroups');
 }
 
-require_once($CFG->libdir . '/portfoliolib.php');
 class resource_portfolio_caller extends portfolio_module_caller_base {
 
     private $resource;

diff --git a/portfolio/type/download/file.php b/portfolio/type/download/file.php
index d5b0578..3dc7eb4 100644 (file)
--- a/portfolio/type/download/file.php
+++ b/portfolio/type/download/file.php
@@ -1,7 +1,7 @@
 <?php
 
 require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/config.php');
-require_once($CFG->libdir . '/portfoliolib.php');
+require_once($CFG->libdir.'/portfoliolib.php');
 require_js(array('yui_yahoo', 'yui_dom'));
 $id = required_param('id', PARAM_INT);
 

diff --git a/user/tabs.php b/user/tabs.php
index bcf0cd7..4d28daa 100644 (file)
--- a/user/tabs.php
+++ b/user/tabs.php
@@ -2,6 +2,8 @@
 /// This file to be included so we can assume config.php has already been included.
 /// We also assume that $user, $course, $currenttab have been set
 
+    require_once($CFG->libdir . '/portfoliolib.php');
+
     if (!isset($filtertype)) {
         $filtertype = '';
     }
@@ -254,7 +256,6 @@
     if (!empty($user) and empty($userindexpage) && $user->id == $USER->id && !empty($CFG->enableportfolios) && has_capability('moodle/portfolio:export', get_system_context())) {
 
         /// Portfolio tab
-        require_once($CFG->libdir . '/portfoliolib.php');
         if (portfolio_instances(true, false)) {
             $toprow[] = new tabobject('portfolios', $CFG->wwwroot .'/user/portfolio.php', get_string('portfolios', 'portfolio'));
             if (in_array($currenttab, array('portfolioconf', 'portfoliologs'))) {