mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 17:06:53 +02:00
Merge branch 'MDL-70624-master' of git://github.com/jleyva/moodle
This commit is contained in:
commit
2a043cd65e
3 changed files with 3 additions and 0 deletions
|
@ -197,6 +197,7 @@ class api {
|
||||||
'tool_mobile_iosappid' => get_config('tool_mobile', 'iosappid'),
|
'tool_mobile_iosappid' => get_config('tool_mobile', 'iosappid'),
|
||||||
'tool_mobile_androidappid' => get_config('tool_mobile', 'androidappid'),
|
'tool_mobile_androidappid' => get_config('tool_mobile', 'androidappid'),
|
||||||
'tool_mobile_setuplink' => clean_param(get_config('tool_mobile', 'setuplink'), PARAM_URL),
|
'tool_mobile_setuplink' => clean_param(get_config('tool_mobile', 'setuplink'), PARAM_URL),
|
||||||
|
'tool_mobile_qrcodetype' => clean_param(get_config('tool_mobile', 'qrcodetype'), PARAM_INT),
|
||||||
);
|
);
|
||||||
|
|
||||||
$typeoflogin = get_config('tool_mobile', 'typeoflogin');
|
$typeoflogin = get_config('tool_mobile', 'typeoflogin');
|
||||||
|
|
|
@ -187,6 +187,7 @@ class external extends external_api {
|
||||||
'tool_mobile_androidappid' => new external_value(PARAM_NOTAGS, 'Android app\'s unique identifier.',
|
'tool_mobile_androidappid' => new external_value(PARAM_NOTAGS, 'Android app\'s unique identifier.',
|
||||||
VALUE_OPTIONAL),
|
VALUE_OPTIONAL),
|
||||||
'tool_mobile_setuplink' => new external_value(PARAM_URL, 'App download page.', VALUE_OPTIONAL),
|
'tool_mobile_setuplink' => new external_value(PARAM_URL, 'App download page.', VALUE_OPTIONAL),
|
||||||
|
'tool_mobile_qrcodetype' => new external_value(PARAM_INT, 'QR login configuration.', VALUE_OPTIONAL),
|
||||||
'warnings' => new external_warnings(),
|
'warnings' => new external_warnings(),
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
|
@ -99,6 +99,7 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
|
||||||
'tool_mobile_iosappid' => get_config('tool_mobile', 'iosappid'),
|
'tool_mobile_iosappid' => get_config('tool_mobile', 'iosappid'),
|
||||||
'tool_mobile_androidappid' => get_config('tool_mobile', 'androidappid'),
|
'tool_mobile_androidappid' => get_config('tool_mobile', 'androidappid'),
|
||||||
'tool_mobile_setuplink' => get_config('tool_mobile', 'setuplink'),
|
'tool_mobile_setuplink' => get_config('tool_mobile', 'setuplink'),
|
||||||
|
'tool_mobile_qrcodetype' => get_config('tool_mobile', 'qrcodetype'),
|
||||||
'warnings' => array()
|
'warnings' => array()
|
||||||
);
|
);
|
||||||
$this->assertEquals($expected, $result);
|
$this->assertEquals($expected, $result);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue