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

MDL-21655 big scary enrolment and roles improvements - see tacker for list of changes, includes other minor fixes too

Browse Source
This commit is contained in:
Petr Skoda
2010-03-31 07:41:31 +00:00
parent d1d4813ff2
commit 4f0c2d0009
225 changed files with 2941 additions and 3097 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/statslib.php
+3 -6
View File
@@ -855,24 +855,21 @@ function stats_cron_monthly() {
* @param bool $includedoanything include also admins
* @return array ra join and where string
*/
function stats_get_enrolled_sql($limit, $includedoanything) {
function stats_get_enrolled_sql($limit, $ignored) {
global $CFG;
static $n = 0;
$params = array();
$n++;
$adm = $includedoanything ? " OR rc.capability = :sge_doanything_$n " : "";
$params['sge_doanything_'.$n] = 'moodle/site:doanything';
$join = "JOIN {context} ctx ON ctx.id = ra.contextid
CROSS JOIN {course} c
JOIN {role_capabilities} rc ON rc.roleid = ra.roleid";
$where = "((rc.capability = :sge_courseview_$n $adm)
$where = "((rc.capability = :sge_courseview_$n)
AND rc.permission = 1 AND rc.contextid = ".SYSCONTEXTID."
AND (ctx.contextlevel = ".CONTEXT_SYSTEM."
OR (c.id = ctx.instanceid AND ctx.contextlevel = ".CONTEXT_COURSE.")";
$params['sge_courseview_'.$n] = 'moodle/course:view';
$params['sge_courseview_'.$n] = 'moodle/course:participate';
for($i=1; $i<=$limit; $i++) {
if ($i == 1) {