All constants are now in a separate file

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

@@ -24,6 +24,7 @@ define('TABLE_MAIN_CLASS_USER',             'class_user');
 define('TABLE_MAIN_CATEGORY',               'course_category');
 define('TABLE_MAIN_COURSE_MODULE',          'course_module');
 define('TABLE_MAIN_SYSTEM_ANNOUNCEMENTS',   'sys_announcement');
+define('TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS', 	'announcement_rel_group');
 define('TABLE_MAIN_LANGUAGE',               'language');
 define('TABLE_MAIN_SETTINGS_OPTIONS',       'settings_options');
 define('TABLE_MAIN_SETTINGS_CURRENT',       'settings_current');
@@ -64,6 +65,7 @@ define('TABLE_MAIN_USER_REL_TAG',       'user_rel_tag');
 define('TABLE_MAIN_GROUP',              'groups');
 define('TABLE_MAIN_USER_REL_GROUP',     'group_rel_user');
 define('TABLE_MAIN_GROUP_REL_TAG',      'group_rel_tag');
+define('TABLE_MAIN_GROUP_REL_GROUP',		'group_rel_group');
 
 // Search engine
 define('TABLE_MAIN_SPECIFIC_FIELD',         'specific_field');
@@ -293,3 +295,17 @@ define('TABLE_USERGROUP_REL_SESSION',   'usergroup_rel_session');
 
 // Mail notifications
 define('TABLE_NOTIFICATION',               'notification');
+
+
+//Custom reports table
+define('TABLE_MAIN_REPORTS_KEYS',			'reports_keys');
+define('TABLE_MAIN_REPORTS_VALUES', 			'reports_values');
+
+//Storage api tables
+define('TABLE_MAIN_STORED_VALUES',			'stored_values');
+define('TABLE_MAIN_STORED_VALUES_STACK',	'stored_values_stack');
+
+//Event tables
+define('TABLE_MAIN_EVENT_TYPE','event_type');
+define('TABLE_MAIN_EVENT_TYPE_MESSAGE','event_type_message');
+define('TABLE_MAIN_EVENT_TYPE_REL_USER','user_rel_event_type');

main/inc/lib/database.lib.php

@@ -15,17 +15,7 @@
  */
 
 /*	CONSTANTS */
-
 require_once 'database.constants.inc.php';
-define('TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS', 					'announcement_rel_group');
-define('TABLE_MAIN_REPORTS_KEYS',			'reports_keys');
-define('TABLE_MAIN_REPORTS_VALUES', 			'reports_values');
-define('TABLE_MAIN_STORED_VALUES',			'stored_values');
-define('TABLE_MAIN_STORED_VALUES_STACK',	'stored_values_stack');
-define('TABLE_MAIN_GROUP_REL_GROUP',		'group_rel_group');
-define('TABLE_MAIN_EVENT_TYPE','event_type');
-define('TABLE_MAIN_EVENT_TYPE_MESSAGE','event_type_message');
-define('TABLE_MAIN_EVENT_TYPE_REL_USER','user_rel_event_type');
 
 
 /*		DATABASE CLASS
@@ -432,6 +422,8 @@ class Database {
         if (!isset($parameters['client_flags'])) {
             $parameters['client_flags'] = 0;
         }
+        print_r($parameters);
+        die('toto');
         return $parameters['persistent']
             ? mysql_pconnect($parameters['server'], $parameters['username'], $parameters['password'], $parameters['client_flags'])
             : mysql_connect($parameters['server'], $parameters['username'], $parameters['password'], $parameters['new_link'], $parameters['client_flags']);