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

Utilize $CFG->calendar_adminseesall and part of Penny's patches (for bug 2804)

Browse Source 
to improve performance: if the admin wants to see all events, there's no need
to make even one query for course groupmode.
This commit is contained in:
defacer
2005-04-12 01:09:31 +00:00
parent b53f385b2c
commit 257e3f4c61
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/lib.php
+31 -20
View File
@@ -980,7 +980,9 @@ function calendar_set_referring_course($courseid) {
}
function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NULL, $groupeventsfrom = NULL, $ignorefilters = false) {
global $SESSION, $USER;
global $SESSION, $USER, $CFG;
//$GLOBALS['db']->debug = true;
// Insidious bug-wannabe: setting $SESSION->cal_courses_shown to $course->id would cause
// the code to function incorrectly UNLESS we convert it to an integer. One case where
@@ -1035,33 +1037,42 @@ function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NU
else if(is_array($groupeventsfrom)) {
$groupcourses = array_keys($groupeventsfrom);
}
$grouparray = array();
// We already have the courses to examine in $courses
// For each course...
foreach($groupcourses as $courseid) {
// If the user is an editing teacher in there,
if(!empty($USER->id) && isteacheredit($courseid, $USER->id)) {
// Show events from all groups
if(($grouprecords = get_groups($courseid)) !== false) {
$grouparray = array_merge($grouparray, array_keys($grouprecords));
}
}
// Otherwise show events from the group he is a member of
else if(isset($USER->groupmember[$courseid])) {
$grouparray[] = $USER->groupmember[$courseid];
}
}
if(empty($grouparray)) {
$group = false;
if(isadmin() && !empty($CFG->calendar_adminseesall)) {
$group = true;
}
else {
$group = $grouparray;
$grouparray = array();
// We already have the courses to examine in $courses
// For each course...
foreach($groupcourses as $courseid) {
// If the user is an editing teacher in there,
if(!empty($USER->id) && isteacheredit($courseid, $USER->id)) {
// Show events from all groups
if(($grouprecords = get_groups($courseid)) !== false) {
$grouparray = array_merge($grouparray, array_keys($grouprecords));
}
}
// Otherwise show events from the group he is a member of
else if(isset($USER->groupmember[$courseid])) {
$grouparray[] = $USER->groupmember[$courseid];
}
}
if(empty($grouparray)) {
$group = false;
}
else {
$group = $grouparray;
}
}
}
else {
$group = false;
}
$GLOBALS['db']->debug = false;
}
function calendar_edit_event_allowed($event) {