Fix using EduAppCenter

tsugiproject · Jul 27, 2018 · edf3600 · edf3600
1 parent fce1af5
commit edf3600
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/lti/store/route.php b/lti/store/route.php
@@ -6,7 +6,7 @@
 require_once $CFG->dirroot."/admin/admin_util.php";
 
 $local_path = route_get_local_path(__DIR__);
-if ( $local_path == "canvas-config.xml" ) {
+if ( strpos($local_path, "canvas-config.xml") === 0 ) {
     require_once("canvas-config-xml.php");
     return;
 }

diff --git a/vendor/tsugi/lib/src/Util/ContentItem.php b/vendor/tsugi/lib/src/Util/ContentItem.php
@@ -172,7 +172,7 @@ public function addLtiLinkItemExtended($params = array())
         if (empty($params['activityId']))
             $params['activityId'] = false;
         if (empty($params['placementTarget']))
-            $params['placementTarget'] = 'window';
+            $params['placementTarget'] = 'iframe';
         if (empty($params['placementWindowTarget']))
             $params['placementWindowTarget'] = '';
         if (empty($params['placementWidth']))
@@ -187,8 +187,7 @@ public function addLtiLinkItemExtended($params = array())
                     "text" : "For more information on how to build and host powerful LTI-based Tools quickly, see www.tsugi.org",
                     "url" : "http://www.tsugi.org/",
                     "placementAdvice" : {
-                        "presentationDocumentTarget" : "window",
-                        "windowTarget" : "_blank"
+                        "presentationDocumentTarget" : "iframe"
                     },
                     "icon" : {
                         "@id" : "https://www.dr-chuck.net/tsugi-static/img/default-icon.png",
@@ -290,9 +289,9 @@ public function addContentItemExtended($params = array())
         if (empty($params['fa_icon']))
             $params['fa_icon'] = false;
         if (empty($params['placementTarget']))
-            $params['placementTarget'] = 'window';
+            $params['placementTarget'] = 'iframe';
         if (empty($params['placementWindowTarget']))
-            $params['placementWindowTarget'] = '_blank';
+            $params['placementWindowTarget'] = '';
         if (empty($params['placementWidth']))
             $params['placementWidth'] = '';
         if (empty($params['placementHeight']))
@@ -305,8 +304,7 @@ public function addContentItemExtended($params = array())
                 "text" : "For more information on how to build and host powerful LTI-based Tools quickly, see www.tsugi.org",
                 "url" : "http://www.tsugi.org/",
                 "placementAdvice" : {
-                        "presentationDocumentTarget" : "window",
-                        "windowTarget" : "_blank"
+                        "presentationDocumentTarget" : "iframe"
                 },
                 "icon" : {
                         "@id" : "https://www.dr-chuck.net/tsugi-static/img/default-icon.png",