Fix links in http/https see BT# 10217

main/inc/lib/fixlinks.js

@@ -2,10 +2,10 @@ $(document).ready(function() {
     var objects = $(document).find('object');
     var pathname = location.pathname;
     var coursePath = pathname.substr(0, pathname.indexOf('/courses/'));
+    var iconPath = location.protocol +  '//' + location.host+ coursePath + '/main/img/';
     var url = "http://"+location.host + coursePath+"/courses/proxy.php?";
 
     objects.each(function (value, obj) {
-        var dialogId = this.id +'_dialog';
         var openerId = this.id +'_opener';
         var link = '<a id="'+openerId+'" href="#">If video does not work, try clicking here.</a>';
         var embed = $("#"+this.id).find('embed').first();
@@ -21,22 +21,55 @@ $(document).ready(function() {
             '&src='+src+
             '&width='+width;
 
-        /*var iframe = '<iframe ' +
-            'style="border: 0px;"  width="100%" height="100%" ' +
-            'src="'+completeUrl+
-            '">' +
-            '</iframe>';
-
-        var content = '<div id="'+dialogId+'">' + iframe+'</div>';*/
         var result = $("#"+this.id).find('#'+openerId);
-
         if (result.length == 0) {
             $("#" + this.id).append('<br />' + link);
-
             $('#' + openerId).click(function () {
                 var window = window.open(completeUrl, "Video", "width=" + width + ", " + "height=" + height + "");
                 window.document.title = 'Video';
             });
         }
     });
+
+    var iframes = $(document).find('iframe');
+    iframes.each(function (value, obj) {
+        var randLetter = String.fromCharCode(65 + Math.floor(Math.random() * 26));
+        var uniqid = randLetter + Date.now();
+        var openerId = uniqid +'_opener';
+        var link = '<a id="'+openerId+'" class="generated" href="#">If iframe does not work, try clicking here.<img src="'+iconPath+'link-external.png "/></a>';
+        var embed = $(this);
+        var height = embed.attr('height');
+        var width = embed.attr('width');
+        var src = embed.attr('src');
+        var completeUrl =  url + 'width='+embed.attr('width')+
+            '&height='+height+
+            '&type=iframe'+
+            '&id='+uniqid+
+            '&src='+src+
+            '&width='+width;
+        var result = $(this).find('#'+openerId);
+
+        if (result.length == 0) {
+            if (embed.next().attr('class') != 'generated') {
+                $(this).parent().append(link + '<br />');
+                $('#' + openerId).click(function () {
+                    width = 1024;
+                    height = 640;
+                    var win = window.open(completeUrl, "Video", "width=" + width + ", " + "height=" + height + "");
+                    win.document.title = 'Video';
+                });
+            }
+        }
+    });
+
+    var anchors = $(document).find('a').not('.generated');
+    anchors.each(function (value, obj) {
+        if ($(this).next().attr('class') != 'generated') {
+            var src = $(this).attr('href');
+            src = src.replace('https', 'http');
+            var myAnchor = $('<a><img src="'+iconPath+'link-external.png "/></a>').attr("href", src).attr('target', '_blank').attr('class', 'generated');
+            $(this).after(myAnchor);
+            $(this).after('-');
+        }
+    });
 });

main/newscorm/blank.php

@@ -39,7 +39,7 @@ if (isset($_GET['error'])) {
                 $icon = '<i class="icon-play-sign icon-2x"></i>&nbsp;';
 
                 echo Display::return_message(
-                    Display::url($icon.$src, $src, ['target' => '_blank']),
+                    Display::url($icon.$src, $src, ['class' => 'btn generated', 'target' => '_blank']),
                     'normal',
                     false
                 );

main/newscorm/scorm_api.php

@@ -2130,6 +2130,7 @@ function attach_glossary_into_scorm(type) {
             });
         }
 
+
         if (type == 'fix_links') {
             $(document).ready(function() {
                 var objects = $("iframe").contents().find('object');
@@ -2143,7 +2144,7 @@ objects.each(function (value, obj) {
                     var dialogId = this.id +'_dialog';
                     var openerId = this.id +'_opener';
 
-var link = '<a id="'+openerId+'" href="#" class="btn">'+
+                    var link = '<a id="'+openerId+'" href="#" class="generated btn">'+
                         '<div style="text-align: center"><img src="<?php echo api_get_path(WEB_CODE_PATH).'img/play-circle-8x.png'; ?>"/><br />If video does not work, try clicking here.</div></a>';
                     var embed = $("iframe").contents().find("#"+this.id).find('embed').first();
 
@@ -2164,14 +2165,56 @@ var iframe = '<iframe ' +
                         '">' +
                         '</iframe>';
 
-
-$("iframe").contents().find("#"+this.id).append('<br />' + link);
+                    $("iframe").contents().find("#"+this.id).append(link + '<br />');
                     $("iframe").contents().find('#' + openerId).click(function() {
                         var w = window.open(completeUrl, "Video", "width="+width+", "+"height="+height+"");
                         w = window.document.title = 'Video';
                     });
                 });
+
+                var iframes = $("iframe").contents().find('iframe');
+
+                iframes.each(function (value, obj) {
+                    var randLetter = String.fromCharCode(65 + Math.floor(Math.random() * 26));
+                    var uniqid = randLetter + Date.now();
+                    var openerId = uniqid +'_opener';
+                    var link = '<a id="'+openerId+'" class="generated" href="#">If iframe does not work, try clicking here. <img src="<?php echo api_get_path(WEB_CODE_PATH).'img/link-external.png'; ?>"/></a>';
+                    var embed = $(this);
+                    var height = embed.attr('height');
+                    var width = embed.attr('width');
+                    var src = embed.attr('src');
+                    var completeUrl =  url + 'width='+embed.attr('width')+
+                        '&height='+height+
+                        '&type=iframe'+
+                        '&id='+uniqid+
+                        '&src='+src+
+                        '&width='+width;
+                    var result = $("iframe").contents().find('#'+openerId);
+
+                    if (result.length == 0) {
+                        if (embed.next().attr('class') != 'generated') {
+                            $(this).parent().append(link + '<br />');
+                            $("iframe").contents().find('#' + openerId).click(function() {
+                                width = 1024;
+                                height = 640;
+                                var win = window.open(completeUrl, "Video", "width=" + width + ", " + "height=" + height + "");
+                                win.document.title = 'Video';
+                            });
+                        }
+                    }
+                });
+
+                var anchors = $("iframe").contents().find('a').not('.generated');
+                anchors.each(function (value, obj) {
+                    var src = $(this).attr('href');
+                    src = src.replace('https', 'http');
+                    var myAnchor = $('<a><img src="<?php echo api_get_path(WEB_CODE_PATH).'img/link-external.png'; ?>"/></a>').attr("href", src).attr('target', '_blank').attr('class', 'generated');
+                    $(this).after(myAnchor);
+                    $(this).after('-');
+                });
             });
         }
+
+
     }
 }