Fix remaining track_e_exercices and other minor issues with the renaming of the table (and update db version) - refs #7268

main/inc/lib/online.inc.php

@@ -26,7 +26,7 @@ function LoginCheck($uid) {
     if (!empty($uid)) {
         $user_ip = '';
         if (!empty($_SERVER['REMOTE_ADDR'])) {
-            $user_ip = Database::escape_string($_SERVER['REMOTE_ADDR']);
+            $user_ip = Database::escape_string(api_get_real_ip());
         }
 
 		$login_date = api_get_utc_datetime();

main/install/db_main.sql

@@ -884,7 +884,7 @@ VALUES
 ('tool_visible_by_default_at_creation','quiz','checkbox','Tools','true','ToolVisibleByDefaultAtCreationTitle','ToolVisibleByDefaultAtCreationComment',NULL,'Quiz', 1),
 ('tool_visible_by_default_at_creation','gradebook','checkbox','Tools','true','ToolVisibleByDefaultAtCreationTitle','ToolVisibleByDefaultAtCreationComment',NULL,'Gradebook', 1),
 ('prevent_session_admins_to_manage_all_users', NULL, 'radio', 'Session', 'false', 'PreventSessionAdminsToManageAllUsersTitle', 'PreventSessionAdminsToManageAllUsersComment', NULL, NULL, 1),
-('chamilo_database_version', NULL, 'textfield',NULL, '1.10.0.11','DatabaseVersion','', NULL, NULL, 0);
+('chamilo_database_version', NULL, 'textfield',NULL, '1.10.0.12','DatabaseVersion','', NULL, NULL, 0);
 UNLOCK TABLES;
 /*!40000 ALTER TABLE settings_current ENABLE KEYS */;
 

main/install/migrate-db-1.9.0-1.10.0-pre.sql

@@ -36,25 +36,20 @@ ALTER TABLE skill ADD COLUMN criteria text DEFAULT '';
 
 ALTER TABLE gradebook_category ADD COLUMN generate_certificates TINYINT NOT NULL DEFAULT 0;
 
-RENAME TABLE track_e_exercices TO track_e_exercises
+RENAME TABLE track_e_exercices TO track_e_exercises;
 
 ALTER TABLE session_rel_user ADD COLUMN duration int;
 
 ALTER TABLE track_e_access ADD COLUMN c_id int NOT NULL;
-ALTER TABLE track_e_access ADD COLUMN user_ip varchar(39) NOT NULL default '';
 ALTER TABLE track_e_default ADD COLUMN c_id int NOT NULL;
 ALTER TABLE track_e_lastaccess ADD COLUMN c_id int NOT NULL;
 ALTER TABLE track_e_exercises ADD COLUMN c_id int NOT NULL;
-ALTER TABLE track_e_exercises ADD COLUMN user_ip varchar(39) NOT NULL default '';
 ALTER TABLE track_e_downloads ADD COLUMN c_id int NOT NULL;
 ALTER TABLE track_e_hotpotatoes ADD COLUMN c_id int NOT NULL;
 ALTER TABLE track_e_links ADD COLUMN c_id int NOT NULL;
 ALTER TABLE track_e_course_access ADD COLUMN c_id int NOT NULL;
-ALTER TABLE track_e_course_access ADD COLUMN user_ip varchar(39) NOT NULL default '';
 ALTER TABLE track_e_online ADD COLUMN c_id int NOT NULL;
-ALTER TABLE track_e_online CHANGE COLUMN login_ip user_ip varchar(39) NOT NULL DEFAULT '';
 ALTER TABLE track_e_attempt ADD COLUMN c_id int NOT NULL;
-ALTER TABLE track_e_login CHANGE COLUMN login_ip user_ip varchar(39) NOT NULL DEFAULT '';
 
 DELETE FROM settings_current WHERE variable = 'wcag_anysurfer_public_pages';
 DELETE FROM settings_options WHERE variable = 'wcag_anysurfer_public_pages';
@@ -62,9 +57,14 @@ DELETE FROM settings_options WHERE variable = 'wcag_anysurfer_public_pages';
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('prevent_session_admins_to_manage_all_users', NULL, 'radio', 'Session', 'false', 'PreventSessionAdminsToManageAllUsersTitle', 'PreventSessionAdminsToManageAllUsersComment', NULL, NULL, 1);
 INSERT INTO settings_options (variable, value, display_text) VALUES ('prevent_session_admins_to_manage_all_users', 'true', 'Yes'), ('prevent_session_admins_to_manage_all_users', 'false', 'No');
 
+ALTER TABLE track_e_access ADD COLUMN user_ip varchar(39) NOT NULL default '';
+ALTER TABLE track_e_exercises ADD COLUMN user_ip varchar(39) NOT NULL default '';
+ALTER TABLE track_e_course_access ADD COLUMN user_ip varchar(39) NOT NULL default '';
+ALTER TABLE track_e_online CHANGE COLUMN login_ip user_ip varchar(39) NOT NULL DEFAULT '';
+ALTER TABLE track_e_login CHANGE COLUMN login_ip user_ip varchar(39) NOT NULL DEFAULT '';
 
 -- Do not move this query
-UPDATE settings_current SET selected_value = '1.10.0.11' WHERE variable = 'chamilo_database_version';
+UPDATE settings_current SET selected_value = '1.10.0.12' WHERE variable = 'chamilo_database_version';
 
 -- xxCOURSExx
 

main/install/update-db-1.9.0-1.10.0.inc.php

@@ -112,7 +112,7 @@ if (defined('SYSTEM_INSTALLATION')) {
                     'track_e_course_access' => 'course_code',
                     'track_e_online' => 'course',
                     'track_e_attempt' => 'course_code',
-                    'track_e_exercices' => 'exe_cours_id'
+                    'track_e_exercises' => 'exe_cours_id'
                 );
 
                 foreach ($fields as $table => $key) {