MDL-15950 MDL-15640 - SCORM player.php not inserting footer, Showing SCORM participat...

diff --git a/mod/scorm/player.php b/mod/scorm/player.php
index 9b69ebad09c8fabc255d694194b0c6670f632315..6f4cbcd06086af35a79bf84151307ef6c32e7f22 100755 (executable)
--- a/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@ -99,7 +99,8 @@
         }
     }
 
-    add_to_log($course->id, 'scorm', 'view', "player.php?id=$cm->id&scoid=$sco->id", "$scorm->id");
+    add_to_log($course->id, 'scorm', 'view', "player.php?id=$cm->id&scoid=$sco->id", "$scorm->id", $cm->id);
+    
 
     $scoidstr = '&scoid='.$sco->id;
     $scoidpop = '&scoid='.$sco->id;
@@ -371,11 +372,5 @@
 ?>
             </div> <!-- SCORM object -->
         </div> <!-- SCORM box  -->
-    </div> <!-- SCORM content -->
-    <?php if (!empty($THEME->customcorners)) {
-        print_container_end();
-    } ?>
-    </div> <!-- Content -->
-    </div> <!-- Page -->
-</body>
-</html>
+    </div> <!-- SCORM page -->
+<?php print_footer('none'); ?> 
\ No newline at end of file

diff --git a/mod/scorm/rd.js b/mod/scorm/rd.js
index f54dc52665b7af556e243b00c4bc68fb19c93193..ddb939a56c91978b4dfa0aba2f7b4509f920a7b6 100644 (file)
--- a/mod/scorm/rd.js
+++ b/mod/scorm/rd.js
@@ -73,5 +73,12 @@ function scorm_resize () {
         document.getElementById('scormobject').style.height = (winheight - totalheight) + 'px';
     }
 
+    // resize the content container too to move the footer below the SCORM content
+    var contenti3 = document.getElementById('content-i3');
+    if (contenti3) {
+        contenti3.style.height = (winheight - totalheight + 30) + 'px';
+    } else {
+       document.getElementById('content').style.height = (winheight - totalheight + 30) + 'px';
+    }
 }
 -->

diff --git a/mod/scorm/report.php b/mod/scorm/report.php
index 055e3289bf3d8979dda26af5882fb5aa18e8edde..8a2f7828f51318a1698d9d479e0901626898a0f0 100755 (executable)
--- a/mod/scorm/report.php
+++ b/mod/scorm/report.php
@@ -47,7 +47,7 @@
         print_error('cannotcallscript');
     }
 
-    add_to_log($course->id, 'scorm', 'report', 'report.php?id='.$cm->id, $scorm->id);
+    add_to_log($course->id, 'scorm', 'report', 'report.php?id='.$cm->id, $scorm->id, $cm->id);
 
     if (!empty($user)) {
         $userdata = scorm_get_user_data($user);

diff --git a/mod/scorm/view.php b/mod/scorm/view.php
index 9fd8cef76d3cee46e05846b84a27e40b42cc40ba..1cfc00d25ce253eda5903d57f7b0e224cd4cb8af 100755 (executable)
--- a/mod/scorm/view.php
+++ b/mod/scorm/view.php
@@ -54,7 +54,7 @@
     }
     $pagetitle = strip_tags($course->shortname.': '.format_string($scorm->name));
 
-    add_to_log($course->id, 'scorm', 'pre-view', 'view.php?id='.$cm->id, "$scorm->id");
+    add_to_log($course->id, 'scorm', 'pre-view', 'view.php?id='.$cm->id, "$scorm->id", $cm->id);
 
     if ((has_capability('mod/scorm:skipview', get_context_instance(CONTEXT_MODULE,$cm->id))) && scorm_simple_play($scorm,$USER)) {
         exit;