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

MDL-8138, adding another flag to hopefully speed up the loop

Browse source
This commit is contained in:
toyomoyo 2007-01-11 06:41:38 +00:00
parent ad77001dfa
commit 0de75c4cfc
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/accesslib.php
View file

@ -826,7 +826,7 @@ function load_user_capability($capability='', $context = NULL, $userid='') {
* please help test if this code is working / runs faster for you. please report bugs asap! * please help test if this code is working / runs faster for you. please report bugs asap!
* this code only affects overrides. Normal capabilities are not affected * this code only affects overrides. Normal capabilities are not affected
*/ */
$capflags = array(); // temporary flag
/// 1) quick sql to get all roles assigned to this user /// 1) quick sql to get all roles assigned to this user
if ($roles = get_records_sql("SELECT roleid, roleid if ($roles = get_records_sql("SELECT roleid, roleid
FROM {$CFG->prefix}role_assignments FROM {$CFG->prefix}role_assignments
@ -842,11 +842,25 @@ function load_user_capability($capability='', $context = NULL, $userid='') {
/// 3) For each context, we find all parent contexts, and see if it's relevant /// 3) For each context, we find all parent contexts, and see if it's relevant
/// it is relevant if for this role, there's a role assignment in 1 parent context or more /// it is relevant if for this role, there's a role assignment in 1 parent context or more
foreach ($overrides as $loverride) { foreach ($overrides as $loverride) {
// setting up a flag here, if this flag is set to 0, we ignore
// all capabilities at this contextid for this role, i.e. no need to search
// moodle/role:asign, moodle/role:override at context 10 for role 2
// if we know there's no valid parents for context 10, role 2 for any other
// capability override
if (isset($capflags[$trole->roleid][$loverride->contextid]) && $capflags[$trole->roleid][$loverride->contextid] == 0) {
continue;
}
$lcontext = get_context_instance_by_id($loverride->contextid); $lcontext = get_context_instance_by_id($loverride->contextid);
// possible to do some caching in get_parent_contexts too // possible to do some caching in get_parent_contexts too
$lparents = get_parent_contexts($lcontext); $lparents = get_parent_contexts($lcontext);
$lparents[] = $lcontext->id; // add self $lparents[] = $lcontext->id; // add self
// initialize, if not set
if(!isset($capflags[$trole->roleid][$loverride->contextid])) {
$capflags[$trole->roleid][$loverride->contextid] = 0;
}
/// we get all parent contexts, loop them /// we get all parent contexts, loop them
foreach ($lparents as $lparent) { foreach ($lparents as $lparent) {
@ -856,8 +870,8 @@ function load_user_capability($capability='', $context = NULL, $userid='') {
WHERE ra.userid = $userid WHERE ra.userid = $userid
AND ra.contextid = $lparent AND ra.contextid = $lparent
AND ra.roleid = $trole->roleid AND ra.roleid = $trole->roleid
$timesql")) { $timesql")) {
$llparent = get_context_instance_by_id($lparent); $llparent = get_context_instance_by_id($lparent);
$lloverride = get_context_instance_by_id($loverride->contextid); $lloverride = get_context_instance_by_id($loverride->contextid);
@ -867,10 +881,13 @@ function load_user_capability($capability='', $context = NULL, $userid='') {
$temprec->id2 = $lcontext->id; $temprec->id2 = $lcontext->id;
$temprec->sum = $loverride->permission; $temprec->sum = $loverride->permission;
$capflags[$trole->roleid][$loverride->contextid]++; // positive value, hit
/// add to the array for processing /// add to the array for processing
$capabilities[] = $temprec; $capabilities[] = $temprec;
} }
} }
// ($capflags[$trole->roleid][$loverride->contextid]) would still be 0 if no parent found
// subsequent contextid can be skipped
} }
} }
} }
@ -2623,7 +2640,7 @@ function get_parent_contexts($context) {
return array(); return array();
} else { } else {
$res = array($parent->id); $res = array($parent->id);
$pcontexts[$context->id] = $res; $pcontexts[$context->id] = $res;
return $res; return $res;
} }
break; break;
@ -2633,7 +2650,7 @@ function get_parent_contexts($context) {
return array(); return array();
} else { } else {
$res = array($parent->id); $res = array($parent->id);
$pcontexts[$context->id] = $res; $pcontexts[$context->id] = $res;
return $res; return $res;
} }
break; break;