From 2a1fb5b5e7c2876799038c79fd319e2dab44d433 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20Mudr=C3=A1k?= Date: Thu, 24 Sep 2020 14:19:28 +0200 Subject: [PATCH] MDL-69772 admin: Fix legacy coding style on Location settings admin page No actual change here. Just polishing the coding style and adding fulltree check. --- admin/settings/location.php | 64 +++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 14 deletions(-) diff --git a/admin/settings/location.php b/admin/settings/location.php index 504cbb9aa06..85d58388ba7 100644 --- a/admin/settings/location.php +++ b/admin/settings/location.php @@ -1,21 +1,57 @@ . -if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page +/** + * Define administration settings on the Location settings page. + * + * @package core + * @category admin + * @copyright 2006 Martin Dougiamas + * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ - // "locations" settingpage - $temp = new admin_settingpage('locationsettings', new lang_string('locationsettings', 'admin')); - $temp->add(new admin_setting_servertimezone()); - $temp->add(new admin_setting_forcetimezone()); - $temp->add(new admin_settings_country_select('country', new lang_string('country', 'admin'), new lang_string('configcountry', 'admin'), 0)); - $temp->add(new admin_setting_configtext('defaultcity', new lang_string('defaultcity', 'admin'), new lang_string('defaultcity_help', 'admin'), '')); +defined('MOODLE_INTERNAL') || die(); - $temp->add(new admin_setting_heading('iplookup', new lang_string('iplookup', 'admin'), new lang_string('iplookupinfo', 'admin'))); - $temp->add(new admin_setting_configfile('geoip2file', new lang_string('geoipfile', 'admin'), - new lang_string('configgeoipfile', 'admin', $CFG->dataroot.'/geoip/'), $CFG->dataroot.'/geoip/GeoLite2-City.mmdb')); - $temp->add(new admin_setting_configtext('googlemapkey3', new lang_string('googlemapkey3', 'admin'), new lang_string('googlemapkey3_help', 'admin'), '', PARAM_RAW, 60)); +if ($hassiteconfig) { + $temp = new admin_settingpage('locationsettings', new lang_string('locationsettings', 'core_admin')); - $temp->add(new admin_setting_configtext('allcountrycodes', new lang_string('allcountrycodes', 'admin'), new lang_string('configallcountrycodes', 'admin'), '', '/^(?:\w+(?:,\w+)*)?$/')); + if ($ADMIN->fulltree) { + $temp->add(new admin_setting_servertimezone()); - $ADMIN->add('location', $temp); + $temp->add(new admin_setting_forcetimezone()); + + $temp->add(new admin_settings_country_select('country', new lang_string('country', 'core_admin'), + new lang_string('configcountry', 'core_admin'), 0)); + + $temp->add(new admin_setting_configtext('defaultcity', new lang_string('defaultcity', 'core_admin'), + new lang_string('defaultcity_help', 'core_admin'), '')); + + $temp->add(new admin_setting_heading('iplookup', new lang_string('iplookup', 'core_admin'), + new lang_string('iplookupinfo', 'core_admin'))); -} // end of speedup + $temp->add(new admin_setting_configfile('geoip2file', new lang_string('geoipfile', 'core_admin'), + new lang_string('configgeoipfile', 'core_admin', $CFG->dataroot . '/geoip/'), + $CFG->dataroot . '/geoip/GeoLite2-City.mmdb')); + + $temp->add(new admin_setting_configtext('googlemapkey3', new lang_string('googlemapkey3', 'core_admin'), + new lang_string('googlemapkey3_help', 'core_admin'), '', PARAM_RAW, 60)); + + $temp->add(new admin_setting_configtext('allcountrycodes', new lang_string('allcountrycodes', 'core_admin'), + new lang_string('configallcountrycodes', 'core_admin'), '', '/^(?:\w+(?:,\w+)*)?$/')); + } + + $ADMIN->add('location', $temp); +} -- 2.43.0