From 9a0212da087d818f18cb6c45dfc2a75bf2b3ca19 Mon Sep 17 00:00:00 2001
From: bobopinna <bobopinna>
Date: Wed, 14 Mar 2007 20:50:42 +0000
Subject: [PATCH] *** empty log message ***

---
 mod/scorm/datamodels/scorm_12.js.php |  4 ++--
 mod/scorm/datamodels/scorm_12lib.php | 14 ++++++++------
 mod/scorm/datamodels/scorm_13.js.php |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/mod/scorm/datamodels/scorm_12.js.php b/mod/scorm/datamodels/scorm_12.js.php
index ebefb9e66b..e5f1a4b95e 100644
--- a/mod/scorm/datamodels/scorm_12.js.php
+++ b/mod/scorm/datamodels/scorm_12.js.php
@@ -133,8 +133,8 @@ function SCORMapi1_2() {
     $objectives = '';
     foreach($userdata as $element => $value){
         if (substr($element,0,14) == 'cmi.objectives') {
-            preg_match('/.(\d+)./',$element,$matches);
-            $element = preg_replace('/.(\d+)./',"_\$1.",$element);
+            preg_match('/\.(\d+)\./',$element,$matches);
+            $element = preg_replace('/\.(\d+)\./',".\$1.",$element);
             if ($matches[1] == $count) {
                 $count++;
                 $end = strpos($element,$matches[1])+strlen($matches[1]);
diff --git a/mod/scorm/datamodels/scorm_12lib.php b/mod/scorm/datamodels/scorm_12lib.php
index f4c9f929a9..9cdf0c95eb 100644
--- a/mod/scorm/datamodels/scorm_12lib.php
+++ b/mod/scorm/datamodels/scorm_12lib.php
@@ -261,7 +261,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                 if (isset($_COOKIE['hide:SCORMitem'.$nextsco->id])) {
                     $icon = 'plus';
                 }
-                $result->toc .= '<a href="javascript:expandCollide(img'.$sublist.','.$sublist.','.$nextsco->id.');"><img id="img'.$sublist.'" src="'.$scormpixdir.'/'.$icon.'.gif" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
+                //$result->toc .= '<a href="javascript:expandCollide(\'img'.$sublist.'\',\''.$sublist.'\','.$nextsco->id.');"><img id="img'.$sublist.'" src="'.$scormpixdir.'/'.$icon.'.gif" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
+                $result->toc .= '<a href="#" onclick="elementToggleHide(\''.$sublist.'\',true);"><img id="img'.$sublist.'" src="'.$scormpixdir.'/'.$icon.'.gif" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
             } else if ($isvisible) {
                 $result->toc .= '<img src="'.$scormpixdir.'/spacer.gif" />';
             }
@@ -369,15 +370,16 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                   var nn=document.ids?true:false
                   var w3c=document.getElementById?true:false
                   var beg=nn?"document.ids.":w3c?"document.getElementById(":"document.all.";
-                  var mid=w3c?").style":".style";
+                  var style=w3c?").style":".style";
+                  var mid=w3c?")":"";
 
                   if (eval(beg+list+mid+".display") != "none") {
-                      which.src = "'.$scormpixdir.'/plus.gif";
-                      eval(beg+list+mid+".display=\'none\';");
+                      eval(beg+which+mid+".src=\''.$scormpixdir.'/plus.gif\';");
+                      eval(beg+list+style+".display=\'none\';");
                       new cookie("hide:SCORMitem" + item, 1, 356, "/").set();
                   } else {
-                      which.src = "'.$scormpixdir.'/minus.gif";
-                      eval(beg+list+mid+".display=\'block\';");
+                      eval(beg+which+mid+".src=\''.$scormpixdir.'/minus.gif\';");
+                      eval(beg+list+style+".display=\'block\';");
                       new cookie("hide:SCORMitem" + item, 1, -1, "/").set();
                   }
               }
diff --git a/mod/scorm/datamodels/scorm_13.js.php b/mod/scorm/datamodels/scorm_13.js.php
index 6924e6a2a1..39596988ef 100644
--- a/mod/scorm/datamodels/scorm_13.js.php
+++ b/mod/scorm/datamodels/scorm_13.js.php
@@ -166,8 +166,8 @@ function SCORMapi1_3() {
     $objectives = '';
     foreach($userdata as $element => $value){
         if (substr($element,0,14) == 'cmi.objectives') {
-            preg_match('/.(\d+)./',$element,$matches);
-            $element = preg_replace('/.(\d+)./',".N\$1.",$element);
+            preg_match('/\.(\d+)\./',$element,$matches);
+            $element = preg_replace('/\.(\d+)\./',".N\$1.",$element);
             if ($matches[1] == $count) {
                 $count++;
                 $end = strpos($element,$matches[1])+strlen($matches[1]);
-- 
2.39.5