*** empty log message ***

diff --git a/mod/scorm/api1_2.php b/mod/scorm/api1_2.php
index d2066dcd08dd867b708850c7ec76d10cf3a6cc37..abe739ebed5c8158c5efa577e05d06e4ff11e954 100644 (file)
--- a/mod/scorm/api1_2.php
+++ b/mod/scorm/api1_2.php
@@ -3,6 +3,7 @@
 //
 function SCORMapi() {
     var cmi= new Object();
+    var nav = new Object();
 
     var errorCode = 0;
     
@@ -53,7 +54,7 @@ function SCORMapi() {
            // end CMI Initialization
            //
            
-           nav = new Object();
+           // Navigation Object
            <?php 
                if ($scorm->auto) {
                    echo 'nav.event = "continue";'."\n";
@@ -111,14 +112,10 @@ function SCORMapi() {
            switch (param) {
                case "cmi.core.session_time":
                    if (typeof(value) == "string") {
-                       var matchedtime = value.match(/([0-9]{2,4}):([0-9]{2}):([0-9]{2})/g);
-                       if (matchedtime != null) {
-                           var parsedtime = value.match(/[0-9]+/g);
-                           if (((parsedtime.length == 3) || (parsedtime.length == 4)) && (parsedtime[0]>=0) && (parsedtime[0]<=9999) && (parsedtime[1]>=0) && (parsedtime[1]<=59) && (parsedtime[2]>=0) && (parsedtime[2]<=59)) {
-                               if ((parsedtime.length == 4) && (parsedtime[3]<=0) && (parsedtime[3]>=99)) {
-                                   errorCode = 405;
-                                   return "false";
-                               }
+                       var parsedtime = value.match(/^([0-9]{2,4}):([0-9]{2}):([0-9]{2})(\.[0-9]{1,2})?$/);
+                       if (parsedtime != null) {
+                           //top.alert(parsedtime);
+                           if (((parsedtime.length == 4) || (parsedtime.length == 5)) && (parsedtime[2]>=0) && (parsedtime[2]<=59) && (parsedtime[3]>=0) && (parsedtime[3]<=59)) {
                                eval(param+'="'+value+'";');
                                errorCode = 0;
                                return "true";
@@ -249,11 +246,13 @@ function SCORMapi() {
            Initialized = false;
            errorCode = 0;
            cmi.core.total_time = AddTime(cmi.core.total_time, cmi.core.session_time);
+           //top.alert(cmi.core.total_time);
            if (<?php echo $navObj ?>cmi.document.theform) {
                cmiform = <?php echo $navObj ?>cmi.document.forms[0];
                cmiform.scoid.value = "<?php echo $sco->id; ?>";
                cmiform.cmi_core_total_time.value = cmi.core.total_time;
                cmiform.submit();
+               
            }
             if (nav.event != "") {
             <?php

diff --git a/mod/scorm/cmi.php b/mod/scorm/cmi.php
index ef780bf51981de68190e6057f762b98175a914c9..2c6716f36fe9029b1708d828eae73bb6ceb948ee 100755 (executable)
--- a/mod/scorm/cmi.php
+++ b/mod/scorm/cmi.php
@@ -32,23 +32,23 @@
 
     require_login($course->id);
     
-    if ($_POST["scoid"]) {
-        if ($_POST["cmi_core_lesson_location"]) {
+    if (!empty($_POST["scoid"])) {
+        if (!empty($_POST["cmi_core_lesson_location"])) {
            set_field("scorm_sco_users","cmi_core_lesson_location",$_POST["cmi_core_lesson_location"],"scoid",$_POST["scoid"],"userid",$USER->id);
        }
-       if ($_POST["cmi_core_lesson_status"]) {
+       if (!empty($_POST["cmi_core_lesson_status"])) {
             set_field("scorm_sco_users","cmi_core_lesson_status",$_POST["cmi_core_lesson_status"],"scoid",$_POST["scoid"],"userid",$USER->id);
         }
-       if ($_POST["cmi_core_exit"]) {
+       if (!empty($_POST["cmi_core_exit"])) {
             set_field("scorm_sco_users","cmi_core_exit",$_POST["cmi_core_exit"],"scoid",$_POST["scoid"],"userid",$USER->id);
         }
-       if ($_POST["cmi_core_total_time"]) {
+       if (!empty($_POST["cmi_core_total_time"])) {
             set_field("scorm_sco_users","cmi_core_total_time",$_POST["cmi_core_total_time"],"scoid",$_POST["scoid"],"userid",$USER->id);
         }
-       if ($_POST["cmi_core_score_raw"]) {
+       if (!empty($_POST["cmi_core_score_raw"])) {
             set_field("scorm_sco_users","cmi_core_score_raw",$_POST["cmi_core_score_raw"],"scoid",$_POST["scoid"],"userid",$USER->id);
         }
-       if ($_POST["cmi_suspend_data"]) {
+       if (!empty($_POST["cmi_suspend_data"])) {
             set_field("scorm_sco_users","cmi_suspend_data",$_POST["cmi_suspend_data"],"scoid",$_POST["scoid"],"userid",$USER->id);
         }
     }
@@ -64,10 +64,9 @@
        <input type="hidden" name="cmi_core_lesson_status" />
        <input type="hidden" name="cmi_core_exit" />
        <input type="hidden" name="cmi_core_session_time" />
-       <input type="hidden" name="cmi_core_total_time" />
+       <input type="hidden" name="cmi_core_total_time"  />
        <input type="hidden" name="cmi_core_score_raw" />
        <input type="hidden" name="cmi_suspend_data" />
    </form>
-   <?php echo $result?>
 </body>
 </html>

diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index 950df2ccad3392d41b9e58bbf9a344451898943a..ba3080af443f408b2ceca9cd1374e7e3503f0da5 100755 (executable)
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -302,10 +302,15 @@ function scorm_endElement($parser, $name) {
     if ($name == "ITEM") {
         $level--;
     }
-    if ($name == "TITLE" && $level>0)
-    $manifest[$i]["title"] = $datacontent;
-    if ($name == "ADLCP:HIDERTSUI")
-    $manifest[$i][$datacontent] = 1;
+    if ($name == "TITLE" && $level>0) {
+       $manifest[$i]["title"] = $datacontent;
+    }
+    if ($name == "ADLCP:HIDERTSUI") {
+       $manifest[$i][$datacontent] = 1;
+    }
+    if ($name == "ORGANIZATION") {
+       $level = 0;
+    }
 }
 
 function scorm_characterData($parser, $data) {
@@ -344,6 +349,7 @@ function scorm_parse($basedir,$file,$scorm_id) {
     $sco->scorm = $scorm_id;
     delete_records("scorm_scoes","scorm",$scorm_id);
     delete_records("scorm_sco_users","scormid",$scorm_id);
+    print_r($manifest);
     for ($j=1; $j<=$i; $j++) {
         $sco->identifier = $manifest[$j]["identifier"];
         $sco->parent = $manifest[$j]["parent"];

diff --git a/mod/scorm/playscorm.php b/mod/scorm/playscorm.php
index 7daa10ab4f7f6965114e27a69b849ed750c287d8..14939c65efb03020751f87f673c4fc183033d707 100755 (executable)
--- a/mod/scorm/playscorm.php
+++ b/mod/scorm/playscorm.php
@@ -127,14 +127,25 @@
                            echo "  </ul></li>\n";
                            $level--;
                        } else {
-                           echo "  <li><ul id='".$sublist."' class=\"scormlist\"'>\n";
-                           $level++;
+                           $i = $level;
+                           $closelist = "";
+                           while (($i > 0) && ($parents[$level] != $sco->parent)) {
+                               $closelist .= "  </ul></li>\n";
+                               $i--;
+                           }
+                           if (($i == 0) && ($sco->parent != "/")) {
+                               echo "  <li><ul id='".$sublist."' class=\"scormlist\"'>\n";
+                               $level++;
+                           } else {
+                               echo $closelist;
+                               $level = $i;
+                           }
                            $parents[$level]=$sco->parent;
                        }
                    }
                    echo "    <li>\n";
                    $nextsco = next($scoes);
-                   if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent != $parents[$level-1])))) {
+                   if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) {
                        $sublist++;
                        echo "      <img src=\"pix/minus.gif\" onClick='expandCollide(this,".$sublist.");'/>\n";
                    } else {
@@ -189,7 +200,7 @@
            
        echo "<table width=\"100%\">\n    <tr>\n";
        echo "          <td align=\"center\" nowrap>
-                    <iframe name=\"cmi\" width=\"1\" height=\"1\" src=\"cmi.php?id=$cm->id\" style=\"visibility: hidden;\"></iframe>
+                    <iframe name=\"cmi\" width=\"1\" height=\"1\" src=\"cmi.php?id=$cm->id\" style=\"visibility: hidden\"></iframe>
                     <form name=\"navform\" method=\"POST\" action=\"playscorm.php?id=$cm->id\" target=\"_top\">
                        <input name=\"scoid\" type=\"hidden\" />
                        <input name=\"mode\" type=\"hidden\" value=\"".$mode."\" />
@@ -204,7 +215,15 @@
                        if ($level>0 && $parents[$level-1]==$sco->parent) {
                            $level--;
                        } else {
-                           $level++;
+                           $i = $level;
+                           while (($i > 0) && ($parents[$level] != $sco->parent)) {
+                               $i--;
+                           }
+                           if (($i == 0) && ($sco->parent != "/")) {
+                               $level++;
+                           } else {
+                               $level = $i;
+                           }
                            $parents[$level]=$sco->parent;
                        }
                    }

diff --git a/mod/scorm/view.php b/mod/scorm/view.php
index c456c8b1dc3c11a994e7dae80d64c625800141ed..c9197bd11bb5ec92038f03d819d28dc5bc11c58c 100755 (executable)
--- a/mod/scorm/view.php
+++ b/mod/scorm/view.php
@@ -105,14 +105,26 @@
                        echo "  </ul></li>\n";
                        $level--;
                    } else {
-                       echo "  <li><ul id='".$sublist."' class=\"scormlist\"'>\n";
-                       $level++;
+                       $i = $level;
+                       $closelist = "";
+                       while (($i > 0) && ($parents[$level] != $sco->parent)) {
+                           $closelist .= "  </ul></li>\n";
+                           $i--;
+                       }
+                       if (($i == 0) && ($sco->parent != "/")) {
+                           echo "  <li><ul id='".$sublist."' class=\"scormlist\"'>\n";
+                           $level++;
+                       } else {
+                           echo $closelist;
+                           $level = $i;
+                       }
                        $parents[$level]=$sco->parent;
                    }
-               }
+               } 
+               
                echo "    <li>\n";
                $nextsco = next($scoes);
-               if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent != $parents[$level-1])))) {
+               if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) {
                    $sublist++;
                    echo "      <img src=\"pix/minus.gif\" onClick='expandCollide(this,".$sublist.");'/>\n";
                } else {
@@ -120,18 +132,21 @@
                }
                if ($sco->launch) {
                    if ($sco_user=get_record("scorm_sco_users","scoid",$sco->id,"userid",$USER->id)) {
-                       if ( $sco_user->cmi_core_lesson_status == "")
+                       if ( $sco_user->cmi_core_lesson_status == "") {
                            $sco_user->cmi_core_lesson_status = "not attempted";
+                       }
                        echo "      <img src=\"pix/".scorm_remove_spaces($sco_user->cmi_core_lesson_status).".gif\" alt=\"".get_string(scorm_remove_spaces($sco_user->cmi_core_lesson_status),"scorm")."\" title=\"".get_string(scorm_remove_spaces($sco_user->cmi_core_lesson_status),"scorm")."\" />\n";
-                       if (($sco_user->cmi_core_lesson_status == "not attempted") || ($sco_user->cmi_core_lesson_status == "incomplete"))
+                       if (($sco_user->cmi_core_lesson_status == "not attempted") || ($sco_user->cmi_core_lesson_status == "incomplete")) {
                            $incomplete = true;
+                       }
                    } else {
                        echo "      <img src=\"pix/notattempted.gif\" alt=\"".get_string("notattempted","scorm")."\" />";
                        $incomplete = true;
                    }
                    $score = "";
-                   if ($sco_user->cmi_core_score_raw > 0)
-                           $score = "(".get_string("score","scorm").":&nbsp;".$sco_user->cmi_core_score_raw.")";
+                   if ($sco_user->cmi_core_score_raw > 0) {
+                       $score = "(".get_string("score","scorm").":&nbsp;".$sco_user->cmi_core_score_raw.")";
+                   }
                    echo "      &nbsp;<a href=\"javascript:playSCO(".$sco->id.")\">$sco->title</a> $score\n    </li>\n";
                } else {
                    echo "      &nbsp;$sco->title\n    </li>\n";