moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

course categories: MDL-17502 when deleting a category and its contents, check moodle/course:delete capability.

Browse source 
* Note: this would never lead to problems with default role definions.
* Also ended up mostly rewriting delete_category_form to simplify the messages that are displayed.
* New helper function require_all_capabilities, a bit like require_any_capability.
This commit is contained in:
tjhunt 2008-12-08 07:28:19 +00:00
parent fc11edbfa0
commit 8a1b1c328d
6 changed files with 119 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

7
course/lib.php
View file

@ -1749,8 +1749,9 @@ function get_child_categories($parentid) {
*
* @param array $list For output, accumulates an array categoryid => full category path name
* @param array $parents For output, accumulates an array categoryid => list of parent category ids.
* @param string $requiredcapability if given, only categories where the current
* user has this capability will be added to $list.
* @param string/array $requiredcapability if given, only categories where the current
* user has this capability will be added to $list. Can also be an array of capabilities,
* in which case they are all required.
* @param integer $excludeid Omit this category and its children from the lists built.
* @param object $category Build the tree starting at this category - otherwise starts at the top level.
* @param string $path For internal use, as part of recursive calls.
@ -1787,7 +1788,7 @@ function make_categories_list(&$list, &$parents, $requiredcapability = '',
if ($requiredcapability) {
ensure_context_subobj_present($category, CONTEXT_COURSECAT);
}
if (!$requiredcapability || has_capability($requiredcapability, $category->context)) {
if (!$requiredcapability || has_all_capabilities($requiredcapability, $category->context)) {
$list[$category->id] = $path;
}
}