WebSVN – Moodle – Diff – /calendar/lib.php

     if ($ignorefilters || ($isvaliduser && calendar_show_event_type(CALENDAR_EVENT_USER, $user))) {
         $userid = $user->id;
+    }
-    if (!empty($courseeventsfrom) && (calendar_show_event_type(CALENDAR_EVENT_GROUP, $user) || $ignorefilters)) {
-        if (count($courseeventsfrom) == 1) {
-            $course = reset($courseeventsfrom);
+    if (!empty($courseeventsfrom) && (calendar_show_event_type(CALENDAR_EVENT_GROUP, $user) || $ignorefilters)) {
-            if (has_any_capability($allgroupscaps, \context_course::instance($course->id))) {
+        if (!empty($CFG->calendar_adminseesall) && has_any_capability($allgroupscaps, \context_system::instance())) {
-                $coursegroups = groups_get_all_groups($course->id, 0, 0, 'g.id');
+            $group = true;
-                $group = array_keys($coursegroups);
+        } else if ($isvaliduser) {
-            }
+            $groupids = [];
-        }
+            foreach ($courseeventsfrom as $courseid => $course) {
-        if ($group === false) {
+                if ($course->groupmode != NOGROUPS || !$course->groupmodeforce) {
-            if (!empty($CFG->calendar_adminseesall) && has_any_capability($allgroupscaps, \context_system::instance())) {
+                    if (has_all_capabilities($allgroupscaps, \context_course::instance($courseid))) {
-                $group = true;
+                        // User can access all groups in this course.
-            } else if ($isvaliduser) {
+                        // Get all the groups in this course.
-                $groupids = array();
+                        $coursegroups = groups_get_all_groups($course->id, 0, 0, 'g.id');
+                        $groupids = array_merge($groupids, array_keys($coursegroups));
-                foreach ($courseeventsfrom as $courseid => $course) {
+                    } else {
-                    if ($course->groupmode != NOGROUPS || !$course->groupmodeforce) {
+                        // User can only access their own groups.
-                        // If this course has groups, show events from all of those related to the current user.
+                        // Get the groups the user is in.
                         $coursegroups = groups_get_user_groups($course->id, $user->id);
                         $groupids = array_merge($groupids, $coursegroups['0']);
+                    }
+                }
-                }
+            }
-                if (!empty($groupids)) {
+            if (!empty($groupids)) {
-                    $group = $groupids;
                 $group = $groupids;
+            }
+        }
+    }
     if (empty($courses)) {

Proyectos de Subversion Moodle

(root)/calendar/lib.php – Rev 1 → 11