';
}
// uh-changes end
- if (has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+ if (has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, SITEID))) {
echo '
'.update_course_icon($SITE->id).'
';
echo '
';
}
diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index 5d89d63f380..99a74365ebd 100644
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -278,7 +278,11 @@ $string['forceloginforprofiles'] = 'Force users to login for profiles';
$string['forcetimezone'] = 'Force default timezone';
$string['framename'] = 'Frame name';
$string['frontpage'] = 'Front Page';
+$string['frontpagebackup'] = 'Front Page backup';
$string['frontpageloggedin'] = 'Front page items when logged in';
+$string['frontpagerestore'] = 'Front Page restore';
+$string['frontpageroles'] = 'Front Page roles';
+$string['frontpagesettings'] = 'Front Page settings';
$string['fullnamedisplay'] = 'Full Name Format';
$string['gdversion'] = 'GD version';
$string['generalsettings'] = 'General settings';
diff --git a/lib/adminlib.php b/lib/adminlib.php
index 0f22ea1d877..30255f5de0c 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -512,7 +512,7 @@ function create_admin_user() {
if (!$adminroles = get_roles_with_capability('moodle/legacy:admin', CAP_ALLOW)) {
error('No admin role could be found');
}
- $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+ $sitecontext = get_context_instance(CONTEXT_SYSTEM);
foreach ($adminroles as $adminrole) {
role_assign($adminrole->id, $user->id, 0, $sitecontext->id);
}
@@ -1113,6 +1113,11 @@ class admin_externalpage extends part_of_admin_tree {
*/
var $req_capability;
+ /**
+ * @var object The context in which capability/permission should be checked, default is site context.
+ */
+ var $context;
+
/**
* @var bool hidden in admin tree block.
*/
@@ -1126,7 +1131,7 @@ class admin_externalpage extends part_of_admin_tree {
* @param string $url The external URL that we should link to when someone requests this external page.
* @param mixed $req_capability The role capability/permission a user must have to access this external page. Defaults to 'moodle/site:config'.
*/
- function admin_externalpage($name, $visiblename, $url, $req_capability = 'moodle/site:config', $hidden=false) {
+ function admin_externalpage($name, $visiblename, $url, $req_capability = 'moodle/site:config', $hidden=false, $context=false) {
$this->name = $name;
$this->visiblename = $visiblename;
$this->url = $url;
@@ -1136,6 +1141,7 @@ class admin_externalpage extends part_of_admin_tree {
$this->req_capability = array($req_capability);
}
$this->hidden = $hidden;
+ $this->context = $context;
}
/**
@@ -1180,7 +1186,7 @@ class admin_externalpage extends part_of_admin_tree {
if (!get_site()) {
return true; // no access check before site is fully set up
}
- $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+ $context = empty($this->context) ? get_context_instance(CONTEXT_SYSTEM) : $this->context;
foreach($this->req_capability as $cap) {
if (has_capability($cap, $context)) {
return true;
@@ -1227,6 +1233,11 @@ class admin_settingpage extends part_of_admin_tree {
*/
var $req_capability;
+ /**
+ * @var object The context in which capability/permission should be checked, default is site context.
+ */
+ var $context;
+
/**
* @var bool hidden in admin tree block.
*/
@@ -1253,7 +1264,7 @@ class admin_settingpage extends part_of_admin_tree {
}
// see admin_externalpage
- function admin_settingpage($name, $visiblename, $req_capability = 'moodle/site:config', $hidden=false) {
+ function admin_settingpage($name, $visiblename, $req_capability = 'moodle/site:config', $hidden=false, $context=false) {
global $CFG;
$this->settings = new stdClass();
$this->name = $name;
@@ -1264,6 +1275,7 @@ class admin_settingpage extends part_of_admin_tree {
$this->req_capability = array($req_capability);
}
$this->hidden = false;
+ $this->context = $context;
}
// not the same as add for admin_category. adds an admin_setting to this admin_settingpage. settings appear (on the settingpage) in the order in which they're added
@@ -1283,7 +1295,7 @@ class admin_settingpage extends part_of_admin_tree {
if (!get_site()) {
return true; // no access check before site is fully set up
}
- $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+ $context = empty($this->context) ? get_context_instance(CONTEXT_SYSTEM) : $this->context;
foreach($this->req_capability as $cap) {
if (has_capability($cap, $context)) {
return true;
diff --git a/lib/pagelib.php b/lib/pagelib.php
index 7924d199e5f..69cdccfe2ed 100644
--- a/lib/pagelib.php
+++ b/lib/pagelib.php
@@ -295,7 +295,7 @@ class page_base {
// is this page always editable, regardless of anything else?
function edit_always() {
- return (has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID)) && defined('ADMIN_STICKYBLOCKS'));
+ return (has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM)) && defined('ADMIN_STICKYBLOCKS'));
}
}
@@ -347,7 +347,7 @@ class page_course extends page_base {
// This is also about editting of blocks BUT mainly activities in course page layout, see
// update_course_icon() - it must use the same capability
function user_allowed_editing() {
- if (has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID)) && defined('ADMIN_STICKYBLOCKS')) {
+ if (has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM)) && defined('ADMIN_STICKYBLOCKS')) {
return true;
}
return has_capability('moodle/course:manageactivities', get_context_instance(CONTEXT_COURSE, $this->id));
@@ -355,7 +355,7 @@ class page_course extends page_base {
// Is the user actually editing this course page or "sticky page" right now?
function user_is_editing() {
- if (has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID)) && defined('ADMIN_STICKYBLOCKS')) {
+ if (has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM)) && defined('ADMIN_STICKYBLOCKS')) {
//always in edit mode on sticky page
return true;
}
';
@@ -94,13 +94,13 @@ class block_admin extends block_list {
/// Backup this course
- if (has_capability('moodle/site:backup', $context)) {
+ if (has_capability('moodle/site:backup', $context)&& ($course->id!==SITEID)) {
$this->content->items[]=''.get_string('backup').'';
$this->content->icons[]='
';
}
/// Restore to this course
- if (has_capability('moodle/site:restore', $context)) {
+ if (has_capability('moodle/site:restore', $context) && ($course->id!==SITEID)) {
$this->content->items[]=''.get_string('restore').'';
$this->content->icons[]='
';
}
diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index 38e4287fa04..27cda71f1ee 100644
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -309,12 +309,7 @@ class block_base {
switch ($this->instance->pagetype) {
case 'course-view':
- if ($this->instance->pageid == SITEID) {
- $context = get_context_instance(CONTEXT_SYSTEM, $this->instance->pageid);
- } else {
- $context = get_context_instance(CONTEXT_COURSE, $this->instance->pageid);
- }
-
+ $context = get_context_instance(CONTEXT_COURSE, $this->instance->pageid);
if (!has_capability('moodle/site:manageblocks', $context)) {
return null;
}
diff --git a/files/index.php b/files/index.php
index 87b83c1b38f..1c6e43d1f13 100644
--- a/files/index.php
+++ b/files/index.php
@@ -9,6 +9,7 @@
require('../config.php');
require($CFG->libdir.'/filelib.php');
+ require($CFG->libdir.'/adminlib.php');
$id = required_param('id', PARAM_INT);
$file = optional_param('file', '', PARAM_PATH);
@@ -33,26 +34,26 @@
error("That's an invalid course id");
}
- require_login($course->id);
+ require_login($course);
require_capability('moodle/course:managefiles', get_context_instance(CONTEXT_COURSE, $course->id));
function html_footer() {
- global $course, $choose;
+ global $course, $choose, $adminroot;
echo '';
- print_footer($course);
+ if ($course->id == SITEID) {
+ admin_externalpage_print_footer($adminroot);
+ } else {
+ print_footer($course);
+ }
}
function html_header($course, $wdir, $formfield=""){
global $CFG, $ME, $choose;
- if (! $site = get_site()) {
- error("Invalid site!");
- }
-
- if ($course->id == $site->id) {
+ if ($course->id == SITEID) {
$strfiles = get_string("sitefiles");
} else {
$strfiles = get_string("files");
@@ -107,18 +108,26 @@
$fullnav = str_replace('->', '»', "$course->shortname -> $fullnav");
echo '';
- if ($course->id == $site->id) {
+ if ($course->id == SITEID and $wdir != "/backupdata") {
print_heading(get_string("publicsitefileswarning"), "center", 2);
}
} else {
- if ($course->id == $site->id) {
- print_header("$course->shortname: $strfiles", "$course->fullname",
- "admin/index.php\">".get_string("administration").
- " -> $fullnav", $formfield);
+ if ($course->id == SITEID) {
- print_heading(get_string("publicsitefileswarning"), "center", 2);
+ if ($wdir == "/backupdata") {
+ $adminroot = admin_get_root();
+ admin_externalpage_setup('frontpagerestore', $adminroot);
+ admin_externalpage_print_header($adminroot);
+ } else {
+ $adminroot = admin_get_root();
+ admin_externalpage_setup('sitefiles', $adminroot);
+ admin_externalpage_print_header($adminroot);
+
+ print_heading(get_string("publicsitefileswarning"), "center", 2);
+
+ }
} else {
print_header("$course->shortname: $strfiles", "$course->fullname",
diff --git a/index.php b/index.php
index 95a48f7c795..3696cb2a17d 100644
--- a/index.php
+++ b/index.php
@@ -49,7 +49,7 @@
}
if ($CFG->rolesactive) { // if already using roles system
- if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+ if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
if (moodle_needs_upgrading()) {
redirect($CFG->wwwroot .'/'. $CFG->admin .'/index.php');
}
@@ -216,10 +216,10 @@
case FRONTPAGECOURSELIST:
- if (isloggedin() and !has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID)) and !isguest() and empty($CFG->disablemycourses)) {
+ if (isloggedin() and !has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM)) and !isguest() and empty($CFG->disablemycourses)) {
print_heading_block(get_string('mycourses'));
print_my_moodle();
- } else if ((!has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID)) and !isguest()) or (count_records('course') <= FRONTPAGECOURSELIMIT)) {
+ } else if ((!has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM)) and !isguest()) or (count_records('course') <= FRONTPAGECOURSELIMIT)) {
// admin should not see list of courses when there are too many of them
print_heading_block(get_string('availablecourses'));
print_courses(0, '100%', true);
@@ -264,7 +264,7 @@
case 'right':
// uh-changes end
// The right column
- if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing || has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+ if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing || has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, SITEID))) {
echo '