소스 검색

[svn r11664] remove the setting "Ajax_course_tracking_refresh" because it adds a lot of bugs...

Eric Marguin 18 년 전
부모
커밋
95b96c8ded
5개의 변경된 파일1개의 추가작업 그리고 42개의 파일을 삭제
  1. 0 10
      main/inc/common_course_tracking.ajax.php
  2. 0 6
      main/inc/course_tracking.js
  3. 1 24
      main/inc/local.inc.php
  4. 0 1
      main/install/dokeos_main.sql
  5. 0 1
      main/install/migrate-db-1.6.x-1.8.0-pre.sql

+ 0 - 10
main/inc/common_course_tracking.ajax.php

@@ -1,10 +0,0 @@
-<?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");
-
-?>

+ 0 - 6
main/inc/course_tracking.js

@@ -1,6 +0,0 @@
-function update_course_tracking(){
-
-	xajax_updateCourseTracking(user_id);
-	
-}
-

+ 1 - 24
main/inc/local.inc.php

@@ -490,17 +490,6 @@ if (isset($cidReset) && $cidReset) // course session data refresh requested or e
 					"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 && !isset($noajax)){
-				
-				include("common_course_tracking.ajax.php");
-				
-				$i_milliseconds_for_refresh=intval(api_get_setting("Ajax_course_tracking_refresh"))*1000;
-				
-				$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>";
-				
-			}
 
         }
         else
@@ -540,20 +529,8 @@ else // continue with the previous values
    					"counter = counter+1 " .
 				"WHERE course_access_id='$i_course_access_id'";
 		
-		if(!isset($noajax)){
-			api_sql_query($sql,__FILE__,__LINE__);
-		}
+		api_sql_query($sql,__FILE__,__LINE__);
 		
-		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_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>";
-			
-		}
 
 
 	}

+ 0 - 1
main/install/dokeos_main.sql

@@ -482,7 +482,6 @@ INSERT INTO `settings_current` VALUES
 (71, 'donotlistcampus', NULL, 'textfield', NULL, 'false', NULL, NULL, NULL, NULL),
 (72, 'show_email_addresses', NULL,'radio','Platform','false','ShowEmailAddresses','ShowEmailAddressesComment',NULL,NULL),
 (73,'profile','phone','checkbox','User','true','ProfileChangesTitle','ProfileChangesComment',NULL,'phone'),
-(74, 'Ajax_course_tracking_refresh', NULL, 'textfield','Course','0', 'Ajax_course_tracking_refresh','Ajax_course_tracking_refresh_comment', NULL, NULL),
 (75, 'service_visio', 'active', 'radio',NULL,'false', 'visio_actived','', NULL, NULL),
 (76, 'service_visio', 'visioconference_url', 'textfield',NULL,'', 'visio_url','', NULL, NULL),
 (77, 'service_visio', 'visioclassroom_url', 'textfield',NULL,'', 'visio_url','', NULL, NULL),

+ 0 - 1
main/install/migrate-db-1.6.x-1.8.0-pre.sql

@@ -97,7 +97,6 @@ INSERT INTO settings_current(variable,subkey,type,category,selected_value,title,
 INSERT INTO settings_current(variable,subkey,type,category,selected_value,title,comment,scope,subkeytext) VALUES ('donotlistcampus', NULL, 'textfield', NULL, 'false', NULL, NULL, NULL, NULL);
 INSERT INTO settings_current(variable,subkey,type,category,selected_value,title,comment,scope,subkeytext) VALUES ('show_email_addresses', NULL,'radio','Platform','false','ShowEmailAddresses','ShowEmailAddressesComment',NULL,NULL);
 INSERT INTO settings_current(variable,subkey,type,category,selected_value,title,comment,scope,subkeytext) VALUES ('profile','phone','checkbox','User','true','ProfileChangesTitle','ProfileChangesComment',NULL,'phone');
-INSERT INTO settings_current(variable,subkey,type,category,selected_value,title,comment,scope,subkeytext) VALUES ('Ajax_course_tracking_refresh', NULL, 'textfield','Course','0', 'Ajax_course_tracking_refresh','Ajax_course_tracking_refresh_comment', NULL, NULL);
 INSERT INTO settings_current(variable,subkey,type,category,selected_value,title,comment,scope,subkeytext) VALUES ('service_visio', 'active', 'radio',NULL,'false', 'visio_actived','', NULL, NULL);
 INSERT INTO settings_current(variable,subkey,type,category,selected_value,title,comment,scope,subkeytext) VALUES ('service_visio', 'url', 'textfield',NULL,'', 'visio_url','', NULL, NULL);
 INSERT INTO settings_current(variable,subkey,type,category,selected_value,title,comment,scope,subkeytext) VALUES ('service_ppt2lp', 'active', 'radio',NULL,'false', 'ppt2lp_actived','', NULL, NULL);