diff --git a/admin/tool/mobile/classes/api.php b/admin/tool/mobile/classes/api.php index 9ef98e1527a..43c84645fb9 100644 --- a/admin/tool/mobile/classes/api.php +++ b/admin/tool/mobile/classes/api.php @@ -277,6 +277,7 @@ class api { $settings->tool_mobile_customlangstrings = get_config('tool_mobile', 'customlangstrings'); $settings->tool_mobile_disabledfeatures = get_config('tool_mobile', 'disabledfeatures'); $settings->tool_mobile_custommenuitems = get_config('tool_mobile', 'custommenuitems'); + $settings->tool_mobile_apppolicy = get_config('tool_mobile', 'apppolicy'); } return $settings; diff --git a/admin/tool/mobile/lang/en/tool_mobile.php b/admin/tool/mobile/lang/en/tool_mobile.php index 7ac7ef4b3c1..195af12d748 100644 --- a/admin/tool/mobile/lang/en/tool_mobile.php +++ b/admin/tool/mobile/lang/en/tool_mobile.php @@ -25,6 +25,8 @@ $string['adodbdebugwarning'] = 'ADOdb debugging is enabled. It should be disabled in the external database authentication or external database enrolment plugin settings.'; $string['androidappid'] = 'Android app\'s unique identifier'; $string['androidappid_desc'] = 'This setting may be left as default unless you have a custom Android app.'; +$string['apppolicy'] = 'App policy URL'; +$string['apppolicy_help'] = 'The URL of a policy for app users which is listed on the About page in the app. If the field is left empty, the site policy URL will be used instead.'; $string['autologinkeygenerationlockout'] = 'Auto-login key generation is blocked. You need to wait 6 minutes between requests.'; $string['autologinnotallowedtoadmins'] = 'Auto-login is not allowed for site admins.'; $string['cachedef_plugininfo'] = 'This stores the list of plugins with mobile addons'; diff --git a/admin/tool/mobile/settings.php b/admin/tool/mobile/settings.php index 8af64c66fdb..125a72a6929 100644 --- a/admin/tool/mobile/settings.php +++ b/admin/tool/mobile/settings.php @@ -43,6 +43,9 @@ if ($hassiteconfig) { new lang_string('configenablemobilewebservice', 'admin', $enablemobiledoclink), $default)); } + $temp->add(new admin_setting_configtext('tool_mobile/apppolicy', new lang_string('apppolicy', 'tool_mobile'), + new lang_string('apppolicy_help', 'tool_mobile'), '', PARAM_URL)); + $ADMIN->add('mobileapp', $temp); // Show only mobile settings if the mobile service is enabled. diff --git a/admin/tool/mobile/tests/externallib_test.php b/admin/tool/mobile/tests/externallib_test.php index 0b8873bdcf1..d5a8a344758 100644 --- a/admin/tool/mobile/tests/externallib_test.php +++ b/admin/tool/mobile/tests/externallib_test.php @@ -173,6 +173,7 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase { array('name' => 'tool_mobile_customlangstrings', 'value' => ''), array('name' => 'tool_mobile_disabledfeatures', 'value' => ''), array('name' => 'tool_mobile_custommenuitems', 'value' => ''), + array('name' => 'tool_mobile_apppolicy', 'value' => ''), ); $this->assertCount(0, $result['warnings']); $this->assertEquals($expected, $result['settings']); diff --git a/version.php b/version.php index 55de453bcbf..6d73885ff33 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2018042500.00; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2018042500.01; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes.