From 95b96c8ded6c06bcff28412bd0e78f30da0e688f Mon Sep 17 00:00:00 2001 From: Eric Marguin Date: Thu, 22 Mar 2007 16:30:14 +0100 Subject: [PATCH] [svn r11664] remove the setting "Ajax_course_tracking_refresh" because it adds a lot of bugs... --- main/inc/common_course_tracking.ajax.php | 10 --------- main/inc/course_tracking.js | 6 ----- main/inc/local.inc.php | 25 +-------------------- main/install/dokeos_main.sql | 1 - main/install/migrate-db-1.6.x-1.8.0-pre.sql | 1 - 5 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 main/inc/common_course_tracking.ajax.php delete mode 100644 main/inc/course_tracking.js diff --git a/main/inc/common_course_tracking.ajax.php b/main/inc/common_course_tracking.ajax.php deleted file mode 100644 index bc91ce213a..0000000000 --- a/main/inc/common_course_tracking.ajax.php +++ /dev/null @@ -1,10 +0,0 @@ -registerFunction("updateCourseTracking"); - -?> diff --git a/main/inc/course_tracking.js b/main/inc/course_tracking.js deleted file mode 100644 index 5216b2c7e6..0000000000 --- a/main/inc/course_tracking.js +++ /dev/null @@ -1,6 +0,0 @@ -function update_course_tracking(){ - - xajax_updateCourseTracking(user_id); - -} - diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php index 557d268977..d6897ffe3b 100644 --- a/main/inc/local.inc.php +++ b/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[] = ""; - - } } 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[] = ""; - - } } diff --git a/main/install/dokeos_main.sql b/main/install/dokeos_main.sql index 0488806add..f3fb1b3314 100644 --- a/main/install/dokeos_main.sql +++ b/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), diff --git a/main/install/migrate-db-1.6.x-1.8.0-pre.sql b/main/install/migrate-db-1.6.x-1.8.0-pre.sql index 0a00d77c72..a8eca895f0 100644 --- a/main/install/migrate-db-1.6.x-1.8.0-pre.sql +++ b/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);