Replacing DB constant

main/chat/chat_functions.lib.php

@@ -12,7 +12,7 @@
  * @return boolean
  */
 function user_connected_in_chat ($user_id) {
- 	$tbl_chat_connected = Database::get_course_table(CHAT_CONNECTED_TABLE);
+ 	$tbl_chat_connected = Database::get_course_table(TABLE_CHAT_CONNECTED);
 
  	$session_id = api_get_session_id();
     $group_id   = api_get_group_id();	
@@ -54,7 +54,7 @@ function exit_of_chat($user_id) {
 		$extra_condition = api_get_session_condition($session_id);
 	}
     $extra_condition.= " AND course_id = $course_id";
-    $tbl_chat_connected = Database::get_course_table(CHAT_CONNECTED_TABLE);
+    $tbl_chat_connected = Database::get_course_table(TABLE_CHAT_CONNECTED);
     
  	foreach ($list_course as $course) {
  		$response = user_connected_in_chat($user_id);
@@ -90,7 +90,7 @@ function disconnect_user_of_chat() {
 			$date_count_time_seconds=$date_db_h*3600 + $date_db_m*60 + $date_db_s;
 			if ($cd_date == $date_db_date) {
 				if (($cd_count_time_seconds - $date_count_time_seconds) > 5) {					
-                    $tbl_chat_connected = Database::get_course_table(CHAT_CONNECTED_TABLE);					
+                    $tbl_chat_connected = Database::get_course_table(TABLE_CHAT_CONNECTED);					
 			 		$sql = 'DELETE FROM '.$tbl_chat_connected.' WHERE c_id = '.$course_id.' AND user_id ='.$list_info_user['user_id'];
 			 		Database::query($sql);
 				}
@@ -105,7 +105,7 @@ function disconnect_user_of_chat() {
  */
 function users_list_in_chat() {
 	$list_users_in_chat = array();
- 	$tbl_chat_connected = Database::get_course_table(CHAT_CONNECTED_TABLE);
+ 	$tbl_chat_connected = Database::get_course_table(TABLE_CHAT_CONNECTED);
     $course_id = api_get_course_int_id();
     
  	$session_id = api_get_session_id();

main/chat/chat_hidden.php

@@ -20,7 +20,7 @@ require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
 require_once 'chat_functions.lib.php';
 
 $tbl_user 				= Database::get_main_table(TABLE_MAIN_USER);
-$tbl_chat_connected 	= Database::get_course_table(CHAT_CONNECTED_TABLE);
+$tbl_chat_connected 	= Database::get_course_table(TABLE_CHAT_CONNECTED);
 
 $course_id = api_get_course_int_id();
 

main/chat/chat_whoisonline.php

@@ -36,7 +36,7 @@ if (!empty($course)) {
 	$tbl_session				= Database::get_main_table(TABLE_MAIN_SESSION);
 	$tbl_session_course			= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
 	$tbl_user					= Database::get_main_table(TABLE_MAIN_USER);
-	$tbl_chat_connected			= Database::get_course_table(CHAT_CONNECTED_TABLE);
+	$tbl_chat_connected			= Database::get_course_table(TABLE_CHAT_CONNECTED);
 
 	$query = "SELECT username FROM $tbl_user WHERE user_id='".$user_id."'";
 	$result = Database::query($query);

main/inc/lib/database.constants.inc.php

@@ -153,7 +153,7 @@ define('TABLE_AGENDA_REPEAT_NOT',               'calendar_event_repeat_not');
 define('TABLE_AGENDA_ATTACHMENT',               'calendar_event_attachment');
 define('TABLE_ANNOUNCEMENT',                    'announcement');
 define('TABLE_ANNOUNCEMENT_ATTACHMENT',         'announcement_attachment');
-define('TABLE_CHAT_CONNECTED',                  'chat_connected'); // @todo: probably no longer in use !!!
+define('TABLE_CHAT_CONNECTED',                  'chat_connected');
 define('TABLE_COURSE_DESCRIPTION',              'course_description');
 define('TABLE_DOCUMENT',                        'document');
 define('TABLE_ITEM_PROPERTY',                   'item_property');
@@ -164,7 +164,6 @@ define('TABLE_TOOL_INTRO',                      'tool_intro');
 define('TABLE_SCORMDOC',                        'scormdocument');
 define('TABLE_STUDENT_PUBLICATION',             'student_publication');
 define('TABLE_STUDENT_PUBLICATION_ASSIGNMENT',  'student_publication_assignment');
-define('CHAT_CONNECTED_TABLE',                  'chat_connected');
 
 // Course forum tables
 define('TABLE_FORUM_CATEGORY',              'forum_category');

main/inc/lib/database.lib.php

@@ -195,7 +195,7 @@ class Database {
     }
 
     public static function get_course_chat_connected_table($database_name = '') {
-        return self::format_glued_course_table_name(self::fix_database_parameter($database_name), CHAT_CONNECTED_TABLE);
+        return self::format_glued_course_table_name(self::fix_database_parameter($database_name), TABLE_CHAT_CONNECTED);
     }
 
     /*

main/inc/lib/database.mysqli.lib.php

@@ -193,7 +193,7 @@ class Database {
     }
 
     public static function get_course_chat_connected_table($database_name = '') {
-        return self::format_glued_course_table_name(self::fix_database_parameter($database_name), CHAT_CONNECTED_TABLE);
+        return self::format_glued_course_table_name(self::fix_database_parameter($database_name), TABLE_CHAT_CONNECTED);
     }
 
     /*