From 583b02e4059b67af95db947cd6eaf4fb3088909c Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Tue, 6 Oct 2015 13:25:27 +0800
Subject: [PATCH] MDL-51664 external: Update usage of
 external_util::validate_courses

---
 mod/book/classes/external.php   | 6 ++++--
 mod/chat/classes/external.php   | 6 ++++--
 mod/choice/classes/external.php | 6 ++++--
 mod/forum/externallib.php       | 6 ++++--
 mod/imscp/classes/external.php  | 6 ++++--
 mod/scorm/classes/external.php  | 6 ++++--
 6 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/mod/book/classes/external.php b/mod/book/classes/external.php
index 6ae937dc7f2..34d1493d515 100644
--- a/mod/book/classes/external.php
+++ b/mod/book/classes/external.php
@@ -181,14 +181,16 @@ class mod_book_external extends external_api {
 
         $params = self::validate_parameters(self::get_books_by_courses_parameters(), array('courseids' => $courseids));
 
+        $courses = array();
         if (empty($params['courseids'])) {
-            $params['courseids'] = array_keys(enrol_get_my_courses());
+            $courses = enrol_get_my_courses();
+            $params['courseids'] = array_keys($courses);
         }
 
         // Ensure there are courseids to loop through.
         if (!empty($params['courseids'])) {
 
-            list($courses, $warnings) = external_util::validate_courses($params['courseids']);
+            list($courses, $warnings) = external_util::validate_courses($params['courseids'], $courses);
 
             // Get the books in this course, this function checks users visibility permissions.
             // We can avoid then additional validate_context calls.
diff --git a/mod/chat/classes/external.php b/mod/chat/classes/external.php
index ba542295996..f78dd1820dd 100644
--- a/mod/chat/classes/external.php
+++ b/mod/chat/classes/external.php
@@ -523,14 +523,16 @@ class mod_chat_external extends external_api {
 
         $params = self::validate_parameters(self::get_chats_by_courses_parameters(), array('courseids' => $courseids));
 
+        $courses = array();
         if (empty($params['courseids'])) {
-            $params['courseids'] = array_keys(enrol_get_my_courses());
+            $courses = enrol_get_my_courses();
+            $params['courseids'] = array_keys($courses);
         }
 
         // Ensure there are courseids to loop through.
         if (!empty($params['courseids'])) {
 
-            list($courses, $warnings) = external_util::validate_courses($params['courseids']);
+            list($courses, $warnings) = external_util::validate_courses($params['courseids'], $courses);
 
             // Get the chats in this course, this function checks users visibility permissions.
             // We can avoid then additional validate_context calls.
diff --git a/mod/choice/classes/external.php b/mod/choice/classes/external.php
index 306dda3af27..a3171ff1015 100644
--- a/mod/choice/classes/external.php
+++ b/mod/choice/classes/external.php
@@ -480,14 +480,16 @@ class mod_choice_external extends external_api {
 
         $params = self::validate_parameters(self::get_choices_by_courses_parameters(), array('courseids' => $courseids));
 
+        $courses = array();
         if (empty($params['courseids'])) {
-            $params['courseids'] = array_keys(enrol_get_my_courses());
+            $courses = enrol_get_my_courses();
+            $params['courseids'] = array_keys($courses);
         }
 
         // Ensure there are courseids to loop through.
         if (!empty($params['courseids'])) {
 
-            list($courses, $warnings) = external_util::validate_courses($params['courseids']);
+            list($courses, $warnings) = external_util::validate_courses($params['courseids'], $courses);
 
             // Get the choices in this course, this function checks users visibility permissions.
             // We can avoid then additional validate_context calls.
diff --git a/mod/forum/externallib.php b/mod/forum/externallib.php
index d41444d71a6..564060b6518 100644
--- a/mod/forum/externallib.php
+++ b/mod/forum/externallib.php
@@ -60,8 +60,10 @@ class mod_forum_external extends external_api {
 
         $params = self::validate_parameters(self::get_forums_by_courses_parameters(), array('courseids' => $courseids));
 
+        $courses = array();
         if (empty($params['courseids'])) {
-            $params['courseids'] = array_keys(enrol_get_my_courses());
+            $courses = enrol_get_my_courses();
+            $params['courseids'] = array_keys($courses);
         }
 
         // Array to store the forums to return.
@@ -71,7 +73,7 @@ class mod_forum_external extends external_api {
         // Ensure there are courseids to loop through.
         if (!empty($params['courseids'])) {
 
-            list($courses, $warnings) = external_util::validate_courses($params['courseids']);
+            list($courses, $warnings) = external_util::validate_courses($params['courseids'], $courses);
 
             // Get the forums in this course. This function checks users visibility permissions.
             $forums = get_all_instances_in_courses("forum", $courses);
diff --git a/mod/imscp/classes/external.php b/mod/imscp/classes/external.php
index 5a092dea773..4ae2fdda8c3 100644
--- a/mod/imscp/classes/external.php
+++ b/mod/imscp/classes/external.php
@@ -136,14 +136,16 @@ class mod_imscp_external extends external_api {
 
         $params = self::validate_parameters(self::get_imscps_by_courses_parameters(), array('courseids' => $courseids));
 
+        $courses = array();
         if (empty($params['courseids'])) {
-            $params['courseids'] = array_keys(enrol_get_my_courses());
+            $courses = enrol_get_my_courses();
+            $params['courseids'] = array_keys($courses);
         }
 
         // Ensure there are courseids to loop through.
         if (!empty($params['courseids'])) {
 
-            list($courses, $warnings) = external_util::validate_courses($params['courseids']);
+            list($courses, $warnings) = external_util::validate_courses($params['courseids'], $courses);
 
             // Get the imscps in this course, this function checks users visibility permissions.
             // We can avoid then additional validate_context calls.
diff --git a/mod/scorm/classes/external.php b/mod/scorm/classes/external.php
index 38502828a25..98e6fafeb73 100644
--- a/mod/scorm/classes/external.php
+++ b/mod/scorm/classes/external.php
@@ -640,14 +640,16 @@ class mod_scorm_external extends external_api {
 
         $params = self::validate_parameters(self::get_scorms_by_courses_parameters(), array('courseids' => $courseids));
 
+        $courses = array();
         if (empty($params['courseids'])) {
-            $params['courseids'] = array_keys(enrol_get_my_courses());
+            $courses = enrol_get_my_courses();
+            $params['courseids'] = array_keys($courses);
         }
 
         // Ensure there are courseids to loop through.
         if (!empty($params['courseids'])) {
 
-            list($courses, $warnings) = external_util::validate_courses($params['courseids']);
+            list($courses, $warnings) = external_util::validate_courses($params['courseids'], $courses);
 
             // Get the scorms in this course, this function checks users visibility permissions.
             // We can avoid then additional validate_context calls.