diff --git a/dokeos_license.txt b/dokeos_license.txt
index 8c9d4d38ce..40f804e941 100644
--- a/dokeos_license.txt
+++ b/dokeos_license.txt
@@ -7,6 +7,7 @@
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) 2003-2008 Vrije Universiteit Brussel (VUB)
Copyright (c) 2004-2008 Hoogeschool Gent (HoGent)
+ Copyright (c) Denes Nagy (darkden@freemail.hu)
For a full list of contributors detaining copyrights over parts of
the Dokeos software, see "documentation/credits.html".
The full license can be read in "documentation/license.html".
diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index 2c059279f5..e199209f94 100644
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -1786,9 +1786,9 @@ class learnpath {
'
' . "\n" .
- '
' . "\n" .
+ '
' . "\n" .
- '
' . "\n" .
+ '
' . "\n" .
//'
'."\n" .
@@ -1814,9 +1814,9 @@ class learnpath {
'
' . "\n" .
- '
' . "\n" .
+ '
' . "\n" .
- '
' . "\n" .
+ '
' . "\n" .
// '
'."\n" .
@@ -2648,6 +2648,28 @@ class learnpath {
}
return $toc;
}
+ /**
+ * Generate and return the table of contents for this learnpath. The JS
+ * table returned is used inside of scorm_api.php
+ * @return string A JS array vairiable construction
+ */
+ function get_items_details_as_js($varname='olms.lms_item_types') {
+ if ($this->debug > 0) {
+ error_log('New LP - In learnpath::get_items_details_as_js()', 0);
+ }
+ $toc = $varname.' = new Array();';
+ //echo "
".print_r($this->items,true)."
";
+ foreach ($this->ordered_items as $item_id) {
+ if ($this->debug > 2) {
+ error_log('New LP - learnpath::get_items_details_as_js(): getting info for item ' . $item_id, 0);
+ }
+ $toc.= $varname."['i$item_id'] = '".$this->items[$item_id]->get_type()."';";
+ }
+ if ($this->debug > 2) {
+ error_log('New LP - In learnpath::get_items_details_as_js() - TOC array: ' . print_r($toc, true), 0);
+ }
+ return $toc;
+ }
/**
* Gets the learning path type
* @param boolean Return the name? If false, return the ID. Default is false.
@@ -2714,70 +2736,6 @@ class learnpath {
}
return $list;
}
- /**
- * Uses the table generated by get_toc() and returns an HTML-formatted string ready to display
- * @return string HTML TOC ready to display
- */
- /*function get_html_toc()
- {
- if($this->debug>0){error_log('New LP - In learnpath::get_html_toc()',0);}
- $list = $this->get_toc();
- //echo $this->current;
- //$parent = $this->items[$this->current]->get_parent();
- //if(empty($parent)){$parent = $this->ordered_items[$this->items[$this->current]->get_previous_index()];}
- $html = ''."\n" ;
- // " onchange=\"javascript:document.getElementById('toc_$parent').focus();\">\n";
- require_once('resourcelinker.inc.php');
-
- //temp variables
- $mycurrentitemid = $this->get_current_item_id();
-
- foreach($list as $item)
- {
- if($this->debug>2){error_log('New LP - learnpath::get_html_toc(): using item '.$item['id'],0);}
- //TODO complete this
- $icon_name = array('not attempted' => '../img/notattempted.gif',
- 'incomplete' => '../img/incomplete.gif',
- 'failed' => '../img/failed.gif',
- 'completed' => '../img/completed.gif',
- 'passed' => '../img/passed.gif',
- 'succeeded' => '../img/succeeded.gif',
- 'browsed' => '../img/completed.gif');
-
- $style = 'scorm_item';
- if($item['id'] == $this->current){
- $style = 'scorm_item_highlight';
- }
- //the anchor will let us center the TOC on the currently viewed item &^D
- $html .= '
' .
- '
!['.substr($item['status'],0,1).']('.$icon_name[$item['status']].')
';
-
- //$title = htmlspecialchars($item['title'],ENT_QUOTES,$this->encoding);
- $title = $item['title'];
- if(empty($title)){
- $title = rl_get_resource_name(api_get_course_id(),$this->get_id(),$item['id']);
- $title = htmlspecialchars($title,ENT_QUOTES,$this->encoding);
- }
- if(empty($title))$title = '-';
-
- if($item['type']!='dokeos_chapter' and $item['type']!='dir'){
- //$html .= "
".$title."" ;
- $url = $this->get_link('http',$item['id']);
- //$html .= '
'.$title.'' ;
- //$html .= '
'.$title.'' ;
- $html .= '
'.$title.'' ;
- }else{
- $html .= $title;
- }
- $html .= "
\n";
- }
- $html .= "
\n";
- return $html;
- }*/
-
/**
* Uses the table generated by get_toc() and returns an HTML-formatted string ready to display
* @return string HTML TOC ready to display
@@ -2880,7 +2838,7 @@ class learnpath {
//$html .= ''.$title.'' ;
//
background:#aaa;
- $html .= '' . stripslashes($title) . '';
diff --git a/main/newscorm/lp_ajax_initialize.php b/main/newscorm/lp_ajax_initialize.php
new file mode 100644
index 0000000000..d7b1bbb0dc
--- /dev/null
+++ b/main/newscorm/lp_ajax_initialize.php
@@ -0,0 +1,173 @@
+
+ */
+/**
+ * Script
+ */
+//flag to allow for anonymous user - needs to be set before global.inc.php
+$use_anonymous = true;
+// name of the language file that needs to be included
+$language_file[] = 'learnpath';
+require_once('back_compat.inc.php');
+/**
+ * Get one item's details
+ * @param integer LP ID
+ * @param integer user ID
+ * @param integer View ID
+ * @param integer Current item ID
+ * @param integer New item ID
+ */
+function initialize_item($lp_id,$user_id,$view_id,$next_item)
+{
+ $debug=0;
+ $return = '';
+ if($debug>0){error_log('In initialize_item('.$lp_id.','.$user_id.','.$view_id.','.$next_item.')',0);}
+ //$objResponse = new xajaxResponse();
+ /*$item_id may be one of:
+ * -'next'
+ * -'previous'
+ * -'first'
+ * -'last'
+ * - a real item ID
+ */
+ require_once('learnpath.class.php');
+ require_once('scorm.class.php');
+ require_once('aicc.class.php');
+ require_once('learnpathItem.class.php');
+ require_once('scormItem.class.php');
+ require_once('aiccItem.class.php');
+ $mylp = '';
+ if (isset($_SESSION['lpobject'])) {
+ if ($debug>1) {error_log('////$_SESSION[lpobject] is set',0);}
+ $oLP =& unserialize($_SESSION['lpobject']);
+ if (!is_object($oLP)) {
+ if($debug>1){error_log(print_r($oLP,true),0);}
+ if($debug>2){error_log('////Building new lp',0);}
+ unset($oLP);
+ $code = api_get_course_id();
+ $mylp = & new learnpath($code,$lp_id,$user_id);
+ } else {
+ if($debug>1){error_log('////Reusing session lp',0);}
+ $mylp = & $oLP;
+ }
+ }
+ $mylp->set_current_item($next_item);
+ if ($debug>1) {error_log('In {default} - item is '.$new_item_id,0);}
+ $mylp->start_current_item(true);
+ /*
+ if ($mylp->force_commit) {
+ $mylp->save_current();
+ }
+ */
+ //$objResponse->addAlert(api_get_path(REL_CODE_PATH).'newscorm/learnpathItem.class.php');
+ if (is_object($mylp->items[$next_item])) {
+ $mylpi = & $mylp->items[$next_item];
+ } else {
+ if($debug>1){error_log('In switch_item_details - generating new item object',0);}
+ $mylpi =& new learnpathItem($next_item,$user_id);
+ $mylpi->set_lp_view($view_id);
+ }
+ /*
+ * now get what's needed by the SCORM API:
+ * -score
+ * -max
+ * -min
+ * -lesson_status
+ * -session_time
+ * -suspend_data
+ */
+ $myscore = $mylpi->get_score();
+ $mymax = $mylpi->get_max();
+ if($mymax===''){$mymax="''";}
+ $mymin = $mylpi->get_min();
+ $mylesson_status = $mylpi->get_status();
+ $mylesson_location = $mylpi->get_lesson_location();
+ $mytotal_time = $mylpi->get_scorm_time('js');
+ $mymastery_score = $mylpi->get_mastery_score();
+ $mymax_time_allowed = $mylpi->get_max_time_allowed();
+ $mylaunch_data = $mylpi->get_launch_data();
+ $mysession_time = $mylpi->get_total_time();
+ $mysuspend_data = $mylpi->get_suspend_data();
+ $mylesson_location = $mylpi->get_lesson_location();
+ $myic = $mylpi->get_interactions_count();
+ $myistring = '';
+ for ($i=0;$i<$myic;$i++) {
+ $myistring .= ",[".$i.",'','','','','','','']";
+ }
+ if (!empty($myistring)) {
+ $myistring = substr($myistring,1);
+ }
+ $return .=
+ "olms.score=".$myscore.";" .
+ "olms.max=".$mymax.";" .
+ "olms.min=".$mymin.";" .
+ "olms.lesson_status='".$mylesson_status."';" .
+ "olms.lesson_location='".$mylesson_location."';" .
+ "olms.session_time='".$mysession_time."';" .
+ "olms.suspend_data='".$mysuspend_data."';" .
+ "olms.total_time = '".$mytotal_time."';" .
+ "olms.mastery_score = '".$mymastery_score."';" .
+ "olms.max_time_allowed = '".$mymax_time_allowed."';" .
+ "olms.launch_data = '".$mylaunch_data."';" .
+ "olms.interactions = new Array(".$myistring.");" .
+ "olms.item_objectives = new Array();" .
+ "olms.G_lastError = 0;" .
+ "olms.G_LastErrorMessage = 'No error';" ;
+ /*
+ * and re-initialise the rest (proper to the LMS)
+ * -lms_lp_id
+ * -lms_item_id
+ * -lms_old_item_id
+ * -lms_new_item_id
+ * -lms_initialized
+ * -lms_progress_bar_mode
+ * -lms_view_id
+ * -lms_user_id
+ */
+ $mytotal = $mylp->get_total_items_count_without_chapters();
+ $mycomplete = $mylp->get_complete_items_count();
+ $myprogress_mode = $mylp->get_progress_bar_mode();
+ $myprogress_mode = ($myprogress_mode==''?'%':$myprogress_mode);
+ $mynext = $mylp->get_next_item_id();
+ $myprevious = $mylp->get_previous_item_id();
+ $myitemtype = $mylpi->get_type();
+ $mylesson_mode = $mylpi->get_lesson_mode();
+ $mycredit = $mylpi->get_credit();
+ $mylaunch_data = $mylpi->get_launch_data();
+ $myinteractions_count = $mylpi->get_interactions_count();
+ $myobjectives_count = $mylpi->get_objectives_count();
+ $mycore_exit = $mylpi->get_core_exit();
+
+ $return .=
+ "olms.lms_lp_id=".$lp_id.";" .
+ "olms.lms_item_id=".$next_item.";" .
+ "olms.lms_old_item_id=0;" .
+ "olms.lms_initialized=0;" .
+ "olms.lms_view_id=".$view_id.";" .
+ "olms.lms_user_id=".$user_id.";" .
+ "olms.next_item=".$next_item.";" . //this one is very important to replace possible literal strings
+ "olms.lms_next_item=".$mynext.";" .
+ "olms.lms_previous_item=".$myprevious.";" .
+ "olms.lms_item_type = '".$myitemtype."';" .
+ "olms.lms_item_credit = '".$mycredit."';" .
+ "olms.lms_item_lesson_mode = '".$mylesson_mode."';" .
+ "olms.lms_item_launch_data = '".$mylaunch_data."';" .
+ "olms.lms_item_interactions_count = '".$myinteractions_count."';" .
+ "olms.lms_item_objectives_count = '".$myinteractions_count."';" .
+ "olms.lms_item_core_exit = '".$mycore_exit."';" .
+ "olms.asset_timer = 0;";
+
+ $mylp->set_error_msg('');
+ $mylp->prerequisites_match(); //check the prerequisites are all complete
+ if($debug>1){error_log('Prereq_match() returned '.htmlentities($mylp->error),0);}
+ //$_SESSION['scorm_item_id'] = $new_item_id;//Save the new item ID for the exercise tool to use
+ //$_SESSION['lpobject'] = serialize($mylp);
+ return $return;
+}
+echo initialize_item($_POST['lid'],$_POST['uid'],$_POST['vid'],$_POST['iid']);
\ No newline at end of file
diff --git a/main/newscorm/lp_ajax_save_item.php b/main/newscorm/lp_ajax_save_item.php
index 22ca9c1007..58b6b4ff04 100755
--- a/main/newscorm/lp_ajax_save_item.php
+++ b/main/newscorm/lp_ajax_save_item.php
@@ -141,7 +141,7 @@ function save_item($lp_id,$user_id,$view_id,$item_id,$score=-1,$max=-1,$min=-1,$
if($mylpi->get_type()!='sco')
{ //if this object's JS status has not been updated by the SCORM API, update now
//$objResponse->addScript("lesson_status='".$mystatus."';");
- $return .= "lesson_status='".$mystatus."';";
+ $return .= "olms.lesson_status='".$mystatus."';";
}
//$objResponse->addScript("update_toc('".$mystatus."','".$item_id."');");
$return .= "update_toc('".$mystatus."','".$item_id."');";
diff --git a/main/newscorm/lp_ajax_start_timer.php b/main/newscorm/lp_ajax_start_timer.php
old mode 100755
new mode 100644
index 4a2dabca9c..d8ddb1c41a
--- a/main/newscorm/lp_ajax_start_timer.php
+++ b/main/newscorm/lp_ajax_start_timer.php
@@ -16,6 +16,6 @@ function start_timer()
$time = time();
//$objResponse->addScript("asset_timer='$time';asset_timer_total=0;");
//return $objResponse;
- return "asset_timer='$time';asset_timer_total=0;";
+ return "olms.asset_timer='$time';olms.asset_timer_total=0;";
}
echo start_timer();
\ No newline at end of file
diff --git a/main/newscorm/lp_ajax_switch_item.php b/main/newscorm/lp_ajax_switch_item.php
index 6326ad0290..9433c02026 100644
--- a/main/newscorm/lp_ajax_switch_item.php
+++ b/main/newscorm/lp_ajax_switch_item.php
@@ -140,35 +140,38 @@ function switch_item_details($lp_id,$user_id,$view_id,$current_item,$next_item)
if (!empty($myistring)) {
$myistring = substr($myistring,1);
}
- //$objResponse->addScript(
+ /*
+ * The following lines should reinitialize the values for the SCO
+ * However, due to many complications, we are now relying more on the
+ * LMSInitialize() call and its underlying lp_ajax_initialize.php call
+ * so this code is technically deprecated (but the change of item_id should
+ * remain). However, due to numerous technical issues with SCORM, we prefer
+ * leaving it as a double-lock security. If removing, please test carefully
+ * with both SCORM and dokeos learning path tracking.
+ */
$return .=
- "score=".$myscore.";" .
- "max=".$mymax.";" .
- "min=".$mymin.";" .
- "lesson_status='".$mylesson_status."';" .
- "lesson_location='".$mylesson_location."';" .
- "session_time='".$mysession_time."';" .
- "suspend_data='".$mysuspend_data."';" .
- "total_time = '".$mytotal_time."';" .
- "mastery_score = '".$mymastery_score."';" .
- "max_time_allowed = '".$mymax_time_allowed."';" .
- "launch_data = '".$mylaunch_data."';" .
- "interactions = new Array(".$myistring.");" .
- "item_objectives = new Array();" .
- "G_lastError = 0;" .
- "G_LastErrorMessage = 'No error';";
- //);
+ "olms.score=".$myscore.";" .
+ "olms.max=".$mymax.";" .
+ "olms.min=".$mymin.";" .
+ "olms.lesson_status='".$mylesson_status."';" .
+ "olms.lesson_location='".$mylesson_location."';" .
+ "olms.session_time='".$mysession_time."';" .
+ "olms.suspend_data='".$mysuspend_data."';" .
+ "olms.total_time = '".$mytotal_time."';" .
+ "olms.mastery_score = '".$mymastery_score."';" .
+ "olms.max_time_allowed = '".$mymax_time_allowed."';" .
+ "olms.launch_data = '".$mylaunch_data."';" .
+ "olms.interactions = new Array(".$myistring.");" .
+ "olms.item_objectives = new Array();" .
+ "olms.G_lastError = 0;" .
+ "olms.G_LastErrorMessage = 'No error';" ;
/*
* and re-initialise the rest
- * -saved_lesson_status = 'not attempted'
* -lms_lp_id
* -lms_item_id
* -lms_old_item_id
* -lms_new_item_id
- * -lms_been_synchronized
* -lms_initialized
- * -lms_total_lessons
- * -lms_complete_lessons
* -lms_progress_bar_mode
* -lms_view_id
* -lms_user_id
@@ -187,48 +190,41 @@ function switch_item_details($lp_id,$user_id,$view_id,$current_item,$next_item)
$myobjectives_count = $mylpi->get_objectives_count();
$mycore_exit = $mylpi->get_core_exit();
- //$objResponse->addScript(
$return .=
- "saved_lesson_status='not attempted';" .
- "lms_lp_id=".$lp_id.";" .
- "lms_item_id=".$new_item_id.";" .
- "lms_old_item_id=0;" .
- "lms_been_synchronized=0;" .
- "lms_initialized=0;" .
- "lms_total_lessons=".$mytotal.";" .
- "lms_complete_lessons=".$mycomplete.";" .
- "lms_progress_bar_mod='".$myprogress_mode."';" .
- "lms_view_id=".$view_id.";" .
- "lms_user_id=".$user_id.";" .
- "next_item=".$new_item_id.";" . //this one is very important to replace possible literal strings
- "lms_next_item=".$mynext.";" .
- "lms_previous_item=".$myprevious.";" .
- "lms_item_type = '".$myitemtype."';" .
- "lms_item_credit = '".$mycredit."';" .
- "lms_item_lesson_mode = '".$mylesson_mode."';" .
- "lms_item_launch_data = '".$mylaunch_data."';" .
- "lms_item_interactions_count = '".$myinteractions_count."';" .
- "lms_item_objectives_count = '".$myinteractions_count."';" .
- "lms_item_core_exit = '".$mycore_exit."';" .
- "asset_timer = 0;";
+ //"saved_lesson_status='not attempted';" .
+ "olms.lms_lp_id=".$lp_id.";" .
+ "olms.lms_item_id=".$new_item_id.";" .
+ "olms.lms_old_item_id=0;" .
+ //"lms_been_synchronized=0;" .
+ "olms.lms_initialized=0;" .
+ //"lms_total_lessons=".$mytotal.";" .
+ //"lms_complete_lessons=".$mycomplete.";" .
+ //"lms_progress_bar_mode='".$myprogress_mode."';" .
+ "olms.lms_view_id=".$view_id.";" .
+ "olms.lms_user_id=".$user_id.";" .
+ "olms.next_item=".$new_item_id.";" . //this one is very important to replace possible literal strings
+ "olms.lms_next_item=".$mynext.";" .
+ "olms.lms_previous_item=".$myprevious.";" .
+ "olms.lms_item_type = '".$myitemtype."';" .
+ "olms.lms_item_credit = '".$mycredit."';" .
+ "olms.lms_item_lesson_mode = '".$mylesson_mode."';" .
+ "olms.lms_item_launch_data = '".$mylaunch_data."';" .
+ "olms.lms_item_interactions_count = '".$myinteractions_count."';" .
+ "olms.lms_item_objectives_count = '".$myinteractions_count."';" .
+ "olms.lms_item_core_exit = '".$mycore_exit."';" .
+ "olms.asset_timer = 0;";
//);
- //$objResponse->addScript("update_toc('unhighlight','".$current_item."');");
- //$objResponse->addScript("update_toc('highlight','".$new_item_id."');");
- //$objResponse->addScript("update_toc('$mylesson_status','".$new_item_id."');");
- //$objResponse->addScript("update_progress_bar('$mycomplete','$mytotal','$myprogress_mode');");
$return .= "update_toc('unhighlight','".$current_item."');".
- "update_toc('highlight','".$new_item_id."');".
- "update_toc('$mylesson_status','".$new_item_id."');".
- "update_progress_bar('$mycomplete','$mytotal','$myprogress_mode');";
+ "update_toc('highlight','".$new_item_id."');".
+ "update_toc('$mylesson_status','".$new_item_id."');".
+ "update_progress_bar('$mycomplete','$mytotal','$myprogress_mode');";
$mylp->set_error_msg('');
$mylp->prerequisites_match(); //check the prerequisites are all complete
if($debug>1){error_log('Prereq_match() returned '.htmlentities($mylp->error),0);}
- //$objResponse->addScript("update_message_frame('".str_replace("'","\'",htmlentities($mylp->error))."');");
- $return .= "update_message_frame('".str_replace("'","\'",api_htmlentities($mylp->error, ENT_QUOTES, api_get_system_encoding()))."');";
$_SESSION['scorm_item_id'] = $new_item_id;//Save the new item ID for the exercise tool to use
$_SESSION['lpobject'] = serialize($mylp);
return $return;
//return $objResponse;
}
-echo switch_item_details($_GET['lid'],$_GET['uid'],$_GET['vid'],$_GET['iid'],$_GET['next']);
+echo switch_item_details($_POST['lid'],$_POST['uid'],$_POST['vid'],$_POST['iid'],$_POST['next']);
\ No newline at end of file
diff --git a/main/newscorm/lp_ajax_switch_item_toc.php b/main/newscorm/lp_ajax_switch_item_toc.php
new file mode 100644
index 0000000000..2f22ee076c
--- /dev/null
+++ b/main/newscorm/lp_ajax_switch_item_toc.php
@@ -0,0 +1,186 @@
+
+ */
+/**
+ * Script
+ */
+//flag to allow for anonymous user - needs to be set before global.inc.php
+$use_anonymous = true;
+// name of the language file that needs to be included
+$language_file[] = 'learnpath';
+require_once('back_compat.inc.php');
+/**
+ * Get one item's details
+ * @param integer LP ID
+ * @param integer user ID
+ * @param integer View ID
+ * @param integer Current item ID
+ * @param integer New item ID
+ */
+function switch_item_toc($lp_id,$user_id,$view_id,$current_item,$next_item)
+{
+ $debug=0;
+ $return = '';
+ if($debug>0){error_log('In xajax_switch_item_toc('.$lp_id.','.$user_id.','.$view_id.','.$current_item.','.$next_item.')',0);}
+ require_once('learnpath.class.php');
+ require_once('scorm.class.php');
+ require_once('aicc.class.php');
+ require_once('learnpathItem.class.php');
+ require_once('scormItem.class.php');
+ require_once('aiccItem.class.php');
+ $mylp = '';
+ if(isset($_SESSION['lpobject']))
+ {
+ if($debug>1){error_log('////$_SESSION[lpobject] is set',0);}
+ $oLP =& unserialize($_SESSION['lpobject']);
+ if(!is_object($oLP)){
+ if($debug>1){error_log(print_r($oLP,true),0);}
+ if($debug>2){error_log('////Building new lp',0);}
+ unset($oLP);
+ $code = api_get_course_id();
+ $mylp = & new learnpath($code,$lp_id,$user_id);
+ }else{
+ if($debug>1){error_log('////Reusing session lp',0);}
+ $mylp = & $oLP;
+ }
+ }
+ $new_item_id = 0;
+ switch($next_item){
+ case 'next':
+ $mylp->set_current_item($current_item);
+ $mylp->next();
+ $new_item_id = $mylp->get_current_item_id();
+ if($debug>1){error_log('In {next} - next item is '.$new_item_id.'(current: '.$current_item.')',0);}
+ break;
+ case 'previous':
+ $mylp->set_current_item($current_item);
+ $mylp->previous();
+ $new_item_id = $mylp->get_current_item_id();
+ if($debug>1){error_log('In {previous} - next item is '.$new_item_id.'(current: '.$current_item.')',0);}
+ break;
+ case 'first':
+ $mylp->set_current_item($current_item);
+ $mylp->first();
+ $new_item_id = $mylp->get_current_item_id();
+ if($debug>1){error_log('In {first} - next item is '.$new_item_id.'(current: '.$current_item.')',0);}
+ break;
+ case 'last':
+ break;
+ default:
+ //should be filtered to check it's not hacked
+ if($next_item == $current_item){
+ //if we're opening the same item again
+ $mylp->items[$current_item]->restart();
+ }
+ $new_item_id = $next_item;
+ $mylp->set_current_item($new_item_id);
+ if($debug>1){error_log('In {default} - next item is '.$new_item_id.'(current: '.$current_item.')',0);}
+ break;
+ }
+ $mylp->start_current_item(true);
+ if($mylp->force_commit){
+ $mylp->save_current();
+ }
+ //$objResponse->addAlert(api_get_path(REL_CODE_PATH).'newscorm/learnpathItem.class.php');
+ if(is_object($mylp->items[$new_item_id])){
+ $mylpi = & $mylp->items[$new_item_id];
+ }else{
+ if($debug>1){error_log('In switch_item_details - generating new item object',0);}
+ $mylpi =& new learnpathItem($new_item_id,$user_id);
+ $mylpi->set_lp_view($view_id);
+ }
+ /*
+ * now get what's needed by the SCORM API:
+ * -score
+ * -max
+ * -min
+ * -lesson_status
+ * -session_time
+ * -suspend_data
+ */
+ $myscore = $mylpi->get_score();
+ $mymax = $mylpi->get_max();
+ if($mymax===''){$mymax="''";}
+ $mymin = $mylpi->get_min();
+ $mylesson_status = $mylpi->get_status();
+ $mylesson_location = $mylpi->get_lesson_location();
+ $mytotal_time = $mylpi->get_scorm_time('js');
+ $mymastery_score = $mylpi->get_mastery_score();
+ $mymax_time_allowed = $mylpi->get_max_time_allowed();
+ $mylaunch_data = $mylpi->get_launch_data();
+ /*
+ if($mylpi->get_type() == 'asset'){
+ //temporary measure to save completion of an asset. Later on, Dokeos should trigger something on unload, maybe... (even though that would mean the last item cannot be completed)
+ $mylesson_status = 'completed';
+ $mylpi->set_status('completed');
+ $mylpi->save();
+ }
+ */
+ $mysession_time = $mylpi->get_total_time();
+ $mysuspend_data = $mylpi->get_suspend_data();
+ $mylesson_location = $mylpi->get_lesson_location();
+ $myic = $mylpi->get_interactions_count();
+ $myistring = '';
+ for ($i=0;$i<$myic;$i++) {
+ $myistring .= ",[".$i.",'','','','','','','']";
+ }
+ if (!empty($myistring)) {
+ $myistring = substr($myistring,1);
+ }
+ $mytotal = $mylp->get_total_items_count_without_chapters();
+ $mycomplete = $mylp->get_complete_items_count();
+ $myprogress_mode = $mylp->get_progress_bar_mode();
+ $myprogress_mode = ($myprogress_mode==''?'%':$myprogress_mode);
+ $mynext = $mylp->get_next_item_id();
+ $myprevious = $mylp->get_previous_item_id();
+ $myitemtype = $mylpi->get_type();
+ $mylesson_mode = $mylpi->get_lesson_mode();
+ $mycredit = $mylpi->get_credit();
+ $mylaunch_data = $mylpi->get_launch_data();
+ $myinteractions_count = $mylpi->get_interactions_count();
+ $myobjectives_count = $mylpi->get_objectives_count();
+ $mycore_exit = $mylpi->get_core_exit();
+
+ $return .=
+ //"saved_lesson_status='not attempted';" .
+ "olms.lms_lp_id=".$lp_id.";" .
+ "olms.lms_item_id=".$new_item_id.";" .
+ "olms.lms_old_item_id=0;" .
+ //"lms_been_synchronized=0;" .
+ "olms.lms_initialized=0;" .
+ //"lms_total_lessons=".$mytotal.";" .
+ //"lms_complete_lessons=".$mycomplete.";" .
+ //"lms_progress_bar_mode='".$myprogress_mode."';" .
+ "olms.lms_view_id=".$view_id.";" .
+ "olms.lms_user_id=".$user_id.";" .
+ "olms.next_item=".$new_item_id.";" . //this one is very important to replace possible literal strings
+ "olms.lms_next_item=".$mynext.";" .
+ "olms.lms_previous_item=".$myprevious.";" .
+ "olms.lms_item_type = '".$myitemtype."';" .
+ "olms.lms_item_credit = '".$mycredit."';" .
+ "olms.lms_item_lesson_mode = '".$mylesson_mode."';" .
+ "olms.lms_item_launch_data = '".$mylaunch_data."';" .
+ "olms.lms_item_interactions_count = '".$myinteractions_count."';" .
+ "olms.lms_item_objectives_count = '".$myinteractions_count."';" .
+ "olms.lms_item_core_exit = '".$mycore_exit."';" .
+ "olms.asset_timer = 0;";
+ //);
+ $return .= "update_toc('unhighlight','".$current_item."');".
+ "update_toc('highlight','".$new_item_id."');".
+ "update_toc('$mylesson_status','".$new_item_id."');".
+ "update_progress_bar('$mycomplete','$mytotal','$myprogress_mode');";
+
+ $mylp->set_error_msg('');
+ $mylp->prerequisites_match(); //check the prerequisites are all complete
+ if($debug>1){error_log('Prereq_match() returned '.htmlentities($mylp->error),0);}
+ $_SESSION['scorm_item_id'] = $new_item_id;//Save the new item ID for the exercise tool to use
+ $_SESSION['lpobject'] = serialize($mylp);
+ return $return;
+ //return $objResponse;
+ }
+echo switch_item_toc($_POST['lid'],$_POST['uid'],$_POST['vid'],$_POST['iid'],$_POST['next']);
\ No newline at end of file
diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php
index 1e672ac228..9fd484ba5c 100644
--- a/main/newscorm/lp_view.php
+++ b/main/newscorm/lp_view.php
@@ -71,16 +71,14 @@ $my_style=$platform_theme;
Header
-----------------------------------------------------------
*/
-//$htmlHeadXtra[] = '';
-//$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/')."\n";
$htmlHeadXtra[] = ''; //jQuery
-$htmlHeadXtra[] = '';
$htmlHeadXtra[] = '
-
+ initialLeftZoneHeight = document.getElementById('learning_path_toc').offsetHeight;
+ initialRightZoneHeight = document.getElementById('learning_path_right_zone').offsetHeight;
+ docHeight = document.body.clientHeight;
+ leftZoneHeightOccupied = docHeight - initialLeftZoneHeight;
+ rightZoneHeightOccupied = docHeight - initialRightZoneHeight;
+ document.body.style.overflow = 'hidden';
+ updateContentHeight();
+}
+window.onresize = updateContentHeight;
+-->
+
+