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

Merge branch 'MDL-33776' of git://github.com/mouneyrac/moodle

Browse source
This commit is contained in:
Dan Poltawski 2012-07-02 14:12:53 +08:00
commit 9bf41fb6aa
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
course/externallib.php
View file

@ -904,9 +904,10 @@ class core_course_external extends external_api {
'"parent" (int) the parent category id,'. '"parent" (int) the parent category id,'.
'"idnumber" (string) category idnumber'. '"idnumber" (string) category idnumber'.
' - user must have \'moodle/category:manage\' to search on idnumber,'. ' - user must have \'moodle/category:manage\' to search on idnumber,'.
'"visible" (int) whether the category is visible or not'. '"visible" (int) whether the returned categories must be visible or hidden. If the key is not passed,
then the function return all categories that the user can see.'.
' - user must have \'moodle/category:manage\' or \'moodle/category:viewhiddencategories\' to search on visible,'. ' - user must have \'moodle/category:manage\' or \'moodle/category:viewhiddencategories\' to search on visible,'.
'"theme" (string) category theme'. '"theme" (string) only return the categories having this theme'.
' - user must have \'moodle/category:manage\' to search on theme'), ' - user must have \'moodle/category:manage\' to search on theme'),
'value' => new external_value(PARAM_RAW, 'the value to match') 'value' => new external_value(PARAM_RAW, 'the value to match')
) )
@ -1017,10 +1018,22 @@ class core_course_external extends external_api {
if ($categories and !empty($params['addsubcategories'])) { if ($categories and !empty($params['addsubcategories'])) {
$newcategories = array(); $newcategories = array();
// Check if we required visible/theme checks.
$additionalselect = '';
$additionalparams = array();
if (isset($conditions['visible'])) {
$additionalselect .= ' AND visible = :visible';
$additionalparams['visible'] = $conditions['visible'];
}
if (isset($conditions['theme'])) {
$additionalselect .= ' AND theme= :theme';
$additionalparams['theme'] = $conditions['theme'];
}
foreach ($categories as $category) { foreach ($categories as $category) {
$sqllike = $DB->sql_like('path', ':path'); $sqlselect = $DB->sql_like('path', ':path') . $additionalselect;
$sqlparams = array('path' => $category->path.'/%'); // It will NOT include the specified category. $sqlparams = array('path' => $category->path.'/%') + $additionalparams; // It will NOT include the specified category.
$subcategories = $DB->get_records_select('course_categories', $sqllike, $sqlparams); $subcategories = $DB->get_records_select('course_categories', $sqlselect, $sqlparams);
$newcategories = $newcategories + $subcategories; // Both arrays have integer as keys. $newcategories = $newcategories + $subcategories; // Both arrays have integer as keys.
} }
$categories = $categories + $newcategories; $categories = $categories + $newcategories;