Patched the auto-continue feature

diff --git a/mod/scorm/api1_2.php b/mod/scorm/api1_2.php
index f10e30859103ba9355954c480b6d1bf3707d7cfd..1598d7fbf2ad6ddfe22696c469ad9413f1e13e2e 100644 (file)
--- a/mod/scorm/api1_2.php
+++ b/mod/scorm/api1_2.php
@@ -28,10 +28,10 @@ function SCORMapi() {
            cmi.core.credit = "credit";
            cmi.core.lesson_status = "<?php echo $sco_user->cmi_core_lesson_status; ?>";
            cmi.core.exit = "<?php echo $sco_user->cmi_core_exit ?>";
-           cmi.core.entry = "<?php if ($sco_user->cmi_core_lesson_status=="not attempted") 
+           cmi.core.entry = "<?php if ($sco_user->cmi_core_lesson_status=='not attempted') 
                                        echo 'ab-initio'; 
                                    else 
-                                       if ($sco_user->cmi_core_lesson_status!="completed") 
+                                       if ($sco_user->cmi_core_lesson_status!='completed') 
                                            echo 'resume'; 
                                        else 
                                            echo '';?>";
@@ -211,10 +211,10 @@ function SCORMapi() {
             <?php
                 if ($scorm->auto) {
                     if ($sco != $last) {
-                        print "setTimeout('".$navObj."document.navform.next.click();',500);\n";
+                        echo "setTimeout('".$navObj."document.navform.next.click();',500);\n";
                     } else {
-                        print "exitloc = '".$CFG->wwwroot."/mod/scorm/view.php?id=$cm->id';\n";
-                        print "setTimeout('top.location = exitloc;',500);\n";
+                        echo "exitloc = '".$CFG->wwwroot."/mod/scorm/view.php?id=".$cm->id."';\n";
+                        echo "setTimeout('top.location = exitloc;',500);\n";
                     }
                } 
            ?>

diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index 72ded91c0902de14af28e4cb0060b5ba6f065bc3..950df2ccad3392d41b9e58bbf9a344451898943a 100755 (executable)
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -46,10 +46,12 @@ function scorm_add_instance($scorm) {
         }
     }
     $scorm->popup = implode(',', $optionlist);
-    $scorm->auto = '0';
+    
 
-    if ($scorm->popup != "")
+    if ($scorm->popup != "") {
        $scorm->popup .= ',location=0,menubar=0,toolbar=0';
+       $scorm->auto = '0';
+    }
     
     return insert_record("scorm", $scorm);
 }
@@ -75,11 +77,11 @@ function scorm_update_instance($scorm) {
         }
     }
     $scorm->popup = implode(',', $optionlist);
-    $scorm->auto = '0';
 
-    if ($scorm->popup != "")
+    if ($scorm->popup != "") {
        $scorm->popup .= ',location=0,menubar=0,toolbar=0';
-
+       $scorm->auto = '0';
+    }
     return update_record("scorm", $scorm);
 }
 

diff --git a/mod/scorm/mod.html b/mod/scorm/mod.html
index 0d9f1c9bf97b4a11897a683db08f9768c7a5d11d..84772a2df05ff894f2b42e1b409407fddaddf2c9 100755 (executable)
--- a/mod/scorm/mod.html
+++ b/mod/scorm/mod.html
@@ -61,6 +61,7 @@
     <input type="hidden" name=datadir  value="<?php p($form->datadir) ?>">
     <input type="hidden" name=launch   value="<?php p($form->launch) ?>">
     <input type="hidden" name=popup    value="<?php p($form->popup) ?>">
+    <input type="hidden" name=auto     value="<?php p($form->auto) ?>">
     <input type="hidden" name=section  value="<?php p($form->section) ?>">
     <input type="hidden" name=module   value="<?php p($form->module) ?>">
     <input type="hidden" name=modulename       value="<?php p($form->modulename) ?>">