moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-03 08:09:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

webservice MDL-23440 more explicit error message when validation context fail in some external functions.

Browse source
This commit is contained in:
jerome mouneyrac 2010-07-30 06:00:32 +00:00
parent 451f1e3844
commit 41e962ffb0
2 changed files with 72 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
enrol/externallib.php
View file

@ -72,7 +72,15 @@ class moodle_enrol_external extends external_api {
$context = $coursecontext; $context = $coursecontext;
} }
self::validate_context($context); try {
self::validate_context($context);
} catch (Exception $e) {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $params['courseid'];
throw new moodle_exception(
get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
}
if ($courseid == SITEID) { if ($courseid == SITEID) {
require_capability('moodle/site:viewparticipants', $context); require_capability('moodle/site:viewparticipants', $context);

70
group/externallib.php
View file

@ -76,7 +76,15 @@ class moodle_group_external extends external_api {
// now security checks // now security checks
$context = get_context_instance(CONTEXT_COURSE, $group->courseid); $context = get_context_instance(CONTEXT_COURSE, $group->courseid);
self::validate_context($context); try {
self::validate_context($context);
} catch (Exception $e) {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $group->courseid;
throw new moodle_exception(
get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
}
require_capability('moodle/course:managegroups', $context); require_capability('moodle/course:managegroups', $context);
// finally create the group // finally create the group
@ -135,7 +143,15 @@ class moodle_group_external extends external_api {
// now security checks // now security checks
$context = get_context_instance(CONTEXT_COURSE, $group->courseid); $context = get_context_instance(CONTEXT_COURSE, $group->courseid);
self::validate_context($context); try {
self::validate_context($context);
} catch (Exception $e) {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $group->courseid;
throw new moodle_exception(
get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
}
require_capability('moodle/course:managegroups', $context); require_capability('moodle/course:managegroups', $context);
$groups[] = (array)$group; $groups[] = (array)$group;
@ -184,7 +200,15 @@ class moodle_group_external extends external_api {
// now security checks // now security checks
$context = get_context_instance(CONTEXT_COURSE, $params['courseid']); $context = get_context_instance(CONTEXT_COURSE, $params['courseid']);
self::validate_context($context); try {
self::validate_context($context);
} catch (Exception $e) {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $params['courseid'];
throw new moodle_exception(
get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
}
require_capability('moodle/course:managegroups', $context); require_capability('moodle/course:managegroups', $context);
$gs = groups_get_all_groups($params['courseid'], 0, 0, 'g.id, g.courseid, g.name, g.description, g.enrolmentkey'); $gs = groups_get_all_groups($params['courseid'], 0, 0, 'g.id, g.courseid, g.name, g.description, g.enrolmentkey');
@ -251,7 +275,15 @@ class moodle_group_external extends external_api {
// now security checks // now security checks
$context = get_context_instance(CONTEXT_COURSE, $group->courseid); $context = get_context_instance(CONTEXT_COURSE, $group->courseid);
self::validate_context($context); try {
self::validate_context($context);
} catch (Exception $e) {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $group->courseid;
throw new moodle_exception(
get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
}
require_capability('moodle/course:managegroups', $context); require_capability('moodle/course:managegroups', $context);
groups_delete_group($group); groups_delete_group($group);
@ -296,7 +328,15 @@ class moodle_group_external extends external_api {
$group = groups_get_group($groupid, 'id, courseid, name, enrolmentkey', MUST_EXIST); $group = groups_get_group($groupid, 'id, courseid, name, enrolmentkey', MUST_EXIST);
// now security checks // now security checks
$context = get_context_instance(CONTEXT_COURSE, $group->courseid); $context = get_context_instance(CONTEXT_COURSE, $group->courseid);
self::validate_context($context); try {
self::validate_context($context);
} catch (Exception $e) {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $group->courseid;
throw new moodle_exception(
get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
}
require_capability('moodle/course:managegroups', $context); require_capability('moodle/course:managegroups', $context);
$groupmembers = groups_get_members($group->id, 'u.id', 'lastname ASC, firstname ASC'); $groupmembers = groups_get_members($group->id, 'u.id', 'lastname ASC, firstname ASC');
@ -364,7 +404,15 @@ class moodle_group_external extends external_api {
// now security checks // now security checks
$context = get_context_instance(CONTEXT_COURSE, $group->courseid); $context = get_context_instance(CONTEXT_COURSE, $group->courseid);
self::validate_context($context); try {
self::validate_context($context);
} catch (Exception $e) {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $group->courseid;
throw new moodle_exception(
get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
}
require_capability('moodle/course:managegroups', $context); require_capability('moodle/course:managegroups', $context);
// now make sure user is enrolled in course - this is mandatory requirement, // now make sure user is enrolled in course - this is mandatory requirement,
@ -430,7 +478,15 @@ class moodle_group_external extends external_api {
// now security checks // now security checks
$context = get_context_instance(CONTEXT_COURSE, $group->courseid); $context = get_context_instance(CONTEXT_COURSE, $group->courseid);
self::validate_context($context); try {
self::validate_context($context);
} catch (Exception $e) {
$exceptionparam = new stdClass();
$exceptionparam->message = $e->getMessage();
$exceptionparam->courseid = $group->courseid;
throw new moodle_exception(
get_string('errorcoursecontextnotvalid' , 'webservice', $exceptionparam));
}
require_capability('moodle/course:managegroups', $context); require_capability('moodle/course:managegroups', $context);
groups_remove_member($group, $user); groups_remove_member($group, $user);