From 5d21c26076bdc8f43515ce5faeaedc1e2b7fc62b Mon Sep 17 00:00:00 2001
From: Dan Marsden <Dan@digitalclay.co.nz>
Date: Thu, 22 Jul 2010 01:52:25 +0000
Subject: [PATCH] SCORM MDL-21333 remove link to allow manual opening of window
 as JS communication can fail and no grades are reported from the object.
 Remove old strings no longer required.

---
 mod/scorm/lang/en/scorm.php |  3 +--
 mod/scorm/loadSCO.php       | 12 ------------
 mod/scorm/player.php        |  8 ++------
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/mod/scorm/lang/en/scorm.php b/mod/scorm/lang/en/scorm.php
index 6b76a7218c3..b85a8a4db8b 100644
--- a/mod/scorm/lang/en/scorm.php
+++ b/mod/scorm/lang/en/scorm.php
@@ -196,8 +196,7 @@ $string['passed'] = 'Passed';
 $string['php5'] = 'PHP 5 (DOMXML native library)';
 $string['pluginname'] = 'SCORM package';
 $string['popup'] = 'New window';
-$string['popupblocked'] = 'If a new window does not appear, {$a}';
-$string['popupblockedlinkname'] = 'click here to launch the activity';
+$string['popupblockmessage'] = 'If a pop-up window doesn\'t appear, please enable pop-ups in your browser.';
 $string['popupmenu'] = 'In a drop down menu';
 $string['popupopen'] = 'Open package in a new window';
 $string['position_error'] = 'The {$a->tag} tag can\'t be child of {$a->parent} tag';
diff --git a/mod/scorm/loadSCO.php b/mod/scorm/loadSCO.php
index c0c7844cb94..35d8c20ca4b 100755
--- a/mod/scorm/loadSCO.php
+++ b/mod/scorm/loadSCO.php
@@ -185,18 +185,6 @@
                                                 }
                                             }, 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 43137404e8a..1f77ab21dbe 100755
--- a/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@ -179,8 +179,9 @@
 <?php
     if ($result->prerequisites) {
         if ($scorm->popup != 0) {
+            //Added incase javascript popups are blocked we don't provide a direct link to the pop-up as JS communication can fail - the user must disable their pop-up blocker.
             $linkcourse = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$scorm->course.'">' . get_string('finishscormlinkname','scorm') . '</a>';
-            echo $OUTPUT->box(get_string('finishscorm','scorm',$linkcourse), 'generalbox', 'altfinishlink');
+            echo $OUTPUT->box(get_string('popupblockmessage','scorm'). ' '. get_string('finishscorm','scorm',$linkcourse), 'generalbox', 'altfinishlink');
         }
     }
 ?>
@@ -245,11 +246,6 @@
             <![endif]-->
             </noscript>
 <?php
-            //Added incase javascript popups are blocked
-            $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');
-            //$linkcourse = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$scorm->course.'">' . get_string('finishscormlinkname','scorm') . '</a>';
-            //echo $OUTPUT->box(get_string('finishscorm','scorm',$linkcourse), 'generalbox', 'altfinishlink');
         }
     } else {
         echo $OUTPUT->box(get_string('noprerequisites','scorm'));