From b346737e75f05f767ea011d7bb71288f36c3f70e Mon Sep 17 00:00:00 2001
From: Ben Kelada <ben.kelada@open.edu.au>
Date: Wed, 4 May 2016 10:29:00 +1000
Subject: [PATCH] MDL-47113 lti: Add link to open in new window, when popup
 blocked

---
 mod/lti/lang/en/lti.php | 1 +
 mod/lti/lib.php         | 2 +-
 mod/lti/view.php        | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mod/lti/lang/en/lti.php b/mod/lti/lang/en/lti.php
index 324931eaa21..10d50cb6b55 100644
--- a/mod/lti/lang/en/lti.php
+++ b/mod/lti/lang/en/lti.php
@@ -80,6 +80,7 @@ $string['basiclti'] = 'LTI';
 $string['basiclti_base_string'] = 'LTI OAuth base string';
 $string['basiclti_endpoint'] = 'LTI launch endpoint';
 $string['basiclti_in_new_window'] = 'Your activity has opened in a new window';
+$string['basiclti_in_new_window_open'] = 'Click here if the new window has not opened';
 $string['basiclti_parameters'] = 'LTI launch parameters';
 $string['basicltiactivities'] = 'LTI activities';
 $string['basicltifieldset'] = 'Custom example fieldset';
diff --git a/mod/lti/lib.php b/mod/lti/lib.php
index ef7231398da..2df80301491 100644
--- a/mod/lti/lib.php
+++ b/mod/lti/lib.php
@@ -303,7 +303,7 @@ function lti_get_coursemodule_info($coursemodule) {
     $launchcontainer = lti_get_launch_container($lti, $toolconfig);
     if ($launchcontainer == LTI_LAUNCH_CONTAINER_WINDOW) {
         $launchurl = new moodle_url('/mod/lti/launch.php', array('id' => $coursemodule->id));
-        $info->onclick = "window.open('" . $launchurl->out(false) . "', 'lti'); return false;";
+        $info->onclick = "window.open('" . $launchurl->out(false) . "', 'lti-".$coursemodule->id."'); return false;";
     }
 
     $info->name = $lti->name;
diff --git a/mod/lti/view.php b/mod/lti/view.php
index e88816460f2..ff1bdd7a427 100644
--- a/mod/lti/view.php
+++ b/mod/lti/view.php
@@ -112,10 +112,11 @@ if ($lti->showdescriptionlaunch && $lti->intro) {
 
 if ( $launchcontainer == LTI_LAUNCH_CONTAINER_WINDOW ) {
     echo "<script language=\"javascript\">//<![CDATA[\n";
-    echo "window.open('launch.php?id=".$cm->id."','lti');";
+    echo "window.open('launch.php?id=".$cm->id."','lti-".$cm->id."');";
     echo "//]]\n";
     echo "</script>\n";
     echo "<p>".get_string("basiclti_in_new_window", "lti")."</p>\n";
+    echo "<p> <a href='launch.php?id=".$cm->id."' target='_blank'>".get_string("basiclti_in_new_window_open", "lti")."</a></p>\n";
 } else {
     // Request the launch content with an iframe tag.
     echo '<iframe id="contentframe" height="600px" width="100%" src="launch.php?id='.$cm->id.'"></iframe>';
-- 
2.17.1