L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIxed some typos in get_role_users and count_role_users to do with parent contexts

Browse Source
This commit is contained in:
moodler
2006-10-01 07:02:53 +00:00
parent 42cd7a105b
commit 7ea02fe987
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/accesslib.php
+10 -8
View File
@@ -2782,12 +2782,12 @@ function get_users_by_capability($context, $capability, $fields='', $sort='',
* @param bool parent if true, get list of users assigned in higher context too
* @return array()
*/
function get_role_users($roleid, $context, $parent=false, $fields='u.*') {
function get_role_users($roleid, $context, $parent=false, $fields='u.*', $sort='u.lastname ASC') {
global $CFG;
if ($parent) {
if ($contexts = get_parent_contexts($context)) {
$parentcontexts = 'r.contextid IN ('.implode(',', $contexts).')';
$parentcontexts = ' OR r.contextid IN ('.implode(',', $contexts).')';
} else {
$parentcontexts = '';
}
@@ -2795,12 +2795,14 @@ function get_role_users($roleid, $context, $parent=false, $fields='u.*') {
$parentcontexts = '';
}
$SQL = "select $fields
from {$CFG->prefix}role_assignments r,
$SQL = "SELECT $fields
FROM {$CFG->prefix}role_assignments r,
{$CFG->prefix}user u
where (r.contextid = $context->id $parentcontexts)
and r.roleid = $roleid
and u.id = r.userid"; // join now so that we can just use fullname() later
WHERE (r.contextid = $context->id $parentcontexts)
AND r.roleid = $roleid
AND u.id = r.userid
ORDER BY $sort
"; // join now so that we can just use fullname() later
return get_records_sql($SQL);
}
@@ -2817,7 +2819,7 @@ function count_role_users($roleid, $context, $parent=false) {
if ($parent) {
if ($contexts = get_parent_contexts($context)) {
$parentcontexts = 'r.contextid IN ('.implode(',', $contexts).')';
$parentcontexts = ' OR r.contextid IN ('.implode(',', $contexts).')';
} else {
$parentcontexts = '';
}