diff --git a/main/newscorm/lp_ajax_initialize.php b/main/newscorm/lp_ajax_initialize.php index d4c8b619e8..56bf481d6c 100644 --- a/main/newscorm/lp_ajax_initialize.php +++ b/main/newscorm/lp_ajax_initialize.php @@ -55,7 +55,7 @@ function initialize_item($lp_id, $user_id, $view_id, $next_item) { if ($debug > 2) { error_log('////Building new lp', 0); } unset($oLP); $code = api_get_course_id(); - $mylp = & new learnpath($code,$lp_id,$user_id); + $mylp = new learnpath($code,$lp_id,$user_id); } else { if ($debug > 1) { error_log('////Reusing session lp', 0); } $mylp = & $oLP; diff --git a/main/newscorm/lp_ajax_last_update_status.php b/main/newscorm/lp_ajax_last_update_status.php old mode 100755 new mode 100644 index bffbd636c2..36f095e5a6 --- a/main/newscorm/lp_ajax_last_update_status.php +++ b/main/newscorm/lp_ajax_last_update_status.php @@ -58,7 +58,7 @@ function last_update_status($lp_id, $user_id, $view_id, $item_id) { if ($debug > 2) { error_log('////Building new lp', 0); } unset($oLP); $code = api_get_course_id(); - $mylp = & new learnpath($code,$lp_id,$user_id); + $mylp = new learnpath($code,$lp_id,$user_id); } else { if ($debug > 2) { error_log('////Reusing session lp', 0); } $mylp = & $oLP; diff --git a/main/newscorm/lp_ajax_save_item.php b/main/newscorm/lp_ajax_save_item.php old mode 100755 new mode 100644 index bbc10b5619..5a272adf0c --- a/main/newscorm/lp_ajax_save_item.php +++ b/main/newscorm/lp_ajax_save_item.php @@ -56,7 +56,7 @@ function save_item($lp_id, $user_id, $view_id, $item_id, $score = -1, $max = -1, if ($debug > 2) { error_log('////Building new lp', 0); } unset($oLP); $code = api_get_course_id(); - $mylp = & new learnpath($code, $lp_id, $user_id); + $mylp = new learnpath($code, $lp_id, $user_id); } else { if ($debug > 2) { error_log('////Reusing session lp', 0); } $mylp = & $oLP; @@ -88,7 +88,8 @@ function save_item($lp_id, $user_id, $view_id, $item_id, $score = -1, $max = -1, if ($debug > 1) { error_log('Done calling set_status from xajax - now '.$mylpi->get_status(false), 0); } } // Hack to set status to completed for hotpotatoes if score > 80%. - if ($mylpi->get_type() == 'hotpotatoes') { + $my_type = $mylpi->get_type(); + if ($my_type == 'hotpotatoes') { if ((empty($status) || $status == 'undefined' || $status == 'not attempted') && $max > 0) { if (($score/$max) > 0.8) { $mystatus = 'completed'; diff --git a/main/newscorm/lp_ajax_save_objectives.php b/main/newscorm/lp_ajax_save_objectives.php old mode 100755 new mode 100644 index 948658c679..7110eaa209 --- a/main/newscorm/lp_ajax_save_objectives.php +++ b/main/newscorm/lp_ajax_save_objectives.php @@ -47,7 +47,7 @@ function save_objectives($lp_id, $user_id, $view_id, $item_id, $objectives = arr if ($debug > 2) { error_log('////Building new lp', 0); } unset($oLP); $code = api_get_course_id(); - $mylp = & new learnpath($code, $lp_id, $user_id); + $mylp = new learnpath($code, $lp_id, $user_id); }else{ if ($debug > 2) { error_log('////Reusing session lp', 0); } $mylp = & $oLP; diff --git a/main/newscorm/lp_ajax_switch_item.php b/main/newscorm/lp_ajax_switch_item.php old mode 100755 new mode 100644 index a423a481e3..b1bce57ff2 --- a/main/newscorm/lp_ajax_switch_item.php +++ b/main/newscorm/lp_ajax_switch_item.php @@ -54,7 +54,7 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it if ($debug > 2) { error_log('////Building new lp', 0); } unset($oLP); $code = api_get_course_id(); - $mylp = & new learnpath($code,$lp_id,$user_id); + $mylp = new learnpath($code,$lp_id,$user_id); } else { if ($debug > 1) { error_log('////Reusing session lp', 0); } $mylp = & $oLP; @@ -102,7 +102,7 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it $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 = new learnpathItem($new_item_id, $user_id); $mylpi->set_lp_view($view_id); } /* diff --git a/main/newscorm/lp_ajax_switch_item_toc.php b/main/newscorm/lp_ajax_switch_item_toc.php old mode 100755 new mode 100644 index 4652d2fa1b..e27b4ecf2e --- a/main/newscorm/lp_ajax_switch_item_toc.php +++ b/main/newscorm/lp_ajax_switch_item_toc.php @@ -45,7 +45,7 @@ function switch_item_toc($lp_id, $user_id, $view_id, $current_item, $next_item) if ($debug > 2) { error_log('////Building new lp', 0); } unset($oLP); $code = api_get_course_id(); - $mylp = & new learnpath($code,$lp_id,$user_id); + $mylp = new learnpath($code,$lp_id,$user_id); } else { if ($debug > 1) { error_log('////Reusing session lp', 0); } $mylp = & $oLP; @@ -93,7 +93,7 @@ function switch_item_toc($lp_id, $user_id, $view_id, $current_item, $next_item) $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 = new learnpathItem($new_item_id, $user_id); $mylpi->set_lp_view($view_id); } /* diff --git a/main/newscorm/lp_comm.server.php b/main/newscorm/lp_comm.server.php index 2af271b609..3af9791675 100644 --- a/main/newscorm/lp_comm.server.php +++ b/main/newscorm/lp_comm.server.php @@ -82,7 +82,7 @@ function save_item($lp_id, $user_id, $view_id, $item_id, $score = -1, $max = -1, if ($debug > 2) { error_log('////Building new lp', 0); } unset($oLP); $code = api_get_course_id(); - $mylp = & new learnpath($code, $lp_id, $user_id); + $mylp = new learnpath($code, $lp_id, $user_id); } else { if ($debug > 2) { error_log('////Reusing session lp', 0); } $mylp = & $oLP; @@ -214,7 +214,7 @@ function save_objectives($lp_id, $user_id, $view_id, $item_id, $objectives = arr if ($debug > 2) { error_log('////Building new lp', 0); } unset($oLP); $code = api_get_course_id(); - $mylp = & new learnpath($code,$lp_id,$user_id); + $mylp = new learnpath($code,$lp_id,$user_id); } else { if ($debug > 2) { error_log('////Reusing session lp', 0); } $mylp = & $oLP; @@ -268,7 +268,7 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it if ($debug > 2) { error_log('////Building new lp', 0); } unset($oLP); $code = api_get_course_id(); - $mylp = & new learnpath($code,$lp_id,$user_id); + $mylp = new learnpath($code,$lp_id,$user_id); } else { if ($debug > 1) { error_log('////Reusing session lp', 0); } $mylp = & $oLP; @@ -316,7 +316,7 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it $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 = new learnpathItem($new_item_id, $user_id); $mylpi->set_lp_view($view_id); } /* diff --git a/main/newscorm/scorm_api.php b/main/newscorm/scorm_api.php index 8169f864eb..672971a635 100644 --- a/main/newscorm/scorm_api.php +++ b/main/newscorm/scorm_api.php @@ -1133,11 +1133,10 @@ function logit_lms(message,priority){ * @param string Action to be taken * @param integer Item id to update */ -function update_toc(update_action,update_id,change_ids) -{ +function update_toc(update_action, update_id, change_ids) { if (!change_ids || change_ids != 'no') { change_ids = 'yes'; - } + } var myelem = $("#toc_"+update_id); var myelemimg = $("#toc_img_"+update_id); logit_lms('update_toc("'+update_action+'",'+update_id+')',2);