MDL-54098 external: Remove usage of require_login and $PAGE->set_context

rboyatt · May 9, 2016 · 67ee103 · 67ee103
1 parent 1e72daa
commit 67ee103
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 15 deletions.
diff --git a/enrol/externallib.php b/enrol/externallib.php
@@ -651,9 +651,7 @@ public static function get_course_enrolment_methods($courseid) {
         global $DB;
 
         $params = self::validate_parameters(self::get_course_enrolment_methods_parameters(), array('courseid' => $courseid));
-
-        // Note that we can't use validate_context because the user is not enrolled in the course.
-        require_login(null, false, null, false, true);
+        self::validate_context(context_system::instance());
 
         $course = $DB->get_record('course', array('id' => $params['courseid']), '*', MUST_EXIST);
         $context = context_course::instance($course->id);

diff --git a/enrol/guest/classes/external.php b/enrol/guest/classes/external.php
@@ -71,7 +71,7 @@ public static function get_instance_info($instanceid) {
             throw new moodle_exception('invaliddata', 'error');
         }
 
-        require_login(null, false, null, false, true);
+        self::validate_context(context_system::instance());
         $enrolinstance = $DB->get_record('enrol', array('id' => $params['instanceid']), '*', MUST_EXIST);
 
         $course = $DB->get_record('course', array('id' => $enrolinstance->courseid), '*', MUST_EXIST);

diff --git a/enrol/self/externallib.php b/enrol/self/externallib.php
@@ -67,8 +67,7 @@ public static function get_instance_info($instanceid) {
             throw new moodle_exception('invaliddata', 'error');
         }
 
-        // Note that we can't use validate_context because the user is not enrolled in the course.
-        require_login(null, false, null, false, true);
+        self::validate_context(context_system::instance());
 
         $enrolinstance = $DB->get_record('enrol', array('id' => $params['instanceid']), '*', MUST_EXIST);
         $course = $DB->get_record('course', array('id' => $enrolinstance->courseid), '*', MUST_EXIST);
@@ -146,8 +145,7 @@ public static function enrol_user($courseid, $password = '', $instanceid = 0) {
 
         $course = get_course($params['courseid']);
         $context = context_course::instance($course->id);
-        // Note that we can't use validate_context because the user is not enrolled in the course.
-        require_login(null, false, null, false, true);
+        self::validate_context(context_system::instance());
 
         if (!$course->visible and !has_capability('moodle/course:viewhiddencourses', $context)) {
             throw new moodle_exception('coursehidden');

diff --git a/mod/lti/classes/external.php b/mod/lti/classes/external.php
@@ -638,7 +638,6 @@ public static function get_tool_types($toolproxyid) {
         $context = context_system::instance();
 
         self::validate_context($context);
-        $PAGE->set_context($context);
         require_capability('moodle/site:config', $context);
 
         if (!empty($toolproxyid)) {

diff --git a/question/classes/external.php b/question/classes/external.php
@@ -86,9 +86,7 @@ public static function update_flag($qubaid, $questionid, $qaid, $slot, $checksum
         );
 
         $warnings = array();
-
-        // Check user is logged in.
-        require_login(null, false, null, false, true);
+        self::validate_context(context_system::instance());
 
         // The checksum will be checked to provide security flagging other users questions.
         question_flags::update_flag($params['qubaid'], $params['questionid'], $params['qaid'], $params['slot'], $params['checksum'],

diff --git a/tag/classes/external.php b/tag/classes/external.php
@@ -191,9 +191,9 @@ public static function get_tags($tags) {
         // Validate and normalize parameters.
         $tags = self::validate_parameters(self::get_tags_parameters(), array('tags' => $tags));
 
-        require_login(null, false, null, false, true);
-
         $systemcontext = context_system::instance();
+        self::validate_context($systemcontext);
+
         $canmanage = has_capability('moodle/tag:manage', $systemcontext);
         $canedit = has_capability('moodle/tag:edit', $systemcontext);
 
@@ -300,7 +300,6 @@ public static function get_tagindex($params) {
 
         // Login to the course / module if applicable.
         $context = $params['ctx'] ? context::instance_by_id($params['ctx']) : context_system::instance();
-        require_login(null, false, null, false, true);
         self::validate_context($context);
 
         $tag = core_tag_tag::get_by_name($params['tc'], $params['tag'], '*', MUST_EXIST);