From 12fc8acf5b2c6b4e274fa491477ecd97d30b43d8 Mon Sep 17 00:00:00 2001 From: Jerome Mouneyrac Date: Wed, 26 Sep 2012 15:20:18 +0800 Subject: [PATCH] MDL-35198 replace key_exists by array_key_exists --- admin/webservice/service_users.php | 2 +- blocks/community/forms.php | 2 +- course/externallib.php | 10 +++++----- enrol/externallib.php | 4 ++-- enrol/manual/externallib.php | 2 +- lib/adminlib.php | 2 +- lib/upgradelib.php | 4 ++-- webservice/lib.php | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/admin/webservice/service_users.php b/admin/webservice/service_users.php index 12db2b0497f7a..ad67c6680e419 100644 --- a/admin/webservice/service_users.php +++ b/admin/webservice/service_users.php @@ -97,7 +97,7 @@ //add the missing capabilities to the allowed users object to be displayed by renderer 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]); } } diff --git a/blocks/community/forms.php b/blocks/community/forms.php index 075ab2af6c815..641ef1786372c 100644 --- a/blocks/community/forms.php +++ b/blocks/community/forms.php @@ -140,7 +140,7 @@ public function definition() { $options = array(); $firsthub = false; foreach ($hubs as $hub) { - if (key_exists('id', $hub)) { + if (array_key_exists('id', $hub)) { $params = array('hubid' => $hub['id'], 'filetype' => HUB_HUBSCREENSHOT_FILE_TYPE); $imgurl = new moodle_url(HUB_HUBDIRECTORYURL . diff --git a/course/externallib.php b/course/externallib.php index 22e2e4ef9f019..8673e25ee3ae1 100644 --- a/course/externallib.php +++ b/course/externallib.php @@ -285,7 +285,7 @@ public static function get_courses($options = array()) { array('options' => $options)); //retrieve courses - if (!key_exists('ids', $params['options']) + if (!array_key_exists('ids', $params['options']) or empty($params['options']['ids'])) { $courses = $DB->get_records('course'); } else { @@ -523,12 +523,12 @@ public static function create_courses($courses) { require_capability('moodle/course:create', $context); // 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'); } // Make sure theme is valid - if (key_exists('forcetheme', $course)) { + if (array_key_exists('forcetheme', $course)) { if (!empty($CFG->allowcoursethemes)) { if (empty($availablethemes[$course['forcetheme']])) { throw new moodle_exception('errorinvalidparam', 'webservice', '', 'forcetheme'); @@ -547,10 +547,10 @@ public static function create_courses($courses) { //set default value for completion $courseconfig = get_config('moodlecourse'); if (completion_info::is_enabled_for_site()) { - if (!key_exists('enablecompletion', $course)) { + if (!array_key_exists('enablecompletion', $course)) { $course['enablecompletion'] = $courseconfig->enablecompletion; } - if (!key_exists('completionstartonenrol', $course)) { + if (!array_key_exists('completionstartonenrol', $course)) { $course['completionstartonenrol'] = $courseconfig->completionstartonenrol; } } else { diff --git a/enrol/externallib.php b/enrol/externallib.php index 757362aa6942e..5acbe43451a05 100644 --- a/enrol/externallib.php +++ b/enrol/externallib.php @@ -388,7 +388,7 @@ public static function assign_roles($assignments) { // throw an exception if user is not able to assign the role in this context $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']); } @@ -451,7 +451,7 @@ public static function unassign_roles($unassignments) { // throw an exception if user is not able to unassign the role in this context $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']); } diff --git a/enrol/manual/externallib.php b/enrol/manual/externallib.php index 01686da8e662a..2edb2c83359e2 100644 --- a/enrol/manual/externallib.php +++ b/enrol/manual/externallib.php @@ -100,7 +100,7 @@ public static function enrol_users($enrolments) { // Throw an exception if user is not able to assign the role. $roles = get_assignable_roles($context); - if (!key_exists($enrolment['roleid'], $roles)) { + if (!array_key_exists($enrolment['roleid'], $roles)) { $errorparams = new stdClass(); $errorparams->roleid = $enrolment['roleid']; $errorparams->courseid = $enrolment['courseid']; diff --git a/lib/adminlib.php b/lib/adminlib.php index 1bc2a439b7a9b..9d28dd4e97649 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -7632,7 +7632,7 @@ public function output_html($data, $query='') { array(array('id' => $token->userid)), $token->serviceid); if (!is_siteadmin($token->userid) and - key_exists($token->userid, $usermissingcaps)) { + array_key_exists($token->userid, $usermissingcaps)) { $missingcapabilities = implode(', ', $usermissingcaps[$token->userid]); if (!empty($missingcapabilities)) { diff --git a/lib/upgradelib.php b/lib/upgradelib.php index 95578fc8d49c5..5dd75968c6e61 100644 --- a/lib/upgradelib.php +++ b/lib/upgradelib.php @@ -966,7 +966,7 @@ function external_update_descriptions($component) { $dbfunction->classpath = $function['classpath']; $update = true; } - $functioncapabilities = key_exists('capabilities', $function)?$function['capabilities']:''; + $functioncapabilities = array_key_exists('capabilities', $function)?$function['capabilities']:''; if ($dbfunction->capabilities != $functioncapabilities) { $dbfunction->capabilities = $functioncapabilities; $update = true; @@ -982,7 +982,7 @@ function external_update_descriptions($component) { $dbfunction->methodname = $function['methodname']; $dbfunction->classpath = empty($function['classpath']) ? null : $function['classpath']; $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); } unset($functions); diff --git a/webservice/lib.php b/webservice/lib.php index 31e78b9a5cf42..3d7b113559460 100644 --- a/webservice/lib.php +++ b/webservice/lib.php @@ -564,7 +564,7 @@ public function get_missing_capabilities_by_users($users, $serviceid) { //detect the missing capabilities foreach ($servicecaps as $functioname => $functioncaps) { foreach ($functioncaps as $functioncap) { - if (!key_exists($functioncap, $usercaps)) { + if (!array_key_exists($functioncap, $usercaps)) { if (!isset($usersmissingcaps[$user->id]) or array_search($functioncap, $usersmissingcaps[$user->id]) === false) { $usersmissingcaps[$user->id][] = $functioncap;