mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-54098-master' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
David Monllao 2016-05-12 07:37:35 +08:00
commit ec7b75087c
6 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
enrol/externallib.php
View File

@ -651,9 +651,7 @@ class core_enrol_external extends external_api {
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);

2
enrol/guest/classes/external.php
View File

@ -71,7 +71,7 @@ class enrol_guest_external extends external_api {
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);

6
enrol/self/externallib.php
View File

@ -67,8 +67,7 @@ class enrol_self_external extends external_api {
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 @@ class enrol_self_external extends external_api {
$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');

1
mod/lti/classes/external.php
View File

@ -638,7 +638,6 @@ class mod_lti_external extends external_api {
$context = context_system::instance();
self::validate_context($context);
$PAGE->set_context($context);
require_capability('moodle/site:config', $context);
if (!empty($toolproxyid)) {

4
question/classes/external.php
View File

@ -86,9 +86,7 @@ class core_question_external extends external_api {
);
$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'],

5
tag/classes/external.php
View File

@ -191,9 +191,9 @@ class core_tag_external extends external_api {
// 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 @@ class core_tag_external extends external_api {
// 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);