mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'mdl45982-master' of https://github.com/tlock/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2014-07-08 13:26:36 +12:00
commit 189f9937ad
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mod/lti/return.php
View File

@ -31,6 +31,7 @@ $courseid = required_param('course', PARAM_INT);
$instanceid = optional_param('instanceid', 0, PARAM_INT);
$errormsg = optional_param('lti_errormsg', '', PARAM_RAW);
$msg = optional_param('lti_msg', '', PARAM_RAW);
$unsigned = optional_param('unsigned', '0', PARAM_INT);
$launchcontainer = optional_param('launch_container', LTI_LAUNCH_CONTAINER_WINDOW, PARAM_INT);
@ -47,7 +48,7 @@ if (!empty($instanceid)) {
require_login($course);
if (!empty($errormsg)) {
if (!empty($errormsg) || !empty($msg)) {
$url = new moodle_url('/mod/lti/return.php', array('course' => $courseid));
$PAGE->set_url($url);
@ -66,7 +67,9 @@ if (!empty($errormsg)) {
if (!empty($lti) and !empty($context)) {
echo $OUTPUT->heading(format_string($lti->name, true, array('context' => $context)));
}
}
if (!empty($errormsg)) {
echo get_string('lti_launch_error', 'lti');
echo htmlspecialchars($errormsg);
@ -90,6 +93,12 @@ if (!empty($errormsg)) {
}
echo $OUTPUT->footer();
} else if (!empty($msg)) {
echo htmlspecialchars($msg);
echo $OUTPUT->footer();
} else {
$courseurl = new moodle_url('/course/view.php', array('id' => $courseid));
$url = $courseurl->out();