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

Merge branch 'MDL-35198' of git://github.com/mouneyrac/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2012-10-16 11:23:24 +08:00
commit 8422094d91
8 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/webservice/service_users.php
View file

@ -97,7 +97,7 @@ $usersmissingcaps = $webservicemanager->get_missing_capabilities_by_users($allow
//add the missing capabilities to the allowed users object to be displayed by renderer //add the missing capabilities to the allowed users object to be displayed by renderer
foreach ($allowedusers as &$alloweduser) { foreach ($allowedusers as &$alloweduser) {
if (!is_siteadmin($alloweduser->id) and key_exists($alloweduser->id, $usersmissingcaps)) { if (!is_siteadmin($alloweduser->id) and array_key_exists($alloweduser->id, $usersmissingcaps)) {
$alloweduser->missingcapabilities = implode(', ', $usersmissingcaps[$alloweduser->id]); $alloweduser->missingcapabilities = implode(', ', $usersmissingcaps[$alloweduser->id]);
} }
} }

2
blocks/community/forms.php
View file

@ -140,7 +140,7 @@ class community_hub_search_form extends moodleform {
$options = array(); $options = array();
$firsthub = false; $firsthub = false;
foreach ($hubs as $hub) { foreach ($hubs as $hub) {
if (key_exists('id', $hub)) { if (array_key_exists('id', $hub)) {
$params = array('hubid' => $hub['id'], $params = array('hubid' => $hub['id'],
'filetype' => HUB_HUBSCREENSHOT_FILE_TYPE); 'filetype' => HUB_HUBSCREENSHOT_FILE_TYPE);
$imgurl = new moodle_url(HUB_HUBDIRECTORYURL . $imgurl = new moodle_url(HUB_HUBDIRECTORYURL .

10
course/externallib.php
View file

@ -284,7 +284,7 @@ class core_course_external extends external_api {
array('options' => $options)); array('options' => $options));
//retrieve courses //retrieve courses
if (!key_exists('ids', $params['options']) if (!array_key_exists('ids', $params['options'])
or empty($params['options']['ids'])) { or empty($params['options']['ids'])) {
$courses = $DB->get_records('course'); $courses = $DB->get_records('course');
} else { } else {
@ -522,12 +522,12 @@ class core_course_external extends external_api {
require_capability('moodle/course:create', $context); require_capability('moodle/course:create', $context);
// Make sure lang is valid // Make sure lang is valid
if (key_exists('lang', $course) and empty($availablelangs[$course['lang']])) { if (array_key_exists('lang', $course) and empty($availablelangs[$course['lang']])) {
throw new moodle_exception('errorinvalidparam', 'webservice', '', 'lang'); throw new moodle_exception('errorinvalidparam', 'webservice', '', 'lang');
} }
// Make sure theme is valid // Make sure theme is valid
if (key_exists('forcetheme', $course)) { if (array_key_exists('forcetheme', $course)) {
if (!empty($CFG->allowcoursethemes)) { if (!empty($CFG->allowcoursethemes)) {
if (empty($availablethemes[$course['forcetheme']])) { if (empty($availablethemes[$course['forcetheme']])) {
throw new moodle_exception('errorinvalidparam', 'webservice', '', 'forcetheme'); throw new moodle_exception('errorinvalidparam', 'webservice', '', 'forcetheme');
@ -546,10 +546,10 @@ class core_course_external extends external_api {
//set default value for completion //set default value for completion
$courseconfig = get_config('moodlecourse'); $courseconfig = get_config('moodlecourse');
if (completion_info::is_enabled_for_site()) { if (completion_info::is_enabled_for_site()) {
if (!key_exists('enablecompletion', $course)) { if (!array_key_exists('enablecompletion', $course)) {
$course['enablecompletion'] = $courseconfig->enablecompletion; $course['enablecompletion'] = $courseconfig->enablecompletion;
} }
if (!key_exists('completionstartonenrol', $course)) { if (!array_key_exists('completionstartonenrol', $course)) {
$course['completionstartonenrol'] = $courseconfig->completionstartonenrol; $course['completionstartonenrol'] = $courseconfig->completionstartonenrol;
} }
} else { } else {

4
enrol/externallib.php
View file

@ -617,7 +617,7 @@ class core_role_external extends external_api {
// throw an exception if user is not able to assign the role in this context // throw an exception if user is not able to assign the role in this context
$roles = get_assignable_roles($context, ROLENAME_SHORT); $roles = get_assignable_roles($context, ROLENAME_SHORT);
if (!key_exists($assignment['roleid'], $roles)) { if (!array_key_exists($assignment['roleid'], $roles)) {
throw new invalid_parameter_exception('Can not assign roleid='.$assignment['roleid'].' in contextid='.$assignment['contextid']); throw new invalid_parameter_exception('Can not assign roleid='.$assignment['roleid'].' in contextid='.$assignment['contextid']);
} }
@ -680,7 +680,7 @@ class core_role_external extends external_api {
// throw an exception if user is not able to unassign the role in this context // throw an exception if user is not able to unassign the role in this context
$roles = get_assignable_roles($context, ROLENAME_SHORT); $roles = get_assignable_roles($context, ROLENAME_SHORT);
if (!key_exists($unassignment['roleid'], $roles)) { if (!array_key_exists($unassignment['roleid'], $roles)) {
throw new invalid_parameter_exception('Can not unassign roleid='.$unassignment['roleid'].' in contextid='.$unassignment['contextid']); throw new invalid_parameter_exception('Can not unassign roleid='.$unassignment['roleid'].' in contextid='.$unassignment['contextid']);
} }

2
enrol/manual/externallib.php
View file

@ -100,7 +100,7 @@ class enrol_manual_external extends external_api {
// Throw an exception if user is not able to assign the role. // Throw an exception if user is not able to assign the role.
$roles = get_assignable_roles($context); $roles = get_assignable_roles($context);
if (!key_exists($enrolment['roleid'], $roles)) { if (!array_key_exists($enrolment['roleid'], $roles)) {
$errorparams = new stdClass(); $errorparams = new stdClass();
$errorparams->roleid = $enrolment['roleid']; $errorparams->roleid = $enrolment['roleid'];
$errorparams->courseid = $enrolment['courseid']; $errorparams->courseid = $enrolment['courseid'];

2
lib/adminlib.php
View file

@ -7638,7 +7638,7 @@ class admin_setting_managewebservicetokens extends admin_setting {
array(array('id' => $token->userid)), $token->serviceid); array(array('id' => $token->userid)), $token->serviceid);
if (!is_siteadmin($token->userid) and if (!is_siteadmin($token->userid) and
key_exists($token->userid, $usermissingcaps)) { array_key_exists($token->userid, $usermissingcaps)) {
$missingcapabilities = implode(', ', $missingcapabilities = implode(', ',
$usermissingcaps[$token->userid]); $usermissingcaps[$token->userid]);
if (!empty($missingcapabilities)) { if (!empty($missingcapabilities)) {

4
lib/upgradelib.php
View file

@ -966,7 +966,7 @@ function external_update_descriptions($component) {
$dbfunction->classpath = $function['classpath']; $dbfunction->classpath = $function['classpath'];
$update = true; $update = true;
} }
$functioncapabilities = key_exists('capabilities', $function)?$function['capabilities']:''; $functioncapabilities = array_key_exists('capabilities', $function)?$function['capabilities']:'';
if ($dbfunction->capabilities != $functioncapabilities) { if ($dbfunction->capabilities != $functioncapabilities) {
$dbfunction->capabilities = $functioncapabilities; $dbfunction->capabilities = $functioncapabilities;
$update = true; $update = true;
@ -982,7 +982,7 @@ function external_update_descriptions($component) {
$dbfunction->methodname = $function['methodname']; $dbfunction->methodname = $function['methodname'];
$dbfunction->classpath = empty($function['classpath']) ? null : $function['classpath']; $dbfunction->classpath = empty($function['classpath']) ? null : $function['classpath'];
$dbfunction->component = $component; $dbfunction->component = $component;
$dbfunction->capabilities = key_exists('capabilities', $function)?$function['capabilities']:''; $dbfunction->capabilities = array_key_exists('capabilities', $function)?$function['capabilities']:'';
$dbfunction->id = $DB->insert_record('external_functions', $dbfunction); $dbfunction->id = $DB->insert_record('external_functions', $dbfunction);
} }
unset($functions); unset($functions);

2
webservice/lib.php
View file

@ -564,7 +564,7 @@ class webservice {
//detect the missing capabilities //detect the missing capabilities
foreach ($servicecaps as $functioname => $functioncaps) { foreach ($servicecaps as $functioname => $functioncaps) {
foreach ($functioncaps as $functioncap) { foreach ($functioncaps as $functioncap) {
if (!key_exists($functioncap, $usercaps)) { if (!array_key_exists($functioncap, $usercaps)) {
if (!isset($usersmissingcaps[$user->id]) if (!isset($usersmissingcaps[$user->id])
or array_search($functioncap, $usersmissingcaps[$user->id]) === false) { or array_search($functioncap, $usersmissingcaps[$user->id]) === false) {
$usersmissingcaps[$user->id][] = $functioncap; $usersmissingcaps[$user->id][] = $functioncap;