mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-06 08:52:46 +02:00
Code Issues Projects Releases Wiki Activity

MDL-56536 tool_mobile: Add logos to the get_public_config WS

Browse Source
This commit is contained in:
Juan Leyva 2016-10-21 10:30:59 +01:00
parent 919b9dfabd
commit 5d5e30c64d
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/tool/mobile/classes/api.php
View File

@ -100,7 +100,7 @@ class api {
* @return array with the settings and warnings
*/
public static function get_public_config() {
global $CFG, $SITE, $PAGE;
global $CFG, $SITE, $PAGE, $OUTPUT;
$context = context_system::instance();
// We need this to make work the format text functions.
@ -135,6 +135,14 @@ class api {
$url = new moodle_url("/$CFG->admin/tool/mobile/launch.php");
$settings['launchurl'] = $url->out(false);
}
if ($logourl = $OUTPUT->get_logo_url()) {
$settings['logourl'] = $logourl->out(false);
}
if ($compactlogourl = $OUTPUT->get_compact_logo_url()) {
$settings['compactlogourl'] = $compactlogourl->out(false);
}
return $settings;
}

2
admin/tool/mobile/classes/external.php
View File

@ -144,6 +144,8 @@ class external extends external_api {
'enablemobilewebservice' => new external_value(PARAM_INT, 'Whether the Mobile service is enabled.'),
'maintenanceenabled' => new external_value(PARAM_INT, 'Whether site maintenance is enabled.'),
'maintenancemessage' => new external_value(PARAM_RAW, 'Maintenance message.'),
'logourl' => new external_value(PARAM_URL, 'The site logo URL', VALUE_OPTIONAL),
'compactlogourl' => new external_value(PARAM_URL, 'The site compact logo URL', VALUE_OPTIONAL),
'typeoflogin' => new external_value(PARAM_INT, 'The type of login. 1 for app, 2 for browser, 3 for embedded.'),
'launchurl' => new external_value(PARAM_URL, 'SSO login launch URL. Empty if it won\'t be used.', VALUE_OPTIONAL),
'warnings' => new external_warnings(),

13
admin/tool/mobile/tests/externallib_test.php
View File

@ -56,7 +56,7 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
}
public function test_get_public_config() {
global $CFG, $SITE;
global $CFG, $SITE, $OUTPUT;
$this->resetAfterTest(true);
$result = external::get_public_config();
@ -89,11 +89,20 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
$authinstructions = 'Something with <b>html tags</b>';
set_config('auth_instructions', $authinstructions);
set_config('typeoflogin', api::LOGIN_VIA_BROWSER, 'tool_mobile');
set_config('logo', 'mock.png', 'core_admin');
set_config('logocompact', 'mock.png', 'core_admin');
$expected['registerauth'] = 'email';
$expected['authinstructions'] = format_text($authinstructions);
$expected['typeoflogin'] = api::LOGIN_VIA_BROWSER;
$expected['launchurl'] = "$CFG->wwwroot/$CFG->admin/tool/mobile/launch.php";;
$expected['launchurl'] = "$CFG->wwwroot/$CFG->admin/tool/mobile/launch.php";
if ($logourl = $OUTPUT->get_logo_url()) {
$expected['logourl'] = $logourl->out(false);
}
if ($compactlogourl = $OUTPUT->get_compact_logo_url()) {
$expected['compactlogourl'] = $compactlogourl->out(false);
}
$result = external::get_public_config();
$result = external_api::clean_returnvalue(external::get_public_config_returns(), $result);