From 28e26dc476700ce6207d6b71e968a42b0885aa8f Mon Sep 17 00:00:00 2001
From: Peter Upfold <upfoldp@testvalley.hants.sch.uk>
Date: Fri, 2 Nov 2018 10:49:36 +0000
Subject: [PATCH 1/1] Load all events to which the user has permission

---
 calendar/externallib.php          | 7 ++++---
 calendar/lib.php                  | 5 +++--
 mod/book/classes/external.php     | 2 +-
 mod/chat/classes/external.php     | 2 +-
 mod/choice/classes/external.php   | 2 +-
 mod/data/classes/external.php     | 2 +-
 mod/feedback/classes/external.php | 2 +-
 mod/folder/classes/external.php   | 2 +-
 mod/forum/externallib.php         | 2 +-
 mod/glossary/classes/external.php | 2 +-
 mod/imscp/classes/external.php    | 2 +-
 mod/label/classes/external.php    | 2 +-
 mod/lesson/classes/external.php   | 2 +-
 mod/lti/classes/external.php      | 2 +-
 mod/page/classes/external.php     | 2 +-
 mod/quiz/classes/external.php     | 2 +-
 mod/resource/classes/external.php | 2 +-
 mod/scorm/classes/external.php    | 2 +-
 mod/survey/classes/external.php   | 2 +-
 mod/url/classes/external.php      | 2 +-
 mod/wiki/classes/external.php     | 2 +-
 mod/workshop/classes/external.php | 2 +-
 22 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/calendar/externallib.php b/calendar/externallib.php
index a7d7840..402e422 100644
--- a/calendar/externallib.php
+++ b/calendar/externallib.php
@@ -519,11 +519,12 @@ class core_calendar_external extends external_api {
             $params['aftereventid'] = null;
         }
 
-        $courses = enrol_get_my_courses('*', null, 0, [$courseid]);
+        $courses = enrol_get_my_courses('*', null, 0, [$courseid], true);
         $courses = array_values($courses);
+              
 
         if (empty($courses)) {
-            return [];
+            return [];    
         }
 
         $course = $courses[0];
@@ -604,7 +605,7 @@ class core_calendar_external extends external_api {
         }
 
         $renderer = $PAGE->get_renderer('core_calendar');
-        $courses = enrol_get_my_courses('*', null, 0, $params['courseids']);
+        $courses = enrol_get_my_courses('*', null, 0, $params['courseids'], true);
         $courses = array_values($courses);
 
         if (empty($courses)) {
diff --git a/calendar/lib.php b/calendar/lib.php
index 2a2b7a2..fe760c4 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -2189,7 +2189,8 @@ function calendar_view_event_allowed(calendar_event $event) {
         if (!$cm->uservisible) {
             return false;
         }
-        $mycourses = enrol_get_my_courses('id');
+        $mycourses = enrol_get_my_courses('id', null, 0, [], true);
+        
         return isset($mycourses[$courseid]);
     } else if ($event->categoryid) {
         // If this is a category we need to be able to see the category.
@@ -2203,7 +2204,7 @@ function calendar_view_event_allowed(calendar_event $event) {
         if (has_capability('moodle/calendar:manageentries', $event->context)) {
             return true;
         }
-        $mycourses = enrol_get_my_courses('id');
+        $mycourses = enrol_get_my_courses('id', null, 0, [], true);
         return isset($mycourses[$event->courseid]);
     } else if ($event->userid) {
         if ($event->userid != $USER->id) {
diff --git a/mod/book/classes/external.php b/mod/book/classes/external.php
index 189d2c6..03b1959 100644
--- a/mod/book/classes/external.php
+++ b/mod/book/classes/external.php
@@ -183,7 +183,7 @@ class mod_book_external extends external_api {
 
         $courses = array();
         if (empty($params['courseids'])) {
-            $courses = enrol_get_my_courses();
+            $courses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($courses);
         }
 
diff --git a/mod/chat/classes/external.php b/mod/chat/classes/external.php
index 0ef6566..cf94a66 100644
--- a/mod/chat/classes/external.php
+++ b/mod/chat/classes/external.php
@@ -527,7 +527,7 @@ class mod_chat_external extends external_api {
 
         $courses = array();
         if (empty($params['courseids'])) {
-            $courses = enrol_get_my_courses();
+            $courses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($courses);
         }
 
diff --git a/mod/choice/classes/external.php b/mod/choice/classes/external.php
index 8fc4e4c..6c7ddf2 100644
--- a/mod/choice/classes/external.php
+++ b/mod/choice/classes/external.php
@@ -480,7 +480,7 @@ class mod_choice_external extends external_api {
 
         $courses = array();
         if (empty($params['courseids'])) {
-            $courses = enrol_get_my_courses();
+            $courses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($courses);
         }
 
diff --git a/mod/data/classes/external.php b/mod/data/classes/external.php
index 649a633..dc71114 100644
--- a/mod/data/classes/external.php
+++ b/mod/data/classes/external.php
@@ -78,7 +78,7 @@ class mod_data_external extends external_api {
 
         $mycourses = array();
         if (empty($params['courseids'])) {
-            $mycourses = enrol_get_my_courses();
+            $mycourses = enrol_get_my_courses(null ,null, 0, [], true);
             $params['courseids'] = array_keys($mycourses);
         }
 
diff --git a/mod/feedback/classes/external.php b/mod/feedback/classes/external.php
index 9642de3..93de811 100644
--- a/mod/feedback/classes/external.php
+++ b/mod/feedback/classes/external.php
@@ -83,7 +83,7 @@ class mod_feedback_external extends external_api {
 
         $mycourses = array();
         if (empty($params['courseids'])) {
-            $mycourses = enrol_get_my_courses();
+            $mycourses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($mycourses);
         }
 
diff --git a/mod/folder/classes/external.php b/mod/folder/classes/external.php
index f875c92..3d5470c 100644
--- a/mod/folder/classes/external.php
+++ b/mod/folder/classes/external.php
@@ -140,7 +140,7 @@ class mod_folder_external extends external_api {
 
         $mycourses = array();
         if (empty($params['courseids'])) {
-            $mycourses = enrol_get_my_courses();
+            $mycourses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($mycourses);
         }
 
diff --git a/mod/forum/externallib.php b/mod/forum/externallib.php
index a92d3bd..4376c56 100644
--- a/mod/forum/externallib.php
+++ b/mod/forum/externallib.php
@@ -62,7 +62,7 @@ class mod_forum_external extends external_api {
 
         $courses = array();
         if (empty($params['courseids'])) {
-            $courses = enrol_get_my_courses();
+            $courses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($courses);
         }
 
diff --git a/mod/glossary/classes/external.php b/mod/glossary/classes/external.php
index e900e04..5529f85 100644
--- a/mod/glossary/classes/external.php
+++ b/mod/glossary/classes/external.php
@@ -200,7 +200,7 @@ class mod_glossary_external extends external_api {
         $courseids = $params['courseids'];
 
         if (empty($courseids)) {
-            $courses = enrol_get_my_courses();
+            $courses = enrol_get_my_courses(null, null, 0, [], true);
             $courseids = array_keys($courses);
         }
 
diff --git a/mod/imscp/classes/external.php b/mod/imscp/classes/external.php
index 85292af..1057ad3 100644
--- a/mod/imscp/classes/external.php
+++ b/mod/imscp/classes/external.php
@@ -138,7 +138,7 @@ class mod_imscp_external extends external_api {
 
         $courses = array();
         if (empty($params['courseids'])) {
-            $courses = enrol_get_my_courses();
+            $courses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($courses);
         }
 
diff --git a/mod/label/classes/external.php b/mod/label/classes/external.php
index 064af2d..3207d33 100644
--- a/mod/label/classes/external.php
+++ b/mod/label/classes/external.php
@@ -75,7 +75,7 @@ class mod_label_external extends external_api {
 
         $mycourses = array();
         if (empty($params['courseids'])) {
-            $mycourses = enrol_get_my_courses();
+            $mycourses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($mycourses);
         }
 
diff --git a/mod/lesson/classes/external.php b/mod/lesson/classes/external.php
index d3ff019..a53d591 100644
--- a/mod/lesson/classes/external.php
+++ b/mod/lesson/classes/external.php
@@ -121,7 +121,7 @@ class mod_lesson_external extends external_api {
 
         $mycourses = array();
         if (empty($params['courseids'])) {
-            $mycourses = enrol_get_my_courses();
+            $mycourses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($mycourses);
         }
 
diff --git a/mod/lti/classes/external.php b/mod/lti/classes/external.php
index e9ca83e..76fcb85 100644
--- a/mod/lti/classes/external.php
+++ b/mod/lti/classes/external.php
@@ -278,7 +278,7 @@ class mod_lti_external extends external_api {
 
         $mycourses = array();
         if (empty($params['courseids'])) {
-            $mycourses = enrol_get_my_courses();
+            $mycourses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($mycourses);
         }
 
diff --git a/mod/page/classes/external.php b/mod/page/classes/external.php
index 8b10f1e..c5f293b 100644
--- a/mod/page/classes/external.php
+++ b/mod/page/classes/external.php
@@ -140,7 +140,7 @@ class mod_page_external extends external_api {
 
         $mycourses = array();
         if (empty($params['courseids'])) {
-            $mycourses = enrol_get_my_courses();
+            $mycourses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($mycourses);
         }
 
diff --git a/mod/quiz/classes/external.php b/mod/quiz/classes/external.php
index 684dd2d..b2b4483 100644
--- a/mod/quiz/classes/external.php
+++ b/mod/quiz/classes/external.php
@@ -77,7 +77,7 @@ class mod_quiz_external extends external_api {
 
         $mycourses = array();
         if (empty($params['courseids'])) {
-            $mycourses = enrol_get_my_courses();
+            $mycourses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($mycourses);
         }
 
diff --git a/mod/resource/classes/external.php b/mod/resource/classes/external.php
index 539aaf5..491067a 100644
--- a/mod/resource/classes/external.php
+++ b/mod/resource/classes/external.php
@@ -140,7 +140,7 @@ class mod_resource_external extends external_api {
 
         $mycourses = array();
         if (empty($params['courseids'])) {
-            $mycourses = enrol_get_my_courses();
+            $mycourses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($mycourses);
         }
 
diff --git a/mod/scorm/classes/external.php b/mod/scorm/classes/external.php
index 3045fa3..3bada48 100644
--- a/mod/scorm/classes/external.php
+++ b/mod/scorm/classes/external.php
@@ -665,7 +665,7 @@ class mod_scorm_external extends external_api {
 
         $courses = array();
         if (empty($params['courseids'])) {
-            $courses = enrol_get_my_courses();
+            $courses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($courses);
         }
 
diff --git a/mod/survey/classes/external.php b/mod/survey/classes/external.php
index 0d53c41..4980d51 100644
--- a/mod/survey/classes/external.php
+++ b/mod/survey/classes/external.php
@@ -74,7 +74,7 @@ class mod_survey_external extends external_api {
 
         $mycourses = array();
         if (empty($params['courseids'])) {
-            $mycourses = enrol_get_my_courses();
+            $mycourses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($mycourses);
         }
 
diff --git a/mod/url/classes/external.php b/mod/url/classes/external.php
index aba5d40..3d476b9 100644
--- a/mod/url/classes/external.php
+++ b/mod/url/classes/external.php
@@ -140,7 +140,7 @@ class mod_url_external extends external_api {
 
         $mycourses = array();
         if (empty($params['courseids'])) {
-            $mycourses = enrol_get_my_courses();
+            $mycourses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($mycourses);
         }
 
diff --git a/mod/wiki/classes/external.php b/mod/wiki/classes/external.php
index 7195a66..0836309 100644
--- a/mod/wiki/classes/external.php
+++ b/mod/wiki/classes/external.php
@@ -74,7 +74,7 @@ class mod_wiki_external extends external_api {
 
         $mycourses = array();
         if (empty($params['courseids'])) {
-            $mycourses = enrol_get_my_courses();
+            $mycourses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($mycourses);
         }
 
diff --git a/mod/workshop/classes/external.php b/mod/workshop/classes/external.php
index 3c37a45..4f9ad40 100644
--- a/mod/workshop/classes/external.php
+++ b/mod/workshop/classes/external.php
@@ -81,7 +81,7 @@ class mod_workshop_external extends external_api {
 
         $mycourses = array();
         if (empty($params['courseids'])) {
-            $mycourses = enrol_get_my_courses();
+            $mycourses = enrol_get_my_courses(null, null, 0, [], true);
             $params['courseids'] = array_keys($mycourses);
         }
 
-- 
1.8.3.1