Merge

main/exercice/exercise_result.php

@@ -163,7 +163,7 @@ if ($origin != 'learnpath') {
 	$lp_mode =  $_SESSION['lp_mode'];
 	$url = '../newscorm/lp_controller.php?cidReq='.api_get_course_id().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type;
 	$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"';
-
+    
     if (api_is_allowed_to_session_edit()) {
         Session::erase('objExercise');
         Session::erase('exe_id');

main/newscorm/lp_ajax_initialize.php

@@ -36,7 +36,6 @@ require_once 'aiccItem.class.php';
  * @param   integer New item ID
  */
 function initialize_item($lp_id, $user_id, $view_id, $next_item) {
-    $debug = 10;
     $return = '';
     if ($debug > 0) { error_log('In initialize_item('.$lp_id.','.$user_id.','.$view_id.','.$next_item.')', 0); }
     /*$item_id may be one of:

main/newscorm/lp_ajax_save_item.php

@@ -46,7 +46,6 @@ require_once 'aiccItem.class.php';
  */
 function save_item($lp_id, $user_id, $view_id, $item_id, $score = -1, $max = -1, $min = -1, $status = '', $time = 0, $suspend = '', $location = '', $interactions = array(), $core_exit = 'none') {
     $return = null;
-    $debug = 10;
 
     if ($debug > 0) {
         error_log('lp_ajax_save_item.php : save_item() params: ');

main/newscorm/lp_controller.php

@@ -218,7 +218,7 @@ if (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'true') {
     }
 } else {
     if ($is_allowed_to_edit) {
-        if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'view') {
+        if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'view' && !isset($_REQUEST['exeId'])) {
             $_REQUEST['action'] = 'build';
         }
     }

main/newscorm/lp_view.php

@@ -248,11 +248,11 @@ if ($type_quiz && !empty($_REQUEST['exeId']) && isset($lp_id) && isset($_GET['lp
             Database::query($update_query);
         }
     }
-
     if (intval($_GET['fb_type']) > 0) {
         $src = 'blank.php?msg=exerciseFinished';
     } else {
         $src = api_get_path(WEB_CODE_PATH).'exercice/result.php?origin=learnpath&id='.$safe_exe_id;
+
         if ($debug) error_log('Calling URL: '.$src);
     }
     $autostart = 'false';

main/newscorm/scorm_api.php

@@ -50,7 +50,6 @@ header('Content-type: text/javascript');
  */
 ?>var scorm_logs=<?php echo ((empty($oLP->scorm_debug) or (!api_is_course_admin() && !api_is_platform_admin()) )?'0':'3');?>; //debug log level for SCORM. 0 = none, 1=light, 2=a lot, 3=all - displays logs in log frame
 
-scorm_logs = 3;
 var lms_logs=0; //debug log level for LMS actions. 0=none, 1=light, 2=a lot, 3=all
 //logit_lms('scormfunctions.php included',0);