[svn r10072] update for the reporting

main/inc/common_course_tracking.ajax.php

@@ -0,0 +1,10 @@
+<?php
+
+//Include the librarie ajax
+require_once(api_get_path(LIBRARY_PATH)."xajax/xajax.inc.php");
+
+$xajax_course_tracking = new xajax(api_get_path(REL_PATH)."main/inc/update_course_tracking.php");
+
+$xajax_course_tracking->registerFunction("updateCourseTracking");
+
+?>

main/inc/global.inc.php

@@ -91,13 +91,6 @@ require_once(api_get_path(LIBRARY_PATH).'database.lib.php');
 require_once(api_get_path(LIBRARY_PATH).'display.lib.php');
 require_once(api_get_path(LIBRARY_PATH).'text.lib.php');
 
-//Include the librarie ajax for the course time refresh
-require_once(api_get_path(LIBRARY_PATH)."xajax/xajax.inc.php");
-
-//Include the file for the updateCourseTracking function
-require_once(api_get_path(INCLUDE_PATH)."update_course_tracking.php");
-
-
 
 if(empty($statsDbName) && $already_installed)
 {
@@ -114,8 +107,6 @@ if (! $_configuration['db_host'])
 }
 
 
-$xajax->processRequests();
-
 unset($error_message);
 
 $selectResult = mysql_select_db($mainDbName,$dokeos_database_connection) or die ('<center>WARNING ! SYSTEM UNABLE TO SELECT THE MAIN DOKEOS DATABASE</center>');

main/inc/local.inc.php

@@ -485,21 +485,22 @@ if (isset($cidReset) && $cidReset) // course session data refresh requested or e
             api_session_register('_course');
 
             //We add a new record in the course tracking table
-            $course_tracking_table = Database :: get_statistic_table(STATISTIC_TRACK_E_COURSE_ACCESS_TABLE);
+            $course_tracking_table = Database :: get_statistic_table(STATISTIC_TRACK_E_COURSE_ACCESS_TABLE);        
 
             $sql="INSERT INTO $course_tracking_table(course_code, user_id, login_course_date, logout_course_date, counter)" .
 					"VALUES('".$_course['official_code']."', '".$_user['user_id']."', NOW(), NOW(), '1')";
 
 			api_sql_query($sql,__FILE__,__LINE__);
-
+			
-			if(api_get_setting("Ajax_course_tracking_refresh")!=0){
+			if(api_get_setting("Ajax_course_tracking_refresh")!=0 && !isset($noajax)){
-
+				
-
+				include("common_course_tracking.ajax.php");
+				
 				$i_milliseconds_for_refresh=intval(api_get_setting("Ajax_course_tracking_refresh"))*1000;
-
+				
-				$htmlHeadXtra[] = $xajax->getJavascript(api_get_path(WEB_LIBRARY_PATH).'xajax/');
+				$htmlHeadXtra[] = $xajax_course_tracking->getJavascript(api_get_path(WEB_LIBRARY_PATH).'xajax/');
 				$htmlHeadXtra[] = "<script type=\"text/javascript\">var user_id=".$_user ['user_id'].";</script><script type=\"text/javascript\" src=\"".api_get_path(WEB_CODE_PATH)."inc/course_tracking.js\"></script><script type=\"text/javascript\">window.setInterval('update_course_tracking()',".$i_milliseconds_for_refresh.");</script>";
-
+				
 			}
 
         }
@@ -539,16 +540,20 @@ else // continue with the previous values
    				"SET logout_course_date = NOW(), " .
    					"counter = counter+1 " .
 				"WHERE course_access_id='$i_course_access_id'";
-
+		
-		api_sql_query($sql,__FILE__,__LINE__);
+		if(!isset($noajax)){
-
+			api_sql_query($sql,__FILE__,__LINE__);
-		if(api_get_setting("Ajax_course_tracking_refresh")!=0){
+		}
-
+		
+		if(api_get_setting("Ajax_course_tracking_refresh")!=0 && !isset($noajax)){			
+			
+			include("common_course_tracking.ajax.php");
+			
 			$i_milliseconds_for_refresh=intval(api_get_setting("Ajax_course_tracking_refresh"))*1000;
-
+			
-			$htmlHeadXtra[] = $xajax->getJavascript(api_get_path(WEB_LIBRARY_PATH).'xajax/');
+			$htmlHeadXtra[] = $xajax_course_tracking->getJavascript(api_get_path(WEB_LIBRARY_PATH).'xajax/');
 			$htmlHeadXtra[] = "<script type=\"text/javascript\">var user_id=".$_user ['user_id'].";</script><script type=\"text/javascript\" src=\"".api_get_path(WEB_CODE_PATH)."inc/course_tracking.js\"></script><script type=\"text/javascript\">setInterval('update_course_tracking()',".$i_milliseconds_for_refresh.");</script>";
-
+			
 		}
 
 

main/inc/update_course_tracking.php

@@ -1,8 +1,7 @@
 <?php
-
+$noajax=true;
-
+include("global.inc.php");
-$xajax = new xajax();
+require('common_course_tracking.ajax.php');
-$xajax->registerFunction("updateCourseTracking");
 
 function updateCourseTracking($i_user_id){
 	
@@ -28,6 +27,6 @@ function updateCourseTracking($i_user_id){
 	
 }
 
-
+$xajax_course_tracking->processRequests();
 
 ?>

main/newscorm/lp_comm.common.php

@@ -12,8 +12,7 @@
 require_once('back_compat.inc.php');
 require_once('learnpath.class.php');
 
-//the library is included in global.inc.php
+require('../inc/lib/xajax/xajax.inc.php');
-//require('../inc/lib/xajax/xajax.inc.php');
 $xajax = new xajax(api_get_path(WEB_CODE_PATH).'newscorm/lp_comm.server.php');
 $xajax->registerFunction("save_item");
 $xajax->registerFunction("switch_item_details");