### Eclipse Workspace Patch 1.0
#P moodle20t
Index: user/tabs.php
===================================================================
RCS file: /cvsroot/moodle/moodle/user/tabs.php,v
retrieving revision 1.86
diff -u -r1.86 tabs.php
--- user/tabs.php 28 Feb 2010 15:47:47 -0000 1.86
+++ user/tabs.php 5 Mar 2010 08:29:09 -0000
@@ -218,11 +218,11 @@
if (!empty($showroles) and !empty($user)) { // this variable controls whether this roles is showed, or not, so only user/view page should set this flag
$usercontext = get_context_instance(CONTEXT_USER, $user->id);
if (has_any_capability(array('moodle/role:assign', 'moodle/role:safeoverride',
- 'moodle/role:override', 'moodle/role:manage'), $usercontext)) {
+ 'moodle/role:override', 'moodle/role:manage', 'moodle/role:review'), $usercontext)) {
$toprow[] = new tabobject('roles', $CFG->wwwroot.'/'.$CFG->admin.'/roles/usersroles.php?userid='.$user->id.'&courseid='.$course->id
,get_string('roles'));
- if (in_array($currenttab, array('usersroles', 'assign', 'override', 'check'))) {
+ if (in_array($currenttab, array('usersroles', 'assign', 'permissions', 'check'))) {
$inactive = array('roles');
$activetwo = array('roles');
@@ -233,12 +233,12 @@
$secondrow[] = new tabobject('assign', $CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$usercontext->id.'&userid='.$user->id.'&courseid='.$course->id
,get_string('assignrolesrelativetothisuser', 'role'), '', true);
}
- if (!empty($overridableroles) || $currenttab=='override') {
- $secondrow[] = new tabobject('override', $CFG->wwwroot.'/'.$CFG->admin.'/roles/override.php?contextid='.$usercontext->id.'&userid='.$user->id.'&courseid='.$course->id
- ,get_string('overridepermissions', 'role'), '', true);
+ if (!empty($overridableroles) || $currenttab=='permissions' || has_capability('moodle/role:review', $usercontext)) {
+ $secondrow[] = new tabobject('permissions', $CFG->wwwroot.'/'.$CFG->admin.'/roles/permissions.php?contextid='.$usercontext->id.'&userid='.$user->id.'&courseid='.$course->id
+ ,get_string('permissions', 'role'), '', true);
}
if (has_any_capability(array('moodle/role:assign', 'moodle/role:safeoverride',
- 'moodle/role:override', 'moodle/role:assign'), $usercontext)) {
+ 'moodle/role:override', 'moodle/role:assign', 'moodle/role:review'), $usercontext)) {
$secondrow[] = new tabobject('check',
$CFG->wwwroot.'/'.$CFG->admin.'/roles/check.php?contextid='.$usercontext->id.'&userid='.$user->id.'&courseid='.$course->id,
get_string('checkpermissions', 'role'));
Index: admin/roles/managetabs.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/roles/managetabs.php,v
retrieving revision 1.10
diff -u -r1.10 managetabs.php
--- admin/roles/managetabs.php 1 Nov 2009 10:38:54 -0000 1.10
+++ admin/roles/managetabs.php 5 Mar 2010 08:28:55 -0000
@@ -1,45 +1,39 @@
.
/**
* Defines the tab bar used on the manage/allow assign/allow overrides pages.
*
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package roles
- *//** */
+ * @package moodlecore
+ * @subpackage role
+ * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
- if (!defined('MOODLE_INTERNAL')) {
- die('Direct access to this script is forbidden.'); // It must be included from a Moodle page
- }
+if (!defined('MOODLE_INTERNAL')) {
+ die('Direct access to this script is forbidden.'); // It must be included from a Moodle page
+}
- $toprow = array();
- $toprow[] = new tabobject('manage', $CFG->wwwroot.'/'.$CFG->admin.'/roles/manage.php', get_string('manageroles', 'role'));
- $toprow[] = new tabobject('assign', $CFG->wwwroot.'/'.$CFG->admin.'/roles/allow.php?mode=assign', get_string('allowassign', 'role'));
- $toprow[] = new tabobject('override', $CFG->wwwroot.'/'.$CFG->admin.'/roles/allow.php?mode=override', get_string('allowoverride', 'role'));
- $toprow[] = new tabobject('switch', $CFG->wwwroot.'/'.$CFG->admin.'/roles/allow.php?mode=switch', get_string('allowswitch', 'role'));
- $tabs = array($toprow);
+$toprow = array();
+$toprow[] = new tabobject('manage', new moodle_url('/admin/roles/manage.php'), get_string('manageroles', 'role'));
+$toprow[] = new tabobject('assign', new moodle_url('/admin/roles/allow.php', array('mode'=>'assign')), get_string('allowassign', 'role'));
+$toprow[] = new tabobject('override', new moodle_url('/admin/roles/allow.php', array('mode'=>'override')), get_string('allowoverride', 'role'));
+$toprow[] = new tabobject('switch', new moodle_url('/admin/roles/allow.php', array('mode'=>'switch')), get_string('allowswitch', 'role'));
+$tabs = array($toprow);
- print_tabs($tabs, $currenttab);
+print_tabs($tabs, $currenttab);
Index: admin/roles/define.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/roles/define.php,v
retrieving revision 1.14
diff -u -r1.14 define.php
--- admin/roles/define.php 3 Jan 2010 15:46:15 -0000 1.14
+++ admin/roles/define.php 5 Mar 2010 08:28:54 -0000
@@ -1,27 +1,19 @@
.
/**
* Lets the user edit role definitions.
@@ -32,9 +24,11 @@
* edit - edit the definition of a role
* view - view the definition of a role
*
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package roles
- *//** */
+ * @package moodlecore
+ * @subpackage role
+ * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
require_once(dirname(__FILE__) . '/../../config.php');
require_once($CFG->dirroot . '/' . $CFG->admin . '/roles/lib.php');
Index: admin/roles/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/roles/lib.php,v
retrieving revision 1.41
diff -u -r1.41 lib.php
--- admin/roles/lib.php 11 Feb 2010 16:27:55 -0000 1.41
+++ admin/roles/lib.php 5 Mar 2010 08:28:55 -0000
@@ -1,34 +1,34 @@
.
/**
* Library code used by the roles administration interfaces.
*
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package roles
- *//** */
+ * Responds to actions:
+ * add - add a new role
+ * duplicate - like add, only initialise the new role by using an existing one.
+ * edit - edit the definition of a role
+ * view - view the definition of a role
+ *
+ * @package moodlecore
+ * @subpackage role
+ * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->dirroot.'/user/selector/lib.php');
@@ -83,6 +83,10 @@
* Display the table.
*/
public function display() {
+ if (count($this->capabilities) > capability_table_base::NUM_CAPS_FOR_SEARCH) {
+ global $PAGE;
+ $PAGE->requires->js_init_call('M.core_role.init_cap_table_filter', array($this->id, get_string('filter'), get_string('clear')));
+ }
echo '' . "\n\n";
echo '' . get_string('capability','role') . ' ';
$this->add_header_cells();
@@ -119,11 +123,7 @@
}
/// End of the table.
- echo "\n
\n";
- if (count($this->capabilities) > capability_table_base::NUM_CAPS_FOR_SEARCH) {
- global $PAGE;
- $PAGE->requires->js_init_call('M.core_role.init_cap_table_filter', array($this->id, get_string('filter'), get_string('clear')));
- }
+ echo "\n\n";
}
/**
@@ -179,17 +179,14 @@
/**
* Subclass of capability_table_base for use on the Check permissions page.
*
- * We have two additional columns, Allowed, which contains yes/no, and Explanation,
- * which contains a pop-up link to explainhascapability.php.
+ * We have one additional column, Allowed, which contains yes/no.
*/
-class explain_capability_table extends capability_table_base {
+class check_capability_table extends capability_table_base {
protected $user;
protected $fullname;
- protected $baseurl;
protected $contextname;
protected $stryes;
protected $strno;
- protected $strexplanation;
private $hascap;
/**
@@ -204,21 +201,16 @@
$this->user = $user;
$this->fullname = fullname($user);
$this->contextname = $contextname;
- $this->baseurl = $CFG->wwwroot . '/' . $CFG->admin .
- '/roles/explain.php?user=' . $user->id .
- '&contextid=' . $context->id . '&capability=';
$this->stryes = get_string('yes');
$this->strno = get_string('no');
- $this->strexplanation = get_string('explanation');
}
protected function add_header_cells() {
echo '' . get_string('allowed', 'role') . ' ';
- echo '' . $this->strexplanation . ' ';
}
protected function num_extra_columns() {
- return 2;
+ return 1;
}
protected function skip_row($capability) {
@@ -238,27 +230,150 @@
global $OUTPUT;
if ($this->hascap) {
$result = $this->stryes;
- $tooltip = 'whydoesuserhavecap';
} else {
$result = $this->strno;
- $tooltip = 'whydoesusernothavecap';
}
$a = new stdClass;
$a->fullname = $this->fullname;
$a->capability = $capability->name;
$a->context = $this->contextname;
echo '' . $result . ' ';
- echo '';
+ }
+}
- $url = $this->baseurl . $capability->name;
- echo $OUTPUT->action_link($url, $this->strexplanation,
- new popup_action('click', $url, 'hascapabilityexplanation', array('height' => 600, 'width' => 600)),
- array('title'=>get_string($tooltip, 'role', $a)));
- echo ' ';
+/**
+ * Subclass of capability_table_base for use on the Permissions page.
+ */
+class permissions_table extends capability_table_base {
+ protected $contextname;
+ protected $allowoverrides;
+ protected $allowsafeoverrides;
+ protected $overridableroles;
+ protected $roles;
+ protected $icons = array();
+
+ /**
+ * Constructor
+ * @param object $context the context this table relates to.
+ * @param string $contextname print_context_name($context) - to save recomputing.
+ */
+ public function __construct($context, $contextname, $allowoverrides, $allowsafeoverrides, $overridableroles) {
+ global $DB;
+
+ parent::__construct($context, 'permissions');
+ $this->contextname = $contextname;
+ $this->allowoverrides = $allowoverrides;
+ $this->allowsafeoverrides = $allowsafeoverrides;
+ $this->overridableroles = $overridableroles;
+
+ $roles = $DB->get_records('role', null, 'sortorder DESC');
+ foreach ($roles as $roleid=>$role) {
+ $roles[$roleid] = $role->name;
+ }
+ $this->roles = role_fix_names($roles, $context);
+
+ }
+
+ protected function add_header_cells() {
+ echo '' . get_string('risks', 'role') . ' ';
+ echo '' . get_string('neededroles', 'role') . ' ';
+ echo '' . get_string('prohibitedroles', 'role') . ' ';
+ }
+
+ protected function num_extra_columns() {
+ return 3;
+ }
+
+ protected function skip_row($capability) {
+ return $capability->name != 'moodle/site:doanything' && is_legacy($capability->name);
+ }
+
+ protected function add_row_cells($capability) {
+ global $OUTPUT, $PAGE;
+
+ $context = $this->context;
+ $contextid = $this->context->id;
+ $allowoverrides = $this->allowoverrides;
+ $allowsafeoverrides = $this->allowsafeoverrides;
+ $overridableroles = $this->overridableroles;
+ $roles = $this->roles;
+
+
+ list($needed, $forbidden) = get_roles_with_cap_in_context($context, $capability->name);
+ $neededroles = array();
+ $forbiddenroles = array();
+ $allowable = $overridableroles;
+ $forbitable = $overridableroles;
+ foreach ($neededroles as $id=>$unused) {
+ unset($allowable[$id]);
+ }
+ foreach ($forbidden as $id=>$unused) {
+ unset($allowable[$id]);
+ unset($forbitable[$id]);
+ }
+
+ foreach ($roles as $id=>$name) {
+ if (isset($needed[$id])) {
+ $neededroles[$id] = $roles[$id];
+ if (isset($overridableroles[$id]) and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) {
+ $preventurl = new moodle_url($PAGE->url, array('contextid'=>$contextid, 'roleid'=>$id, 'capability'=>$capability->name, 'prevent'=>1));
+ $neededroles[$id] .= $OUTPUT->action_icon($preventurl, new pix_icon('t/delete', get_string('prevent', 'role')));
+ }
+ }
+ }
+ $neededroles = implode(', ', $neededroles);
+ foreach ($roles as $id=>$name) {
+ if (isset($forbidden[$id]) and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) {
+ $forbiddenroles[$id] = $roles[$id];
+ if (isset($overridableroles[$id]) and prohibit_is_removable($id, $context, $capability->name)) {
+ $unprohibiturl = new moodle_url($PAGE->url, array('contextid'=>$contextid, 'roleid'=>$id, 'capability'=>$capability->name, 'unprohibit'=>1));
+ $forbiddenroles[$id] .= $OUTPUT->action_icon($unprohibiturl, new pix_icon('t/delete', get_string('delete')));
+ }
+ }
+ }
+ $forbiddenroles = implode(', ', $forbiddenroles);
+
+ if ($allowable and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) {
+ $allowurl = new moodle_url($PAGE->url, array('contextid'=>$contextid, 'capability'=>$capability->name, 'allow'=>1));
+ $neededroles .= ''.$OUTPUT->action_icon($allowurl, new pix_icon('t/add', get_string('allow', 'role'))).'
';
+ }
+
+ if ($forbitable and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) {
+ $prohibiturl = new moodle_url($PAGE->url, array('contextid'=>$contextid, 'capability'=>$capability->name, 'prohibit'=>1));
+ $forbiddenroles .= ''.$OUTPUT->action_icon($prohibiturl, new pix_icon('t/add', get_string('prohibit', 'role'))).'
';
+ }
+
+ $risks = $this->get_risks($capability);
+
+ echo '' . $risks . ' ';
+ echo '' . $neededroles . ' ';
+ echo '' . $forbiddenroles . ' ';
+ }
+
+ protected function get_risks($capability) {
+ global $OUTPUT;
+
+ $allrisks = get_all_risks();
+ $risksurl = new moodle_url(get_docs_url(s(get_string('risks', 'role'))));
+
+ $return = '';
+
+ foreach ($allrisks as $type=>$risk) {
+ if ($risk & (int)$capability->riskbitmask) {
+ if (!isset($this->icons[$type])) {
+ $pixicon = new pix_icon('/i/' . str_replace('risk', 'risk_', $type), get_string($type . 'short', 'admin'));
+ $this->icons[$type] = $OUTPUT->action_icon($risksurl, $pixicon, new popup_action('click', $risksurl));
+ }
+ $return .= $this->icons[$type];
+ }
+ }
+
+ return $return;
}
}
+
/**
* This subclass is the bases for both the define roles and override roles
* pages. As well as adding the risks columns, this also provides generic
@@ -900,32 +1015,6 @@
}
}
-class override_permissions_table_basic extends override_permissions_table_advanced {
- protected $stradvmessage;
-
- public function __construct($context, $roleid, $safeoverridesonly) {
- parent::__construct($context, $roleid, $safeoverridesonly);
- unset($this->displaypermissions[CAP_PROHIBIT]);
- $this->stradvmessage = get_string('useshowadvancedtochange', 'role');
- }
-
- protected function skip_row($capability) {
- return is_legacy($capability->name) || $capability->locked;
- }
-
- protected function add_permission_cells($capability) {
- if ($this->permissions[$capability->name] == CAP_PROHIBIT) {
- $permname = $this->allpermissions[CAP_PROHIBIT];
- echo '';
- echo '' . $this->stradvmessage . ' ';
- echo ' ';
- } else {
- parent::add_permission_cells($capability);
- }
- }
-}
-
// User selectors for managing role assignments ================================
/**
Index: admin/roles/allow.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/roles/allow.php,v
retrieving revision 1.6
diff -u -r1.6 allow.php
--- admin/roles/allow.php 1 Nov 2009 10:38:54 -0000 1.6
+++ admin/roles/allow.php 5 Mar 2010 08:28:53 -0000
@@ -1,83 +1,74 @@
.
/**
- * this page defines what roles can do things with other roles. For example
- * which roles can assign which other roles, or which roles can switch to
- * which other roles.
+ * Allow overriding of roles by other roles
*
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package roles
- *//** */
-
- require_once(dirname(__FILE__) . '/../../config.php');
- require_once($CFG->libdir . '/adminlib.php');
- require_once($CFG->dirroot . '/' . $CFG->admin . '/roles/lib.php');
-
- $mode = required_param('mode', PARAM_ACTION);
- $classformode = array(
- 'assign' => 'role_allow_assign_page',
- 'override' => 'role_allow_override_page',
- 'switch' => 'role_allow_switch_page'
- );
- if (!isset($classformode[$mode])) {
- print_error('invalidmode', '', '', $mode);
- }
-
- $baseurl = $CFG->wwwroot . '/' . $CFG->admin . '/roles/allow.php?mode=' . $mode;
- admin_externalpage_setup('defineroles', '', array(), $baseurl);
- require_login();
-
- $syscontext = get_context_instance(CONTEXT_SYSTEM);
- require_capability('moodle/role:manage', $syscontext);
-
- $controller = new $classformode[$mode]();
-
- if (optional_param('submit', false, PARAM_BOOL) && data_submitted() && confirm_sesskey()) {
- $controller->process_submission();
- mark_context_dirty($syscontext->path);
- add_to_log(SITEID, 'role', 'edit allow ' . $mode, str_replace($CFG->wwwroot . '/', '', $baseurl), '', '', $USER->id);
- redirect($baseurl);
- }
-
- $controller->load_current_settings();
-
-/// Display the editing form.
- admin_externalpage_print_header();
-
- $currenttab = $mode;
- require_once('managetabs.php');
-
- $table = $controller->get_table();
-
- echo $OUTPUT->box($controller->get_intro_text());
-
- echo '';
+ * @package moodlecore
+ * @subpackage role
+ * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once(dirname(__FILE__) . '/../../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/roles/lib.php');
+
+$mode = required_param('mode', PARAM_ACTION);
+$classformode = array(
+ 'assign' => 'role_allow_assign_page',
+ 'override' => 'role_allow_override_page',
+ 'switch' => 'role_allow_switch_page'
+);
+if (!isset($classformode[$mode])) {
+ print_error('invalidmode', '', '', $mode);
+}
+
+$baseurl = new moodle_url('/admin/roles/allow.php', array('mode'=>$mode));
+admin_externalpage_setup('defineroles', '', array(), $baseurl);
+
+$syscontext = get_context_instance(CONTEXT_SYSTEM);
+require_capability('moodle/role:manage', $syscontext);
+
+$controller = new $classformode[$mode]();
+
+if (optional_param('submit', false, PARAM_BOOL) && data_submitted() && confirm_sesskey()) {
+ $controller->process_submission();
+ mark_context_dirty($syscontext->path);
+ add_to_log(SITEID, 'role', 'edit allow ' . $mode, str_replace($CFG->wwwroot . '/', '', $baseurl), '', '', $USER->id);
+ redirect($baseurl);
+}
+
+$controller->load_current_settings();
+
+// Display the editing form.
+echo $OUTPUT->header();
+
+$currenttab = $mode;
+require('managetabs.php');
+
+$table = $controller->get_table();
+
+echo $OUTPUT->box($controller->get_intro_text());
+
+echo '';
- echo $OUTPUT->footer();
+echo $OUTPUT->footer();
Index: admin/roles/usersroles.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/roles/usersroles.php,v
retrieving revision 1.15
diff -u -r1.15 usersroles.php
--- admin/roles/usersroles.php 1 Feb 2010 03:26:16 -0000 1.15
+++ admin/roles/usersroles.php 5 Mar 2010 08:28:55 -0000
@@ -1,37 +1,30 @@
.
/**
* User roles report list all the users who have been assigned a particular
* role in all contexts.
*
+ * @package moodlecore
+ * @subpackage role
* @copyright © 2007 The Open University and others
* @author t.j.hunt@open.ac.uk and others
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package roles
- *//** */
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
require_once(dirname(__FILE__) . '/../../config.php');
@@ -138,7 +131,8 @@
$showroles = 1;
$currenttab = 'usersroles';
-include_once($CFG->dirroot.'/user/tabs.php');
+include($CFG->dirroot.'/user/tabs.php');
+
echo $OUTPUT->heading($title, 3);
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');
Index: admin/roles/module.js
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/roles/module.js,v
retrieving revision 1.1
diff -u -r1.1 module.js
--- admin/roles/module.js 24 Jan 2010 19:37:46 -0000 1.1
+++ admin/roles/module.js 5 Mar 2010 08:28:55 -0000
@@ -5,113 +5,111 @@
M.core_role = {};
-M.core_role.CapTableFilter = function(Y, tableid, strsearch, strclear) {
- this.delayhandle = -1,
- this.searchdelay = 100, // milliseconds
-
- this.Y = Y
- // Find the form controls.
- this.table = document.getElementById(tableid);
-
- // Create a div to hold the search UI.
- this.div = document.createElement('div');
- this.div.className = 'capabilitysearchui';
- this.div.style.width = this.table.offsetWidth + 'px';
-
- // Create the capability search input.
- this.input = document.createElement('input');
- this.input.type = 'text';
- this.input.id = tableid + 'capabilitysearch';
-
- // Create a label for the search input.
- this.label = document.createElement('label');
- this.label.htmlFor = this.input.id;
- this.label.appendChild(document.createTextNode(strsearch + ' '));
-
- // Create a clear button to clear the input.
- this.button = document.createElement('input');
- this.button.value = strclear;
- this.button.type = 'button';
- this.button.disabled = true;
-
- // Tie it all together
- this.div.appendChild(this.label);
- this.div.appendChild(this.input);
- this.div.appendChild(this.button);
- this.table.parentNode.insertBefore(this.div, this.table);
- Y.on('keyup', this.change, this.input, this);
- Y.on('click', this.clear, this.button, this);
-
- // Horrible hack!
- var hidden = document.createElement('input');
- hidden.type = 'hidden';
- hidden.disabled = true;
- this.div.appendChild(hidden);
- hidden = document.createElement('input');
- hidden.type = 'hidden';
- hidden.disabled = true;
- this.div.appendChild(hidden);
-};
-
-M.core_role.CapTableFilter.prototype.clear = function () {
- this.input.value = '';
- if (this.delayhandle != -1) {
- clearTimeout(this.delayhandle);
- this.delayhandle = -1;
- }
- this.filter();
-};
+M.core_role.init_cap_table_filter = function(Y, tableid, strsearch, strclear) {
+ var CapTableFilter = function(tableid, strsearch, strclear) {
+ this.delayhandle = -1,
+ this.searchdelay = 100, // milliseconds
+
+ // Find the form controls.
+ this.table = document.getElementById(tableid);
+
+ // Create a div to hold the search UI.
+ this.div = document.createElement('div');
+ this.div.className = 'capabilitysearchui';
+ this.div.style.width = this.table.offsetWidth + 'px';
+
+ // Create the capability search input.
+ this.input = document.createElement('input');
+ this.input.type = 'text';
+ this.input.id = tableid + 'capabilitysearch';
+
+ // Create a label for the search input.
+ this.label = document.createElement('label');
+ this.label.htmlFor = this.input.id;
+ this.label.appendChild(document.createTextNode(strsearch + ' '));
+
+ // Create a clear button to clear the input.
+ this.button = document.createElement('input');
+ this.button.value = strclear;
+ this.button.type = 'button';
+ this.button.disabled = true;
+
+ // Tie it all together
+ this.div.appendChild(this.label);
+ this.div.appendChild(this.input);
+ this.div.appendChild(this.button);
+ this.table.parentNode.insertBefore(this.div, this.table);
+ Y.on('keyup', this.change, this.input, this);
+ Y.on('click', this.clear, this.button, this);
+
+ // Horrible hack!
+ var hidden = document.createElement('input');
+ hidden.type = 'hidden';
+ hidden.disabled = true;
+ this.div.appendChild(hidden);
+ hidden = document.createElement('input');
+ hidden.type = 'hidden';
+ hidden.disabled = true;
+ this.div.appendChild(hidden);
+ };
+
+ CapTableFilter.prototype.clear = function () {
+ this.input.value = '';
+ if (this.delayhandle != -1) {
+ clearTimeout(this.delayhandle);
+ this.delayhandle = -1;
+ }
+ this.filter();
+ };
-M.core_role.CapTableFilter.prototype.change = function() {
- var self = this;
- var handle = setTimeout(function(){self.filter();}, this.searchdelay);
- if (this.delayhandle != -1) {
- clearTimeout(this.delayhandle);
- }
- this.delayhandle = handle;
-};
+ CapTableFilter.prototype.change = function() {
+ var self = this;
+ var handle = setTimeout(function(){self.filter();}, this.searchdelay);
+ if (this.delayhandle != -1) {
+ clearTimeout(this.delayhandle);
+ }
+ this.delayhandle = handle;
+ };
-M.core_role.CapTableFilter.prototype.set_visible = function(row, visible) {
- if (visible) {
- this.Y.one(row).removeClass('hiddenrow');
- } else {
- this.Y.one(row).addClass('hiddenrow');
- }
-};
+ CapTableFilter.prototype.set_visible = function(row, visible) {
+ if (visible) {
+ Y.one(row).removeClass('hiddenrow');
+ } else {
+ Y.one(row).addClass('hiddenrow');
+ }
+ };
-M.core_role.CapTableFilter.prototype.filter = function() {
- var filtertext = this.input.value.toLowerCase();
- this.button.disabled = (filtertext == '');
- var lastheading = null;
- var capssincelastheading = 0;
-
- Y.all('#'+this.table.id+' tr').each(function(row, index, list) {
- if (row.hasClass('rolecapheading')) {
- if (lastheading) {
- this.set_visible(lastheading, capssincelastheading > 0);
+ CapTableFilter.prototype.filter = function() {
+ var filtertext = this.input.value.toLowerCase();
+ this.button.disabled = (filtertext == '');
+ var lastheading = null;
+ var capssincelastheading = 0;
+
+ Y.all('#'+this.table.id+' tr').each(function(row, index, list) {
+ if (row.hasClass('rolecapheading')) {
+ if (lastheading) {
+ this.set_visible(lastheading, capssincelastheading > 0);
+ }
+ lastheading = row;
+ capssincelastheading = 0;
}
- lastheading = row;
- capssincelastheading = 0;
- }
- if (row.hasClass('rolecap')) {
- var capname = row.one('.cap-name').get('text') + '|' + row.one('.cap-desc a').get('text').toLowerCase();
- if (capname.indexOf(filtertext) >= 0) {
- this.set_visible(row, true);
- capssincelastheading += 1;
- } else {
- this.set_visible(row, false);
+ if (row.hasClass('rolecap')) {
+ var capname = row.one('.cap-name').get('text') + '|' + row.one('.cap-desc a').get('text').toLowerCase();
+ if (capname.indexOf(filtertext) >= 0) {
+ this.set_visible(row, true);
+ capssincelastheading += 1;
+ } else {
+ this.set_visible(row, false);
+ }
}
- }
- }, this);
-
- if (lastheading) {
- this.set_visible(lastheading, capssincelastheading > 0);
- }
-};
+ }, this);
+ if (lastheading) {
+ this.set_visible(lastheading, capssincelastheading > 0);
+ }
+ };
-M.core_role.init_cap_table_filter = function(Y, tableid, strsearch, strclear) {
- new M.core_role.CapTableFilter(Y, tableid, strsearch, strclear);
+ new CapTableFilter(tableid, strsearch, strclear);
};
Index: admin/roles/tabs.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/roles/tabs.php,v
retrieving revision 1.58
diff -u -r1.58 tabs.php
--- admin/roles/tabs.php 16 Jan 2010 15:40:04 -0000 1.58
+++ admin/roles/tabs.php 5 Mar 2010 08:28:55 -0000
@@ -1,35 +1,29 @@
.
/**
* Handles headers and tabs for the roles control at any level apart from SYSTEM level
* We assume that $currenttab, $assignableroles and $overridableroles are defined
*
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package roles
- *//** */
+ * @package moodlecore
+ * @subpackage role
+ * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); // It must be included from a Moodle page
@@ -56,11 +50,9 @@
$PAGE->navbar->add($straction);
$PAGE->set_title($title);
$PAGE->set_heading($SITE->fullname);
- echo $OUTPUT->header();
break;
case CONTEXT_USER:
- echo $OUTPUT->header();
break;
case CONTEXT_COURSECAT:
@@ -78,14 +70,12 @@
$PAGE->navbar->add(get_string("roles"));
$PAGE->set_title($title);
$PAGE->set_heading("$SITE->fullname: $strcourses");
- echo $OUTPUT->header();
break;
case CONTEXT_COURSE:
if ($context->instanceid != SITEID) {
$course = $DB->get_record('course', array('id'=>$context->instanceid));
- require_login($course);
if (empty($title)) {
$title = get_string("editcoursesettings");
}
@@ -93,7 +83,6 @@
$PAGE->navbar->add(get_string('roles'), $roleslink, navigation_node::TYPE_SETTING);
$PAGE->set_title($title);
$PAGE->set_heading($course->fullname);
- echo $OUTPUT->header();
}
break;
@@ -105,8 +94,6 @@
print_error('invalidcourse');
}
- require_login($course);
-
$PAGE->navigation->add(get_string('roles'));
if (empty($title)) {
@@ -114,45 +101,16 @@
}
$PAGE->set_title($title);
$PAGE->set_cacheable(false);
- echo $OUTPUT->header();
break;
case CONTEXT_BLOCK:
if ($blockinstance = $DB->get_record('block_instances', array('id' => $context->instanceid))) {
$blockname = print_context_name($context);
- $parentcontext = get_context_instance_by_id($blockinstance->parentcontextid);
- switch ($parentcontext->contextlevel) {
- case CONTEXT_SYSTEM:
- break;
-
- case CONTEXT_COURSECAT:
- $PAGE->set_category_by_id($parentcontext->instanceid);
- break;
-
- case CONTEXT_COURSE:
- require_login($parentcontext->instanceid);
- break;
-
- case CONTEXT_MODULE:
- $cm = get_coursemodule_from_id('', $parentcontext->instanceid);
- require_login($parentcontext->instanceid, false, $cm);
- break;
-
- case CONTEXT_USER:
- break;
-
- default:
- throw new invalid_state_exception('Block context ' . $blockname .
- ' has parent context with an improper contextlevel ' . $parentcontext->contextlevel);
-
-
- }
$PAGE->navbar->add($blockname);
$PAGE->navbar->add($straction);
$PAGE->set_title("$straction: $blockname");
$PAGE->set_heading($PAGE->course->fullname);
- echo $OUTPUT->header();
}
break;
@@ -167,16 +125,12 @@
$toprow = array();
$inactive = array();
$activetwo = array();
+$secondrow = array();
+$permissionsrow = array();
if ($context->contextlevel != CONTEXT_SYSTEM) { // Print tabs for anything except SYSTEM context
- if (!empty($returnurl)) {
- $returnurlparam = '&returnurl=' . $returnurl;
- } else {
- $returnurlparam = '';
- }
-
if ($context->contextlevel == CONTEXT_MODULE) { // Only show update button if module
$toprow[] = new tabobject('update', $CFG->wwwroot.'/course/mod.php?update='.
$context->instanceid.'&return=true&sesskey='.sesskey(), get_string('settings'));
@@ -184,29 +138,40 @@
if (!empty($assignableroles) || $currenttab=='assign') {
$toprow[] = new tabobject('assign',
- $CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$context->id.$returnurlparam,
+ new moodle_url('/admin/roles/assign.php', array('contextid'=>$context->id)),
get_string('localroles', 'role'), '', true);
}
- if (!empty($overridableroles)) {
- $toprow[] = new tabobject('override',
- $CFG->wwwroot.'/'.$CFG->admin.'/roles/override.php?contextid='.$context->id.$returnurlparam,
- get_string('overridepermissions', 'role'), '', true);
+ if (has_capability('moodle/role:review', $context) or !empty($overridableroles)) {
+ $permissionsrow['permissions'] = new tabobject('permissions',
+ new moodle_url('/admin/roles/permissions.php', array('contextid'=>$context->id)),
+ get_string('permissions', 'role'), '', true);
}
if (has_any_capability(array('moodle/role:assign', 'moodle/role:safeoverride',
'moodle/role:override', 'moodle/role:assign'), $context)) {
- $toprow[] = new tabobject('check',
- $CFG->wwwroot.'/'.$CFG->admin.'/roles/check.php?contextid='.$context->id.$returnurlparam,
+ $permissionsrow['check'] = new tabobject('check',
+ new moodle_url('/admin/roles/check.php', array('contextid'=>$context->id)),
get_string('checkpermissions', 'role'));
}
+ if ($permissionsrow) {
+ $firstpermissionrow = reset($permissionsrow);
+ $toprow[] = new tabobject('toppermissions', $firstpermissionrow->link, get_string('permissions', 'role'), '', true);
+ if (!empty($permissionsrow[$currenttab])) {
+ $secondrow = array_values($permissionsrow);
+ $inactive = array('toppermissions');
+ $activetwo = array('toppermissions');
+ }
+ }
+
if (!empty($availablefilters)) {
$toprow[] = new tabobject('filters',
- $CFG->wwwroot.'/filter/manage.php?contextid=' . $context->id,
+ new moodle_url('/filter/manage.php', array('contextid'=>$context->id)),
get_string('filters', 'admin'));
}
}
+unset($permissionsrow);
/// Here other core tabs should go (always calling tabs.php files)
/// All the logic to decide what to show must be self-contained in the tabs file
@@ -215,26 +180,26 @@
/// Finally, we support adding some 'on-the-fly' tabs here
/// All the logic to decide what to show must be self-cointained in the tabs file
- if (!empty($CFG->extratabs)) {
- if ($extratabs = explode(',', $CFG->extratabs)) {
- asort($extratabs);
- foreach($extratabs as $extratab) {
- /// Each extra tab must be one $CFG->dirroot relative file
- if (file_exists($CFG->dirroot . '/' . $extratab)) {
- include_once($CFG->dirroot . '/' . $extratab);
- }
+if (!empty($CFG->extratabs)) {
+ if ($extratabs = explode(',', $CFG->extratabs)) {
+ asort($extratabs);
+ foreach($extratabs as $extratab) {
+ /// Each extra tab must be one $CFG->dirroot relative file
+ if (file_exists($CFG->dirroot . '/' . $extratab)) {
+ include($CFG->dirroot . '/' . $extratab);
}
}
}
+}
- $inactive[] = $currenttab;
+$inactive[] = $currenttab;
- $tabs = array($toprow);
+$tabs = array($toprow);
/// If there are any secondrow defined, let's introduce it
- if (isset($secondrow) && is_array($secondrow) && !empty($secondrow)) {
- $tabs[] = $secondrow;
- }
+if (!empty($secondrow)) {
+ $tabs[] = $secondrow;
+}
- print_tabs($tabs, $currenttab, $inactive, $activetwo);
+print_tabs($tabs, $currenttab, $inactive, $activetwo);
Index: admin/roles/explain.php
===================================================================
RCS file: admin/roles/explain.php
diff -N admin/roles/explain.php
--- admin/roles/explain.php 16 Jan 2010 15:40:04 -0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,280 +0,0 @@
-set_url('/admin/roles/explain.php', array('user'=>$userid, 'contextid'=>$contextid, 'capability'=>$capability));
-
-// Get the context and its parents.
-$context = get_context_instance_by_id($contextid);
-if (!$context) {
- print_error('unknowncontext');
-}
-$contextids = get_parent_contexts($context);
-array_unshift($contextids, $context->id);
-$contexts = array();
-$number = count($contextids);
-foreach ($contextids as $contextid) {
- $contexts[$contextid] = get_context_instance_by_id($contextid);
- $contexts[$contextid]->name = print_context_name($contexts[$contextid], true, true);
- $contexts[$contextid]->number = $number--;
-}
-
-// Validate the user id.
-if ($userid) {
- $user = $DB->get_record('user', array('id' => $userid));
- if (!$user) {
- print_error('nosuchuser');
- }
-} else {
- $frontpagecontext = get_context_instance(CONTEXT_COURSE, SITEID);
- if (!empty($CFG->forcelogin) ||
- ($context->contextlevel >= CONTEXT_COURSE && !in_array($frontpagecontext->id, $contextids))) {
- print_error('cannotgetherewithoutloggingin', 'role');
- }
-}
-
-// Check access permissions.
-require_login();
-if (!has_any_capability(array('moodle/role:assign', 'moodle/role:safeoverride',
- 'moodle/role:override', 'moodle/role:assign'), $context)) {
- print_error('nopermissions', '', get_string('explainpermissions'));
-}
-
-// This duplicates code in load_all_capabilities and has_capability.
-$systempath = '/' . SYSCONTEXTID;
-if ($userid == 0) {
- if (!empty($CFG->notloggedinroleid)) {
- $accessdata = get_role_access($CFG->notloggedinroleid);
- $accessdata['ra'][$systempath] = array($CFG->notloggedinroleid);
- } else {
- $accessdata = array();
- $accessdata['ra'] = array();
- $accessdata['rdef'] = array();
- $accessdata['loaded'] = array();
- }
-} else if (isguestuser($user)) {
- $guestrole = get_guest_role();
- $accessdata = get_role_access($guestrole->id);
- $accessdata['ra'][$systempath] = array($guestrole->id);
-} else {
- $accessdata = load_user_accessdata($userid);
-}
-if ($context->contextlevel > CONTEXT_COURSE && !path_inaccessdata($context->path, $accessdata)) {
- load_subcontext($userid, $context, $accessdata);
-}
-
-// Load the roles we need.
-$roleids = array();
-foreach ($accessdata['ra'] as $roleassignments) {
- $roleids = array_merge($roleassignments, $roleids);
-}
-$roles = $DB->get_records_list('role', 'id', $roleids);
-$rolenames = array();
-foreach ($roles as $role) {
- $rolenames[$role->id] = $role->name;
-}
-$rolenames = role_fix_names($rolenames, $context);
-
-// Pass over the data once, to find the cell that determines the result.
-$userhascapability = has_capability($capability, $context, $userid, false);
-$areprohibits = false;
-$decisiveassigncon = 0;
-$decisiveoverridecon = 0;
-foreach ($contexts as $con) {
- if (!empty($accessdata['ra'][$con->path])) {
- // The array_unique here is to work around bug MDL-14817. Once that bug is
- // fixed, it can be removed
- $ras = array_unique($accessdata['ra'][$con->path]);
- } else {
- $ras = array();
- }
- $con->firstoverride = 0;
- foreach ($contexts as $ocon) {
- $summedpermission = 0;
- $gotsomething = false;
- foreach ($ras as $roleid) {
- if (isset($accessdata['rdef'][$ocon->path . ':' . $roleid][$capability])) {
- $perm = $accessdata['rdef'][$ocon->path . ':' . $roleid][$capability];
- } else {
- $perm = CAP_INHERIT;
- }
- if ($perm && !$gotsomething) {
- $gotsomething = true;
- $con->firstoverride = $ocon->id;
- }
- if ($perm == CAP_PROHIBIT) {
- $areprohibits = true;
- $decisiveassigncon = 0;
- $decisiveoverridecon = 0;
- break;
- }
- $summedpermission += $perm;
- }
- if (!$areprohibits && !$decisiveassigncon && $summedpermission) {
- $decisiveassigncon = $con->id;
- $decisiveoverridecon = $ocon->id;
- break;
- } else if ($gotsomething) {
- break;
- }
- }
-}
-if (!$areprohibits && !$decisiveassigncon) {
- $decisiveassigncon = SYSCONTEXTID;
- $decisiveoverridecon = SYSCONTEXTID;
-}
-
-// Make a fake role to simplify rendering the table below.
-$rolenames[0] = get_string('none');
-
-// Prepare some arrays of strings.
-$cssclasses = array(
- CAP_INHERIT => 'inherit',
- CAP_ALLOW => 'allow',
- CAP_PREVENT => 'prevent',
- CAP_PROHIBIT => 'prohibit',
- '' => ''
-);
-$strperm = array(
- CAP_INHERIT => get_string('inherit', 'role'),
- CAP_ALLOW => get_string('allow', 'role'),
- CAP_PREVENT => get_string('prevent', 'role'),
- CAP_PROHIBIT => get_string('prohibit', 'role'),
- '' => ''
-);
-
-// Start the output.
-$PAGE->set_title(get_string('explainpermission', 'role'));
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('explainpermission', 'role'));
-
-// Print a summary of what we are doing.
-$a = new stdClass;
-if ($userid) {
- $a->fullname = fullname($user);
-} else {
- $a->fullname = get_string('nobody');
-}
-$a->capability = $capability;
-$a->context = reset($contexts)->name;
-if ($userhascapability) {
- echo '' . get_string('whydoesuserhavecap', 'role', $a) . '
';
-} else {
- echo '' . get_string('whydoesusernothavecap', 'role', $a) . '
';
-}
-
-// Print the table header rows.
-echo '';
-echo '';
-if (count($contexts) > 1) {
- echo '';
-}
-echo '';
-echo ' ';
-echo '';
-foreach (array_slice($contexts, 0, count($contexts) - 1) as $con) {
- echo '';
-}
-echo ' ';
-
-// Now print the bulk of the table.
-foreach ($contexts as $con) {
- if (!empty($accessdata['ra'][$con->path])) {
- // The array_unique here is to work around bug MDL-14817. Once that bug is
- // fixed, it can be removed
- $ras = array_unique($accessdata['ra'][$con->path]);
- } else {
- $ras = array(0);
- }
- $firstcell = '' . $con->number . '. ' . $con->name . ' ';
- $rowclass = ' class="newcontext"';
- foreach ($ras as $roleid) {
- $extraclass = '';
- if (!$roleid) {
- $extraclass = ' noroles';
- }
- echo '' . $firstcell . '';
- $overridden = false;
- foreach ($contexts as $ocon) {
- if ($roleid == 0) {
- $perm = '';
- } else {
- if (isset($accessdata['rdef'][$ocon->path . ':' . $roleid][$capability])) {
- $perm = $accessdata['rdef'][$ocon->path . ':' . $roleid][$capability];
- } else {
- $perm = CAP_INHERIT;
- }
- }
- if ($perm === CAP_INHERIT && $ocon->id == SYSCONTEXTID) {
- $permission = get_string('notset', 'role');
- } else {
- $permission = $strperm[$perm];
- }
- $classes = $cssclasses[$perm];
- if (!$areprohibits && $decisiveassigncon == $con->id && $decisiveoverridecon == $ocon->id) {
- $classes .= ' decisive';
- if ($userhascapability) {
- $classes .= ' has';
- } else {
- $classes .= ' hasnot';
- }
- }
- if ($overridden) {
- $classes .= ' overridden';
- }
- echo '' . $permission . ' ';
- if ($con->firstoverride == $ocon->id) {
- $overridden = true;
- }
- }
- echo '';
- $firstcell = '';
- $rowclass = '';
- }
-}
-echo '
';
-
-// Finish the page.
-echo get_string('explainpermissionsinfo', 'role');
-if ($userid && $capability != 'moodle/site:doanything' && !$userhascapability &&
- has_capability('moodle/site:doanything', $context, $userid)) {
- echo '' . get_string('explainpermissionsdoanything', 'role', $capability) . '
';
-}
-echo $OUTPUT->close_window_button();
-echo $OUTPUT->footer();
Index: admin/roles/override.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/roles/override.php,v
retrieving revision 1.79
diff -u -r1.79 override.php
--- admin/roles/override.php 9 Feb 2010 19:23:11 -0000 1.79
+++ admin/roles/override.php 5 Mar 2010 08:28:55 -0000
@@ -1,208 +1,161 @@
.
/**
* Lets you override role definitions in contexts.
*
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package roles
- *//** */
-
- require_once(dirname(__FILE__) . '/../../config.php');
- require_once($CFG->dirroot . '/' . $CFG->admin . '/roles/lib.php');
-
- $contextid = required_param('contextid', PARAM_INT); // context id
- $roleid = optional_param('roleid', 0, PARAM_INT); // requested role id
- $userid = optional_param('userid', 0, PARAM_INT); // needed for user tabs
- $courseid = optional_param('courseid', 0, PARAM_INT); // needed for user tabs
- $returnurl = optional_param('returnurl', null, PARAM_LOCALURL);
-
-/// Get the base URL for this and related pages into a convenient variable.
- $urlparams = array('contextid' => $contextid);
- if (!empty($userid)) {
- $urlparams['userid'] = $userid;
- }
- if ($courseid && $courseid != SITEID) {
- $urlparams['courseid'] = $courseid;
- }
- if ($returnurl) {
- $urlparams['returnurl'] = $returnurl;
- }
- $PAGE->set_url('/admin/roles/override.php', $urlparams);
- $baseurl = $PAGE->url->out();
+ * @package moodlecore
+ * @subpackage role
+ * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require('../../config.php');
+require_once("$CFG->dirroot/$CFG->admin/roles/lib.php");
+
+$contextid = required_param('contextid', PARAM_INT); // context id
+$roleid = required_param('roleid', PARAM_INT); // requested role id
+
+// security first
+list($context, $course, $cm) = get_context_info_array($contextid);
+require_login($course, false, $cm);
+$safeoverridesonly = !has_capability('moodle/role:override', $context);
+if ($safeoverridesonly) {
+ require_capability('moodle/role:safeoverride', $context);
+}
+
+$PAGE->set_url('/admin/roles/override.php', array('contextid' => $contextid, 'roleid' => $roleid));
+$PAGE->set_context($context);
-/// Validate the contextid parameter.
- if (!$context = $DB->get_record('context', array('id'=>$contextid))) {
- print_error('wrongcontextid', 'error');
- }
- $isfrontpage = $context->contextlevel == CONTEXT_COURSE && $context->instanceid == SITEID;
- $contextname = print_context_name($context);
+$userid = 0;
+$tabfile = null;
- if ($context->contextlevel == CONTEXT_SYSTEM) {
- print_error('cannotoverridebaserole', 'error');
- }
+if ($course) {
+ $isfrontpage = ($context->contextlevel == CONTEXT_COURSE and $context->instanceid == SITEID);
-/// Validate the courseid parameter.
- if ($context->contextlevel == CONTEXT_COURSE) {
- $courseid = $context->instanceid;
- if (!$course = $DB->get_record('course', array('id'=>$courseid))) {
- print_error('invalidcourse');
- }
- } if ($courseid) { // we need this for user tabs in user context
- if (!$course = $DB->get_record('course', array('id'=>$courseid))) {
- print_error('invalidcourse');
- }
+} else {
+ $isfrontpage = false;
+ if ($context->contextlevel == CONTEXT_USER) {
+ $courseid = optional_param('courseid', SITEID, PARAM_INT); // needed for user/tabs.php
+ $course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
+ $PAGE->url->param('courseid', $courseid);
+ $userid = $context->instanceid;
} else {
- $course = clone($SITE);
- $courseid = SITEID;
+ $course = $SITE;
}
+}
-/// Check access permissions.
- require_login($course);
- $safeoverridesonly = !has_capability('moodle/role:override', $context);
- if ($safeoverridesonly) {
- require_capability('moodle/role:safeoverride', $context);
- }
+$courseid = $course->id;
-/// Handle the cancel button.
- if (optional_param('cancel', false, PARAM_BOOL)) {
- redirect($baseurl);
- }
+$baseurl = $PAGE->url->out();
+$returnurl = new moodle_url('/admin/roles/permissions.php', array('contextid' => $context->id));
-/// Handle the toggle advanced mode button.
- $showadvanced = get_user_preferences('overridepermissions_showadvanced', false);
- if (optional_param('toggleadvanced', false, PARAM_BOOL)) {
- $showadvanced = !$showadvanced;
- set_user_preference('overridepermissions_showadvanced', $showadvanced);
- }
+$role = $DB->get_record('role', array('id'=>$roleid), '*', MUST_EXIST);
-/// These are needed early because of tabs.php
- $assignableroles = get_assignable_roles($context, ROLENAME_BOTH);
- list($overridableroles, $overridecounts, $nameswithcounts) = get_overridable_roles($context, ROLENAME_BOTH, true);
-
-/// Make sure this user can override that role
- if ($roleid && !isset($overridableroles[$roleid])) {
- $a = new stdClass;
- $a->roleid = $roleid;
- $a->context = $contextname;
- print_error('cannotoverriderolehere', '', get_context_url($context), $a);
- }
+// These are needed early because of tabs.php
+$assignableroles = get_assignable_roles($context, ROLENAME_BOTH);
+list($overridableroles, $overridecounts, $nameswithcounts) = get_overridable_roles($context, ROLENAME_BOTH, true);
+// Work out an appropriate page title.
+$contextname = print_context_name($context);
+$straction = get_string('overrideroles', 'role'); // Used by tabs.php
+$a = (object)array('context' => $contextname, 'role' => $overridableroles[$roleid]);
+$title = get_string('overridepermissionsforrole', 'role', $a);
-/// If we are actually overriding a role, create the table object, and save changes if appropriate.
- if ($roleid) {
- if ($showadvanced) {
- $overridestable = new override_permissions_table_advanced($context, $roleid, $safeoverridesonly);
- } else {
- $overridestable = new override_permissions_table_basic($context, $roleid, $safeoverridesonly);
- }
- $overridestable->read_submitted_permissions();
+// Print the header and tabs
+if ($context->contextlevel == CONTEXT_SYSTEM) {
+ print_error('cannotoverridebaserole', 'error');
- if (optional_param('savechanges', false, PARAM_BOOL) && confirm_sesskey()) {
- $overridestable->save_changes();
- $rolename = $overridableroles[$roleid];
- add_to_log($course->id, 'role', 'override', 'admin/roles/override.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
- redirect($baseurl);
- }
- }
+} else if ($context->contextlevel == CONTEXT_USER) {
+ // NOTE: this is not linked from UI for now
+ $userid = $context->instanceid;
+ $user = $DB->get_record('user', array('id'=>$userid, 'deleted'=>0), '*', MUST_EXIST);
+ $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
-/// Work out an appropriate page title.
- if ($roleid) {
- $a = new stdClass;
- $a->role = $overridableroles[$roleid];
- $a->context = $contextname;
- $title = get_string('overridepermissionsforrole', 'role', $a);
+ // course header
+ if ($isfrontpage) {
+ $PAGE->set_heading($course->fullname);
} else {
- if ($isfrontpage) {
- $title = get_string('frontpageoverrides', 'admin');
- } else {
- $title = get_string('overridepermissionsin', 'role', $contextname);
+ if (has_capability('moodle/course:viewparticipants', get_context_instance(CONTEXT_COURSE, $courseid))) {
+ $PAGE->navbar->add(get_string('participants'), new moodle_url('/user/index.php', array('id'=>$courseid)));
}
+ $PAGE->set_heading($fullname);
}
+ $PAGE->navbar->add($fullname, new moodle_url("$CFG->wwwroot/user/view.php", array('id'=>$userid,'course'=>$courseid)));
+ $PAGE->navbar->add($straction);
- /// Print the header and tabs
- $straction = get_string('overrideroles', 'role'); // Used by tabs.php
- if ($context->contextlevel == CONTEXT_USER) {
- $user = $DB->get_record('user', array('id'=>$userid));
- $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
-
- $PAGE->set_title($title);
- if ($courseid != SITEID) {
- if (has_capability('moodle/course:viewparticipants', get_context_instance(CONTEXT_COURSE, $course->id))) {
- $PAGE->navbar->add(get_string('participants'), new moodle_url('/user/index.php', array('id'=>$course->id)));
- }
- $PAGE->set_heading($fullname);
- } else {
- $PAGE->set_heading($course->fullname);
- }
- $PAGE->navbar->add($fullname, new moodle_url("$CFG->wwwroot/user/view.php", array('id'=>$userid,'course'=>$courseid)));
- $PAGE->navbar->add($straction);
- echo $OUTPUT->header();
-
- $showroles = 1;
- $currenttab = 'override';
- include_once($CFG->dirroot.'/user/tabs.php');
- } else if ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID) {
- require_once($CFG->libdir.'/adminlib.php');
- admin_externalpage_setup('frontpageroles', '', array('contextid' => $contextid, 'roleid' => $roleid), $CFG->wwwroot . '/' . $CFG->admin . '/roles/override.php');
- admin_externalpage_print_header();
- $currenttab = 'override';
- include_once('tabs.php');
- } else {
- $currenttab = 'override';
- include_once('tabs.php');
- }
-
- echo $OUTPUT->heading_with_help($title, 'overrides');
+ $showroles = 1;
+ $currenttab = 'permissions';
+ $tabfile = $CFG->dirroot.'/user/tabs.php';
+
+} else if ($isfrontpage) {
+ admin_externalpage_setup('frontpageroles', '', array(), $PAGE->url);
+ $currenttab = 'permissions';
+ $tabfile = 'tabs.php';
+
+} else {
+ $currenttab = 'permissions';
+ $tabfile = 'tabs.php';
+}
+
+
+// Handle the cancel button.
+if (optional_param('cancel', false, PARAM_BOOL)) {
+ redirect($returnurl);
+}
+
+// Make sure this user can override that role
+if (empty($overridableroles[$roleid])) {
+ $a = new stdClass;
+ $a->roleid = $roleid;
+ $a->context = $contextname;
+ print_error('cannotoverriderolehere', '', get_context_url($context), $a);
+}
+
+// If we are actually overriding a role, create the table object, and save changes if appropriate.
+$overridestable = new override_permissions_table_advanced($context, $roleid, $safeoverridesonly);
+$overridestable->read_submitted_permissions();
+
+if (optional_param('savechanges', false, PARAM_BOOL) && confirm_sesskey()) {
+ $overridestable->save_changes();
+ $rolename = $overridableroles[$roleid];
+ add_to_log($course->id, 'role', 'override', 'admin/roles/override.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
+ redirect($returnurl);
+}
+
+// Finally start page output
+echo $OUTPUT->header();
+if ($tabfile) {
+ include($tabfile);
+}
+echo $OUTPUT->heading_with_help($title, 'overrides');
+
+// Show UI for overriding roles.
+if (!empty($capabilities)) {
+ echo $OUTPUT->box(get_string('nocapabilitiesincontext', 'role'), 'generalbox boxaligncenter');
+
+} else {
+ // Print the capabilities overrideable in this context
+ echo $OUTPUT->box_start('generalbox capbox');
- if ($roleid) {
- /// Show UI for overriding roles.
-
- if (!empty($capabilities)) {
- echo $OUTPUT->box(get_string('nocapabilitiesincontext', 'role'), 'generalbox boxaligncenter');
-
- } else {
- // Print the capabilities overrideable in this context
- echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
-
- if ($showadvanced) {
- $showadvancedlabel = get_string('hideadvanced', 'form');
- } else {
- $showadvancedlabel = get_string('showadvanced', 'form');
- }
- ?>
-
+ box_end();
- box_end();
+}
- }
-
- /// Print a form to swap roles, and a link back to the all roles list.
- echo '';
- $select = new single_select(new moodle_url($baseurl), 'roleid', $nameswithcounts, $roleid, null);
- $select->label = get_string('overrideanotherrole', 'role');
- echo $OUTPUT->render($select);
- echo '
' . get_string('backtoallroles', 'role') . '
';
- echo '
'.$rolename.' ',
- $description, $overridecounts[$roleid]);
- }
-
- echo $OUTPUT->table($table);
-
- if (!$isfrontpage && ($url = get_context_url($context))) {
- echo '';
- } else if ($returnurl) {
- echo '';
- }
- }
+// Print a form to swap roles, and a link back to the all roles list.
+echo '';
+$select = new single_select(new moodle_url($baseurl), 'roleid', $nameswithcounts, $roleid, null);
+$select->label = get_string('overrideanotherrole', 'role');
+echo $OUTPUT->render($select);
+echo '
' . get_string('backtoallroles', 'role') . '
';
+echo '
$a->role from the list of prohibited roles for capability $a->cap in context $a->context?';
+$string['confirmroleprevent'] = 'Do you really want to remove $a->role from the list of allowed roles for capability $a->cap in context $a->context?';
+$string['neededroles'] = 'Roles with permission';
+$string['permissionsincontext'] = 'Permissions in $a';
+$string['prohibitedroles'] = 'Prohibited';
+$string['roleallowheader'] = 'Allow role:';
+$string['roleallowinfo'] = 'Select a role to be added to the list of allowed roles in context $a->context, capability $a->cap:';
+$string['roleprohibitheader'] = 'Prohibit role';
+$string['roleprohibitinfo'] = 'Select a role to be added to the list of prohibited roles in context $a->context, capability $a->cap:';
+$string['roleselect'] = 'Select role';
+
//OBSOLETED in 1.9!
$string['course:viewcoursegrades'] = 'View course grades';
$string['user:viewusergrades'] = 'View user grades';
Index: version.php
===================================================================
RCS file: /cvsroot/moodle/moodle/version.php,v
retrieving revision 1.1462
diff -u -r1.1462 version.php
--- version.php 5 Mar 2010 00:41:58 -0000 1.1462
+++ version.php 5 Mar 2010 08:28:53 -0000
@@ -6,7 +6,7 @@
// This is compared against the values stored in the database to determine
// whether upgrades should be performed (see lib/db/*.php)
- $version = 2010021900; // YYYYMMDD = date of the last version bump
+ $version = 2010021901; // YYYYMMDD = date of the last version bump
// XX = daily increments
$release = '2.0 dev (Build: 20100305)'; // Human-friendly version name
Index: config-dist.php
===================================================================
RCS file: /cvsroot/moodle/moodle/config-dist.php,v
retrieving revision 1.128
diff -u -r1.128 config-dist.php
--- config-dist.php 5 Jan 2010 22:18:03 -0000 1.128
+++ config-dist.php 5 Mar 2010 08:28:53 -0000
@@ -237,12 +237,6 @@
// logs in. The site front page will always show the same (logged-out) view.
// $CFG->disablemycourses = true;
//
-// Enable this option if you need fully working default frontpage role,
-// please note it might cause serious memory and performance issues,
-// also there should not be any negative capabilities in default
-// frontpage role (MDL-19039).
-// $CFG->fullusersbycapabilityonfrontpage = true;
-//
// If this setting is set to true, then Moodle will track the IP of the
// current user to make sure it hasn't changed during a session. This
// will prevent the possibility of sessions being hijacked via XSS, but it
Index: lib/db/access.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/db/access.php,v
retrieving revision 1.119
diff -u -r1.119 access.php
--- lib/db/access.php 19 Feb 2010 19:11:06 -0000 1.119
+++ lib/db/access.php 5 Mar 2010 08:29:07 -0000
@@ -440,6 +440,19 @@
)
),
+ 'moodle/role:review' => array(
+
+ 'riskbitmask' => RISK_PERSONAL,
+
+ 'captype' => 'read',
+ 'contextlevel' => CONTEXT_COURSE,
+ 'legacy' => array(
+ 'teacher' => CAP_ALLOW,
+ 'editingteacher' => CAP_ALLOW,
+ 'admin' => CAP_ALLOW
+ )
+ ),
+
'moodle/role:override' => array(
'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
Index: admin/roles/permissions_forms.php
===================================================================
RCS file: admin/roles/permissions_forms.php
diff -N admin/roles/permissions_forms.php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ admin/roles/permissions_forms.php 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,101 @@
+.
+
+/**
+ * This script serves draft files of current user
+ *
+ * @package moodlecore
+ * @subpackage role
+ * @copyright 2009 Petr Skoda (skodak) info@skodak.org
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+
+require_once("$CFG->libdir/formslib.php");
+
+
+class role_allow_form extends moodleform {
+
+ // Define the form
+ function definition() {
+ global $CFG;
+
+ $mform = $this->_form;
+ list($context, $capability, $overridableroles) = $this->_customdata;
+
+ list($needed, $forbidden) = get_roles_with_cap_in_context($context, $capability->name);
+ foreach($needed as $id=>$unused) {
+ unset($overridableroles[$id]);
+ }
+ foreach($forbidden as $id=>$unused) {
+ unset($overridableroles[$id]);
+ }
+
+ $mform->addElement('header', 'allowheader', get_string('roleallowheader', 'role'));
+
+ $mform->addElement('select', 'roleid', get_string('roleselect', 'role'), $overridableroles);
+
+ $mform->addElement('hidden','capability');
+ $mform->setType('capability', PARAM_CAPABILITY);
+ $mform->setDefault('capability', $capability->name);
+
+ $mform->addElement('hidden','contextid');
+ $mform->setType('contextid', PARAM_INT);
+ $mform->setDefault('contextid', $context->id);
+
+ $mform->addElement('hidden','allow');
+ $mform->setType('allow', PARAM_INT);
+ $mform->setDefault('allow', 1);
+
+ $this->add_action_buttons(true, get_string('allow', 'role'));
+ }
+}
+
+
+class role_prohibit_form extends moodleform {
+
+ // Define the form
+ function definition() {
+ global $CFG;
+
+ $mform = $this->_form;
+ list($context, $capability, $overridableroles) = $this->_customdata;
+
+ list($needed, $forbidden) = get_roles_with_cap_in_context($context, $capability->name);
+ foreach($forbidden as $id=>$unused) {
+ unset($overridableroles[$id]);
+ }
+
+ $mform->addElement('header', 'ptohibitheader', get_string('roleprohibitheader', 'role'));
+
+ $mform->addElement('select', 'roleid', get_string('roleselect', 'role'), $overridableroles);
+
+ $mform->addElement('hidden','capability');
+ $mform->setType('capability', PARAM_CAPABILITY);
+ $mform->setDefault('capability', $capability->name);
+
+ $mform->addElement('hidden','contextid');
+ $mform->setType('contextid', PARAM_INT);
+ $mform->setDefault('contextid', $context->id);
+
+ $mform->addElement('hidden','prohibit');
+ $mform->setType('prohibit', PARAM_INT);
+ $mform->setDefault('prohibit', 1);
+
+ $this->add_action_buttons(true, get_string('prohibit', 'role'));
+ }
+}
Index: pix/t/add.gif
===================================================================
RCS file: pix/t/add.gif
diff -N pix/t/add.gif
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pix/t/add.gif 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,1 @@
+GIF89a lll! , S` 5a ;
\ No newline at end of file
Index: admin/roles/permissions.php
===================================================================
RCS file: admin/roles/permissions.php
diff -N admin/roles/permissions.php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ admin/roles/permissions.php 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,252 @@
+.
+
+/**
+ * This script serves draft files of current user
+ *
+ * @package moodlecore
+ * @subpackage role
+ * @copyright 2009 Petr Skoda (skodak) info@skodak.org
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require('../../config.php');
+require_once("$CFG->dirroot/$CFG->admin/roles/lib.php");
+require_once("permissions_forms.php");
+
+$contextid = required_param('contextid',PARAM_INT);
+
+$roleid = optional_param('roleid', 0, PARAM_INT);
+$capability = optional_param('capability', false, PARAM_CAPABILITY);
+$confirm = optional_param('confirm', 0, PARAM_BOOL);
+$prevent = optional_param('prevent', 0, PARAM_BOOL);
+$allow = optional_param('allow', 0, PARAM_BOOL);
+$unprohibit = optional_param('unprohibit', 0, PARAM_BOOL);
+$prohibit = optional_param('prohibit', 0, PARAM_BOOL);
+
+// security first
+list($context, $course, $cm) = get_context_info_array($contextid);
+require_login($course, false, $cm);
+require_capability('moodle/role:review', $context);
+
+$PAGE->set_url('/admin/roles/permissions.php', array('contextid' => $contextid));
+$PAGE->set_context($context);
+
+$userid = 0;
+$tabfile = null;
+
+if ($course) {
+ $isfrontpage = ($context->contextlevel == CONTEXT_COURSE and $context->instanceid == SITEID);
+
+} else {
+ $isfrontpage = false;
+ if ($context->contextlevel == CONTEXT_USER) {
+ $courseid = optional_param('courseid', SITEID, PARAM_INT); // needed for user/tabs.php
+ $course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
+ $PAGE->url->param('courseid', $courseid);
+ $userid = $context->instanceid;
+ } else {
+ $course = $SITE;
+ }
+}
+
+$courseid = $course->id;
+
+
+// These are needed early because of tabs.php
+$assignableroles = get_assignable_roles($context, ROLENAME_BOTH);
+list($overridableroles, $overridecounts, $nameswithcounts) = get_overridable_roles($context, ROLENAME_BOTH, true);
+
+if ($capability) {
+ $capability = $DB->get_record('capabilities', array('name'=>$capability), '*', MUST_EXIST);
+}
+
+$allowoverrides = has_capability('moodle/role:override', $context);
+$allowsafeoverrides = has_capability('moodle/role:safeoverride', $context);
+
+$contextname = print_context_name($context);
+$title = get_string('permissionsincontext', 'role', $contextname);
+$straction = get_string('permissions', 'role'); // Used by tabs.php
+$PAGE->set_title($title);
+
+// Print the header and tabs
+if ($context->contextlevel == CONTEXT_SYSTEM) {
+ print_error('cannotoverridebaserole', 'error');
+
+} else if ($context->contextlevel == CONTEXT_USER) {
+ // NOTE: this is not linked from UI for now
+ $userid = $context->instanceid;
+ $user = $DB->get_record('user', array('id'=>$userid, 'deleted'=>0), '*', MUST_EXIST);
+ $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
+
+ // course header
+ if ($isfrontpage) {
+ $PAGE->set_heading($course->fullname);
+ } else {
+ if (has_capability('moodle/course:viewparticipants', get_context_instance(CONTEXT_COURSE, $courseid))) {
+ $PAGE->navbar->add(get_string('participants'), new moodle_url('/user/index.php', array('id'=>$courseid)));
+ }
+ $PAGE->set_heading($fullname);
+ }
+ $PAGE->navbar->add($fullname, new moodle_url("$CFG->wwwroot/user/view.php", array('id'=>$userid,'course'=>$courseid)));
+ $PAGE->navbar->add($straction);
+
+ $showroles = 1;
+ $currenttab = 'permissions';
+ $tabfile = $CFG->dirroot.'/user/tabs.php';
+
+} else if ($isfrontpage) {
+ admin_externalpage_setup('frontpageroles', '', array(), $PAGE->url);
+ $currenttab = 'permissions';
+ $tabfile = 'tabs.php';
+
+} else {
+ $currenttab = 'permissions';
+ $tabfile = 'tabs.php';
+}
+
+// handle confirmations and actions
+if ($prevent and isset($overridableroles[$roleid]) and $capability) {
+ if ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability))) {
+ if ($confirm and data_submitted() and confirm_sesskey()) {
+ role_change_permission($roleid, $context, $capability->name, CAP_PREVENT);
+ redirect($PAGE->url);
+
+ } else {
+ $a = (object)array('cap'=>get_capability_docs_link($capability)." ($capability->name)", 'role'=>$overridableroles[$roleid], 'context'=>$contextname);
+ $message = get_string('confirmroleprevent', 'role', $a);
+ $continueurl = new moodle_url($PAGE->url, array('contextid'=>$context->id, 'roleid'=>$roleid, 'capability'=>$capability->name, 'prevent'=>1, 'sesskey'=>sesskey(), 'confirm'=>1));
+
+ echo $OUTPUT->header();
+ if ($tabfile) {
+ include($tabfile);
+ }
+ echo $OUTPUT->heading($title);
+ echo $OUTPUT->confirm($message, $continueurl, $PAGE->url);
+ echo $OUTPUT->footer();
+ die;
+ }
+ }
+}
+
+if ($unprohibit and isset($overridableroles[$roleid]) and $capability) {
+ if ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability))) {
+ if ($confirm and data_submitted() and confirm_sesskey()) {
+ role_change_permission($roleid, $context, $capability->name, CAP_INHERIT);
+ redirect($PAGE->url);
+
+ } else {
+ $a = (object)array('cap'=>get_capability_docs_link($capability)." ($capability->name)", 'role'=>$overridableroles[$roleid], 'context'=>$contextname);
+ $message = get_string('confirmroleunprohibit', 'role', $a);
+ $continueurl = new moodle_url($PAGE->url, array('contextid'=>$context->id, 'roleid'=>$roleid, 'capability'=>$capability->name, 'unprohibit'=>1, 'sesskey'=>sesskey(), 'confirm'=>1));
+
+ echo $OUTPUT->header();
+ if ($tabfile) {
+ include($tabfile);
+ }
+ echo $OUTPUT->heading($title);
+ echo $OUTPUT->confirm($message, $continueurl, $PAGE->url);
+ echo $OUTPUT->footer();
+ die;
+ }
+ }
+}
+
+if ($allow and $capability) {
+ if ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability))) {
+ $mform = new role_allow_form(null, array($context, $capability, $overridableroles));
+ if ($mform->is_cancelled()) {
+ redirect($PAGE->url);
+
+ } else if ($data = $mform->get_data() and !empty($data->roleid)) {
+ $roleid = $data->roleid;
+ if (isset($overridableroles[$roleid])) {
+ role_change_permission($roleid, $context, $capability->name, CAP_ALLOW);
+ }
+ redirect($PAGE->url);
+
+ } else {
+ $a = (object)array('cap'=>get_capability_docs_link($capability)." ($capability->name)", 'context'=>$contextname);
+ $message = get_string('roleallowinfo', 'role', $a);
+
+ echo $OUTPUT->header();
+ if ($tabfile) {
+ include($tabfile);
+ }
+ echo $OUTPUT->heading($title);
+ echo $OUTPUT->box($message);
+ $mform->display();
+ echo $OUTPUT->footer();
+ die;
+ }
+ }
+}
+
+if ($prohibit and $capability) {
+ if ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability))) {
+ $mform = new role_prohibit_form(null, array($context, $capability, $overridableroles));
+ if ($mform->is_cancelled()) {
+ redirect($PAGE->url);
+
+ } else if ($data = $mform->get_data() and !empty($data->roleid)) {
+ $roleid = $data->roleid;
+ if (isset($overridableroles[$roleid])) {
+ role_change_permission($roleid, $context, $capability->name, CAP_PROHIBIT);
+ }
+ redirect($PAGE->url);
+
+ } else {
+ $a = (object)array('cap'=>get_capability_docs_link($capability)." ($capability->name)", 'context'=>$contextname);
+ $message = get_string('roleprohibitinfo', 'role', $a);
+
+ echo $OUTPUT->header();
+ if ($tabfile) {
+ include($tabfile);
+ }
+ echo $OUTPUT->box($message);
+ $mform->display();
+ echo $OUTPUT->footer();
+ die;
+ }
+ }
+}
+
+echo $OUTPUT->header();
+if ($tabfile) {
+ include($tabfile);
+}
+echo $OUTPUT->heading($title);
+
+$table = new permissions_table($context, $contextname, $allowoverrides, $allowsafeoverrides, $overridableroles);
+echo $OUTPUT->box_start('generalbox capbox');
+// print link to advanced override page
+if ($overridableroles) {
+ $overrideurl = new moodle_url('/admin/roles/override.php', array('contextid' => $context->id));
+ $select = new single_select($overrideurl, 'roleid', $nameswithcounts);
+ $select->label = get_string('advancedoverride', 'role');
+ echo ''.$OUTPUT->render($select).'
';
+}
+$table->display();
+echo $OUTPUT->box_end();
+
+
+if ($context->contextlevel > CONTEXT_USER) {
+ echo '';
+}
+
+echo $OUTPUT->footer($course);
+