mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-31 21:19:49 +02:00
Code Issues Projects Releases Wiki Activity

manage roles: MDL-8313 fix bugs with safe overrides.

Browse Source
This commit is contained in:
tjhunt 2008-11-18 08:08:18 +00:00
parent a7476c6bbd
commit 4659454ac6
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/roles/lib.php
View File

@ -818,7 +818,7 @@ class override_permissions_table_advanced extends capability_table_with_risks {
/// Determine which capabilities should be locked.
if ($safeoverridesonly) {
foreach ($this->capabilities as $capid => $cap) {
if (!is_safe_capability($capability)) {
if (!is_safe_capability($cap)) {
$this->capabilities[$capid]->locked = true;
$this->haslockedcapabiltites = true;
}

4
admin/roles/override.php
View File

@ -98,8 +98,8 @@
/// Make sure this user can override that role
if ($roleid && !isset($overridableroles[$roleid])) {
$a = stdClass;
$a->role = $roleid;
$a = new stdClass;
$a->roleid = $roleid;
$a->context = $contextname;
print_error('cannotoverriderolehere', '', get_context_url($context), $a);
}

3
lib/accesslib.php
View File

@ -1954,10 +1954,9 @@ function is_legacy($capabilityname) {
* safeoverrides capability should be allowed to change it.
*/
function is_safe_capability($capability) {
return (RISK_DATALOSS | RISK_MANAGETRUST | RISK_CONFIG | RISK_XSS | RISK_PERSONAL) & $capability->riskbitmask;
return !((RISK_DATALOSS | RISK_MANAGETRUST | RISK_CONFIG | RISK_XSS | RISK_PERSONAL) & $capability->riskbitmask);
}
/**********************************
* Context Manipulation functions *
**********************************/