L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blocks fixed in admin pagelib, and (hopefully) many notices pointed out in the general forum board no longer show up.

Browse Source
This commit is contained in:
vinkmar
2006-08-18 22:00:37 +00:00
parent 4abc23b2ae
commit 3d8ef99d9e
5 changed files with 51 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/adminlib.php
+19 -4
View File
@@ -189,6 +189,7 @@ class admin_settingpage implements part_of_admin_tree {
}
function admin_settingpage($name, $visiblename, $role = 'moodle/legacy:admin') {
global $CFG;
$this->settings = new stdClass();
$this->name = $name;
$this->visiblename = $visiblename;
@@ -1167,7 +1168,7 @@ class admin_setting_special_perfdebug extends admin_setting_configcheckbox {
// N.B.: THIS FUNCTION HANDLES AUTHENTICATION
function admin_externalpage_setup($section) {
global $CFG, $ADMIN, $PAGE, $_GET, $root;
global $CFG, $ADMIN, $PAGE, $_GET, $USER;
require_once($CFG->libdir . '/blocklib.php');
require_once($CFG->dirroot . '/admin/pagelib.php');
@@ -1199,21 +1200,35 @@ function admin_externalpage_setup($section) {
}
if (!($root instanceof admin_externalpage)) {
error('Section does not exist, is invalid, or should not be accessed via this URL.');
error(get_string('sectionerror','admin'));
die;
}
// this eliminates our need to authenticate on the actual pages
if (!($root->check_access())) {
error('Access denied.');
error(get_string('accessdenied', 'admin'));
die;
}
$adminediting = optional_param('adminedit', PARAM_BOOL);
if (!isset($USER->adminediting)) {
$USER->adminediting = true;
}
if ($PAGE->user_allowed_editing()) {
if ($adminediting == 'on') {
$USER->adminediting = true;
} elseif ($adminediting == 'off') {
$USER->adminediting = false;
}
}
}
function admin_externalpage_print_header() {
global $CFG, $ADMIN, $PAGE, $_GET, $root;
global $CFG, $ADMIN, $PAGE;
$pageblocks = blocks_setup($PAGE);