moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-52821 lti: Include tool_consumer_instance_description in launch

Browse source
This commit is contained in:
John Okely 2016-02-09 10:17:35 +08:00
parent 7adc7ef14f
commit 7204d77b9f
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/lti/locallib.php
View file

@ -54,6 +54,7 @@ defined('MOODLE_INTERNAL') || die;
use moodle\mod\lti as lti; use moodle\mod\lti as lti;
require_once($CFG->dirroot.'/mod/lti/OAuth.php'); require_once($CFG->dirroot.'/mod/lti/OAuth.php');
require_once($CFG->libdir.'/weblib.php');
define('LTI_URL_DOMAIN_REGEX', '/(?:https?:\/\/)?(?:www\.)?([^\/]+)(?:\/|$)/i'); define('LTI_URL_DOMAIN_REGEX', '/(?:https?:\/\/)?(?:www\.)?([^\/]+)(?:\/|$)/i');
@ -503,6 +504,7 @@ function lti_build_standard_request($instance, $orgid, $islti2) {
} else { } else {
$requestparams['tool_consumer_instance_name'] = get_site()->fullname; $requestparams['tool_consumer_instance_name'] = get_site()->fullname;
} }
$requestparams['tool_consumer_instance_description'] = html_to_text(get_site()->summary, 0);
return $requestparams; return $requestparams;
} }

8
mod/lti/tests/externallib_test.php
View file

@ -71,14 +71,16 @@ class mod_lti_external_testcase extends externallib_advanced_testcase {
* Test view_lti * Test view_lti
*/ */
public function test_get_tool_launch_data() { public function test_get_tool_launch_data() {
global $USER; global $USER, $SITE;
$SITE->summary = "This is a <b>long</b> front page summary with html, it should exceed more than seventy-five characters.";
$result = mod_lti_external::get_tool_launch_data($this->lti->id); $result = mod_lti_external::get_tool_launch_data($this->lti->id);
$result = external_api::clean_returnvalue(mod_lti_external::get_tool_launch_data_returns(), $result); $result = external_api::clean_returnvalue(mod_lti_external::get_tool_launch_data_returns(), $result);
// Basic test, the function returns what it's expected. // Basic test, the function returns what it's expected.
self::assertEquals($this->lti->toolurl, $result['endpoint']); self::assertEquals($this->lti->toolurl, $result['endpoint']);
self::assertCount(35, $result['parameters']); self::assertCount(36, $result['parameters']);
// Check some parameters. // Check some parameters.
$parameters = array(); $parameters = array();
@ -93,6 +95,8 @@ class mod_lti_external_testcase extends externallib_advanced_testcase {
self::assertEquals($USER->lastname, $parameters['lis_person_name_family']); self::assertEquals($USER->lastname, $parameters['lis_person_name_family']);
self::assertEquals(fullname($USER), $parameters['lis_person_name_full']); self::assertEquals(fullname($USER), $parameters['lis_person_name_full']);
self::assertEquals($USER->username, $parameters['ext_user_username']); self::assertEquals($USER->username, $parameters['ext_user_username']);
self::assertEquals("This is a LONG front page summary with html, it should exceed more than seventy-five characters.",
$parameters['tool_consumer_instance_description']);
} }