From be9187302c993c1423e90823de68c8a49f1519da Mon Sep 17 00:00:00 2001
From: Dan Marsden <Dan@digitalclay.co.nz>
Date: Thu, 24 Jun 2010 01:22:25 +0000
Subject: [PATCH] SCORM MDL-21333 modify way link appears if popup does not
 load to prevent SCORM from loading and not being able to communicate with API
 - thanks to Matteo Scaramuccia for report/fix

---
 mod/scorm/loadSCO.php | 12 ++++++++++++
 mod/scorm/player.php  |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/mod/scorm/loadSCO.php b/mod/scorm/loadSCO.php
index 03d4fb93d48..8188d46c560 100755
--- a/mod/scorm/loadSCO.php
+++ b/mod/scorm/loadSCO.php
@@ -186,6 +186,18 @@
                                                 }
                                             }, 1000);
             }
+            removelink();
+        }
+        function removelink() {
+            try {
+                if (window.opener.document.getElementById('altpopuplink')) {
+                    window.opener.document.getElementById('altpopuplink').style.display='none';
+                } else {
+                    window.opener.document.all['altpopuplink'].style.display='none';
+                }
+            } catch(error) {
+                // nothing to be done
+            }
         }
         //]]>
         </script>
diff --git a/mod/scorm/player.php b/mod/scorm/player.php
index d0a3e8b44a1..1b4045872c2 100755
--- a/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@ -342,8 +342,8 @@
             </noscript>
 <?php
             //Added incase javascript popups are blocked
-            $link = '<a href="'.$CFG->wwwroot.'/mod/scorm/loadSCO.php?id='.$cm->id.$scoidstr.$modestr.'" target="new">'.get_string('popupblockedlinkname','scorm').'</a>';
-            echo $OUTPUT->box(get_string('popupblocked','scorm',$link));
+            $link = '<a href="'.$CFG->wwwroot.'/mod/scorm/loadSCO.php?id='.$cm->id.$scoidstr.$modestr.'" target="_blank">'.get_string('popupblockedlinkname','scorm').'</a>';
+            echo $OUTPUT->box(get_string('popupblocked','scorm',$link), 'generalbox', 'altpopuplink');
         }
     } else {
         echo $OUTPUT->box(get_string('noprerequisites','scorm'));