Просмотр исходного кода

Changes (on new setups) the charset of the database from latin1 to utf8mb4

Changes the default charset to utf8mb4 to make possible storing unicode characters.
It will only affect to new setups.

Why is it necessary? the main reason is to avoid the following error when searching for in the database:
**Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb4_general_ci,COERCIBLE) for operation 'like'**

The update module contains the necessary queries to update a database (in modules/update/module.php), but it might create other problems after the conversion, so that is commented. By uncommenting it, changing the database version to 3 and using the "update modules" button in the panel, it will (try to) convert the charset of the database.
DieFeM 3 лет назад
Родитель
Сommit
75fdc50f48

+ 2 - 2
install.php

@@ -441,7 +441,7 @@ function install() {
             `db_version` int(10) NOT NULL default '0',
             `db_version` int(10) NOT NULL default '0',
             PRIMARY KEY  (`id`),
             PRIMARY KEY  (`id`),
         UNIQUE KEY `folder` (`folder`)
         UNIQUE KEY `folder` (`folder`)
-    ) ENGINE=MyISAM  DEFAULT CHARSET=latin1;");
+    ) ENGINE=MyISAM  DEFAULT CHARSET=utf8mb4;");
         $result = $db->query("DROP TABLE IF EXISTS ".$table_prefix."module_menus");
         $result = $db->query("DROP TABLE IF EXISTS ".$table_prefix."module_menus");
         $result = $db->query("CREATE TABLE IF NOT EXISTS `".$table_prefix."module_menus` (
         $result = $db->query("CREATE TABLE IF NOT EXISTS `".$table_prefix."module_menus` (
             `module_id` int(11) NOT NULL COMMENT 'This references to modules.id',
             `module_id` int(11) NOT NULL COMMENT 'This references to modules.id',
@@ -450,7 +450,7 @@ function install() {
             `menu_name` varchar(128) NOT NULL,
             `menu_name` varchar(128) NOT NULL,
 			`pos` INT UNSIGNED NOT NULL,
 			`pos` INT UNSIGNED NOT NULL,
             PRIMARY KEY  (`module_id`,`subpage`,`group`)
             PRIMARY KEY  (`module_id`,`subpage`,`group`)
-        ) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
         if (!$result) $fail = true;
         if (!$result) $fail = true;
 
 
         // Install modules.
         // Install modules.

+ 1 - 1
modules/TS3Admin/module.php

@@ -39,7 +39,7 @@ $install_queries[0] = array(
   `vserver_id` int(50) NOT NULL,
   `vserver_id` int(50) NOT NULL,
   `user_id` int(50) NOT NULL,
   `user_id` int(50) NOT NULL,
   PRIMARY KEY (`ts3_id`),
   PRIMARY KEY (`ts3_id`),
-UNIQUE KEY user_id (user_id,vserver_id)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+UNIQUE KEY user_id (user_id,vserver_id)) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
 $install_queries[1] = array(
 $install_queries[1] = array(
 "ALTER TABLE `".OGP_DB_PREFIX."ts3_homes` DROP INDEX `user_id` ,
 "ALTER TABLE `".OGP_DB_PREFIX."ts3_homes` DROP INDEX `user_id` ,
  ADD UNIQUE `rserver_id` ( `rserver_id` , `vserver_id` , `user_id` );");
  ADD UNIQUE `rserver_id` ( `rserver_id` , `vserver_id` , `user_id` );");

+ 1 - 1
modules/administration/module.php

@@ -48,6 +48,6 @@ $install_queries[1] = array(
   `user_id` int(11) NOT NULL,  
   `user_id` int(11) NOT NULL,  
   `ip` varchar(15) NOT NULL,
   `ip` varchar(15) NOT NULL,
   `message` varchar(250) NOT NULL
   `message` varchar(250) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
 ?>
 ?>
 
 

+ 2 - 2
modules/config_games/module.php

@@ -45,7 +45,7 @@ $install_queries[0] = array(
   `home_cfg_file` varchar(64) NULL,
   `home_cfg_file` varchar(64) NULL,
   PRIMARY KEY  (`home_cfg_id`),
   PRIMARY KEY  (`home_cfg_id`),
   UNIQUE KEY `game_key` (`game_key`)
   UNIQUE KEY `game_key` (`game_key`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1;",
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8mb4;",
 
 
 "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."config_mods;",
 "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."config_mods;",
 "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."config_mods` (
 "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."config_mods` (
@@ -57,6 +57,6 @@ $install_queries[0] = array(
   `def_postcmd` TEXT,
   `def_postcmd` TEXT,
   PRIMARY KEY  (`mod_cfg_id`),
   PRIMARY KEY  (`mod_cfg_id`),
   UNIQUE KEY `home_cfg_id` (`home_cfg_id`,`mod_key`)
   UNIQUE KEY `home_cfg_id` (`home_cfg_id`,`mod_key`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
 
 
 ?>
 ?>

+ 2 - 2
modules/dashboard/module.php

@@ -38,7 +38,7 @@ $install_queries[0] = array(
   `collapsed` tinyint(4) NOT NULL,
   `collapsed` tinyint(4) NOT NULL,
   `title` varchar(100) NOT NULL,
   `title` varchar(100) NOT NULL,
   PRIMARY KEY  (`id`)
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
 
 
 "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."widgets_users",
 "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."widgets_users",
 "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."widgets_users` (  
 "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."widgets_users` (  
@@ -48,7 +48,7 @@ $install_queries[0] = array(
   `sort_no` int(11) NOT NULL,  
   `sort_no` int(11) NOT NULL,  
   `collapsed` tinyint(4) NOT NULL,  
   `collapsed` tinyint(4) NOT NULL,  
   `title` varchar(100) NOT NULL
   `title` varchar(100) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
 
 
 "INSERT INTO `".OGP_DB_PREFIX."widgets` (`id`, `column_id`, `sort_no`, `collapsed`, `title`) VALUES 
 "INSERT INTO `".OGP_DB_PREFIX."widgets` (`id`, `column_id`, `sort_no`, `collapsed`, `title`) VALUES 
 (1, 1, 1, 0, 'Game Monitor'),  
 (1, 1, 1, 0, 'Game Monitor'),  

+ 4 - 4
modules/gamemanager/module.php

@@ -37,7 +37,7 @@ $install_queries[0] = array(
 	`port` int(11) NOT NULL,
 	`port` int(11) NOT NULL,
 	`home_id` int(11) NOT NULL,
 	`home_id` int(11) NOT NULL,
 	PRIMARY KEY  (`ip_id`,`port`)
 	PRIMARY KEY  (`ip_id`,`port`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
 
 
 "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."server_homes",
 "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."server_homes",
 "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."server_homes` (
 "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."server_homes` (
@@ -52,7 +52,7 @@ $install_queries[0] = array(
 	`last_param` LONGTEXT NULL,
 	`last_param` LONGTEXT NULL,
 	PRIMARY KEY  (`home_id`),
 	PRIMARY KEY  (`home_id`),
 UNIQUE KEY remote_server_id (remote_server_id,home_path)
 UNIQUE KEY remote_server_id (remote_server_id,home_path)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
 
 
 "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."rcon_presets;",
 "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."rcon_presets;",
 "CREATE TABLE ".OGP_DB_PREFIX."rcon_presets (
 "CREATE TABLE ".OGP_DB_PREFIX."rcon_presets (
@@ -62,7 +62,7 @@ UNIQUE KEY remote_server_id (remote_server_id,home_path)
 	`home_cfg_id` int(50) NOT NULL,
 	`home_cfg_id` int(50) NOT NULL,
 	`mod_cfg_id` int(50) NOT NULL,
 	`mod_cfg_id` int(50) NOT NULL,
 	PRIMARY KEY  (`preset_id`)
 	PRIMARY KEY  (`preset_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
 
 
 "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."game_mods",
 "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."game_mods",
 "CREATE TABLE IF NOT EXISTS ".OGP_DB_PREFIX."game_mods (
 "CREATE TABLE IF NOT EXISTS ".OGP_DB_PREFIX."game_mods (
@@ -90,7 +90,7 @@ $install_queries[2] = array(
   `ip_id` char(3) NOT NULL,
   `ip_id` char(3) NOT NULL,
   `port` char(6) NOT NULL,
   `port` char(6) NOT NULL,
   `server_status_cache` longtext NOT NULL
   `server_status_cache` longtext NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
 
 
 $install_queries[3] = array(
 $install_queries[3] = array(
 	"ALTER TABLE `".OGP_DB_PREFIX."server_homes` ADD `custom_fields` LONGTEXT NULL;");
 	"ALTER TABLE `".OGP_DB_PREFIX."server_homes` ADD `custom_fields` LONGTEXT NULL;");

+ 1 - 1
modules/modulemanager/module.php

@@ -41,5 +41,5 @@ $install_queries[2] = array("DROP TABLE IF EXISTS ".OGP_DB_PREFIX."module_access
 							"`flag` char(1) NOT NULL,".
 							"`flag` char(1) NOT NULL,".
 							"`description` varchar(64) NOT NULL,".
 							"`description` varchar(64) NOT NULL,".
 							"UNIQUE (`flag`)".
 							"UNIQUE (`flag`)".
-							") ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+							") ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
 ?>
 ?>

+ 2 - 2
modules/mysql/module.php

@@ -40,7 +40,7 @@ $install_queries[0] = array(
 	`mysql_root_passwd` VARCHAR( 32 ) NULL,
 	`mysql_root_passwd` VARCHAR( 32 ) NULL,
 	`privilegies_str` LONGTEXT NULL,
 	`privilegies_str` LONGTEXT NULL,
 	PRIMARY KEY  (`mysql_server_id`)
 	PRIMARY KEY  (`mysql_server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
 
 
 "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."mysql_databases",
 "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."mysql_databases",
 "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."mysql_databases` (
 "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."mysql_databases` (
@@ -54,6 +54,6 @@ $install_queries[0] = array(
 	PRIMARY KEY  (`db_id`),
 	PRIMARY KEY  (`db_id`),
 	UNIQUE KEY (`mysql_server_id`,`db_name`),
 	UNIQUE KEY (`mysql_server_id`,`db_name`),
 	UNIQUE KEY (`mysql_server_id`,`db_user`)
 	UNIQUE KEY (`mysql_server_id`,`db_user`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
 
 
 ?>
 ?>

+ 3 - 3
modules/server/module.php

@@ -39,7 +39,7 @@ $install_queries[0] = array(
   `remote_server_id` int(11) NOT NULL,
   `remote_server_id` int(11) NOT NULL,
   `ip` varchar(255) NOT NULL,
   `ip` varchar(255) NOT NULL,
   PRIMARY KEY (`ip_id`)
   PRIMARY KEY (`ip_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
 "DROP TABLE IF EXISTS `".OGP_DB_PREFIX."remote_servers`;",
 "DROP TABLE IF EXISTS `".OGP_DB_PREFIX."remote_servers`;",
 "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."remote_servers` (
 "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."remote_servers` (
   `remote_server_id` int(11) NOT NULL auto_increment,
   `remote_server_id` int(11) NOT NULL auto_increment,
@@ -52,7 +52,7 @@ $install_queries[0] = array(
   `timeout` int(11) NOT NULL,
   `timeout` int(11) NOT NULL,
   PRIMARY KEY  (`remote_server_id`),
   PRIMARY KEY  (`remote_server_id`),
   UNIQUE KEY `agent_ip` (`agent_ip`,`agent_port`)
   UNIQUE KEY `agent_ip` (`agent_ip`,`agent_port`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 COMMENT='Remote servers and IPs';");
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8mb4 COMMENT='Remote servers and IPs';");
 
 
 $install_queries[1] = array(	
 $install_queries[1] = array(	
 	"ALTER TABLE `".OGP_DB_PREFIX."remote_servers` 
 	"ALTER TABLE `".OGP_DB_PREFIX."remote_servers` 
@@ -75,7 +75,7 @@ $install_queries[4] = array(
   `port_increment` smallint(11) unsigned NOT NULL,
   `port_increment` smallint(11) unsigned NOT NULL,
   PRIMARY KEY  (`range_id`),
   PRIMARY KEY  (`range_id`),
   UNIQUE KEY `ip_id` (`ip_id`,`home_cfg_id`)
   UNIQUE KEY `ip_id` (`ip_id`,`home_cfg_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 COMMENT='Remote servers and IPs';");
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8mb4 COMMENT='Remote servers and IPs';");
 
 
 $install_queries[5] = array(
 $install_queries[5] = array(
 	"ALTER TABLE `OGP_DB_PREFIXremote_servers` 
 	"ALTER TABLE `OGP_DB_PREFIXremote_servers` 

+ 1 - 1
modules/settings/module.php

@@ -39,7 +39,7 @@ $install_queries[0] = array(
         `setting` varchar(63) NOT NULL,
         `setting` varchar(63) NOT NULL,
         `value` varchar(255) NOT NULL,
         `value` varchar(255) NOT NULL,
         PRIMARY KEY  (`setting`)
         PRIMARY KEY  (`setting`)
-    ) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+    ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
 
 
 $install_queries[1] = array(
 $install_queries[1] = array(
     "ALTER TABLE `".OGP_DB_PREFIX."settings` CHANGE `value` `value` VARCHAR( 1024 ) NOT NULL;");
     "ALTER TABLE `".OGP_DB_PREFIX."settings` CHANGE `value` `value` VARCHAR( 1024 ) NOT NULL;");

+ 49 - 1
modules/update/module.php

@@ -36,7 +36,7 @@ $install_queries[0] = array();
 $install_queries[1] = array(
 $install_queries[1] = array(
     "CREATE TABLE IF NOT EXISTS ".OGP_DB_PREFIX."update_blacklist (
     "CREATE TABLE IF NOT EXISTS ".OGP_DB_PREFIX."update_blacklist (
         `file_path` VARCHAR(1000) UNIQUE NOT NULL
         `file_path` VARCHAR(1000) UNIQUE NOT NULL
-    ) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+    ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
 $install_queries[2] = array(
 $install_queries[2] = array(
 	"DELETE FROM ".OGP_DB_PREFIX."update_blacklist
 	"DELETE FROM ".OGP_DB_PREFIX."update_blacklist
 WHERE file_path IN (SELECT * 
 WHERE file_path IN (SELECT * 
@@ -47,4 +47,52 @@ WHERE file_path IN (SELECT *
     "ALTER TABLE ".OGP_DB_PREFIX."update_blacklist MODIFY file_path VARCHAR(1000);",
     "ALTER TABLE ".OGP_DB_PREFIX."update_blacklist MODIFY file_path VARCHAR(1000);",
 	"ALTER TABLE ".OGP_DB_PREFIX."update_blacklist ADD UNIQUE (file_path);"
 	"ALTER TABLE ".OGP_DB_PREFIX."update_blacklist ADD UNIQUE (file_path);"
 );
 );
+/* 
+$install_queries[3] = array(
+	"ALTER TABLE `".OGP_DB_PREFIX."users` MODIFY COLUMN `users_login` NVARCHAR(128);",
+	"ALTER TABLE `".OGP_DB_PREFIX."users` MODIFY COLUMN `users_passwd` NVARCHAR(128);",
+	"ALTER TABLE `".OGP_DB_PREFIX."users` MODIFY COLUMN `users_fname` NVARCHAR(128);",
+	"ALTER TABLE `".OGP_DB_PREFIX."users` MODIFY COLUMN `users_lname` NVARCHAR(128);",
+	"ALTER TABLE `".OGP_DB_PREFIX."users` MODIFY COLUMN `users_email` NVARCHAR(128);",
+	"ALTER TABLE `".OGP_DB_PREFIX."users` MODIFY COLUMN `users_city` NVARCHAR(128);",
+	"ALTER TABLE `".OGP_DB_PREFIX."users` MODIFY COLUMN `users_province` NVARCHAR(128);",
+	"ALTER TABLE `".OGP_DB_PREFIX."users` MODIFY COLUMN `users_country` NVARCHAR(128);",
+	"ALTER TABLE `".OGP_DB_PREFIX."users` MODIFY COLUMN `users_theme` NVARCHAR(128);",
+	"ALTER TABLE `".OGP_DB_PREFIX."user_group_info` MODIFY COLUMN `group_name` NVARCHAR(128);",
+	"ALTER TABLE `".OGP_DB_PREFIX."ban_list` MODIFY COLUMN `client_ip` NVARCHAR(128);",
+	"ALTER TABLE `".OGP_DB_PREFIX."addons` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."adminExternalLinks` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."api_tokens` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."arrange_ports` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."ban_list` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."config_homes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."config_mods` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."game_mods` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."home_ip_ports` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."lgsl` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."logger` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."master_server_homes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."module_access_rights` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."module_menus` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."modules` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."mysql_databases` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."mysql_servers` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."rcon_presets` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."remote_server_ips` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."remote_servers` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."server_homes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."settings` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."status_cache` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."ts3_homes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."update_blacklist` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."user_group_homes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."user_group_info` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."user_group_remote_servers` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."user_groups` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."user_homes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."user_role_info` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."widgets` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;",
+	"ALTER TABLE `".OGP_DB_PREFIX."widgets_users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;");
 ?>
 ?>
+ */

+ 5 - 5
modules/user_admin/module.php

@@ -54,31 +54,31 @@ $install_queries[0] = array(
         `user_expires` varchar(30) NOT NULL default 'X',
         `user_expires` varchar(30) NOT NULL default 'X',
         PRIMARY KEY  (`users_login`),
         PRIMARY KEY  (`users_login`),
 		UNIQUE KEY `id` (`user_id`)
 		UNIQUE KEY `id` (`user_id`)
-    ) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
+    ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
     "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_groups;",
     "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_groups;",
     "CREATE TABLE ".OGP_DB_PREFIX."user_groups (
     "CREATE TABLE ".OGP_DB_PREFIX."user_groups (
         `user_id` int(11) NOT NULL,
         `user_id` int(11) NOT NULL,
         `role_id` int(11) NULL,
         `role_id` int(11) NULL,
         `group_id` int(11) NOT NULL,
         `group_id` int(11) NOT NULL,
         PRIMARY KEY (`user_id`,`group_id`)
         PRIMARY KEY (`user_id`,`group_id`)
-    ) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
+    ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
     "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_role_info;",
     "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_role_info;",
     "CREATE TABLE ".OGP_DB_PREFIX."user_role_info (
     "CREATE TABLE ".OGP_DB_PREFIX."user_role_info (
         `role_id` int(11) NOT NULL auto_increment,
         `role_id` int(11) NOT NULL auto_increment,
         `role_name` varchar(100) NULL,
         `role_name` varchar(100) NULL,
         PRIMARY KEY (`role_id`), UNIQUE KEY (`role_name`)
         PRIMARY KEY (`role_id`), UNIQUE KEY (`role_name`)
-    ) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
+    ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
     "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_group_info;",
     "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_group_info;",
     "CREATE TABLE ".OGP_DB_PREFIX."user_group_info (
     "CREATE TABLE ".OGP_DB_PREFIX."user_group_info (
         `group_id` int(11) NOT NULL auto_increment,
         `group_id` int(11) NOT NULL auto_increment,
         `group_name` varchar(255), PRIMARY KEY (`group_id`),
         `group_name` varchar(255), PRIMARY KEY (`group_id`),
         UNIQUE KEY (`group_name`)
         UNIQUE KEY (`group_name`)
-        ) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+        ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
 
 
 $install_queries[1] = array("ALTER TABLE `".OGP_DB_PREFIX."user_group_info` ADD `main_user_id` int(11) NULL;");
 $install_queries[1] = array("ALTER TABLE `".OGP_DB_PREFIX."user_group_info` ADD `main_user_id` int(11) NULL;");
 $install_queries[2] = array("ALTER TABLE `".OGP_DB_PREFIX."users` ADD `users_parent` int(11) NULL;");
 $install_queries[2] = array("ALTER TABLE `".OGP_DB_PREFIX."users` ADD `users_parent` int(11) NULL;");
 $install_queries[3] = array(
 $install_queries[3] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."users` CHANGE `users_email` `users_email` VARCHAR( 255 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL",
+	"ALTER TABLE `".OGP_DB_PREFIX."users` CHANGE `users_email` `users_email` VARCHAR( 255 ) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL",
 	"UPDATE ".OGP_DB_PREFIX."users
 	"UPDATE ".OGP_DB_PREFIX."users
 	JOIN (
 	JOIN (
 		SELECT users_email, MIN(user_id) minID
 		SELECT users_email, MIN(user_id) minID

+ 4 - 4
modules/user_games/module.php

@@ -38,21 +38,21 @@ $install_queries[0] = array(
 		`user_id` int(11) NOT NULL,
 		`user_id` int(11) NOT NULL,
 		`access_rights` varchar(63) default NULL,
 		`access_rights` varchar(63) default NULL,
 		PRIMARY KEY (`user_id`,`home_id`)
 		PRIMARY KEY (`user_id`,`home_id`)
-	) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
+	) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
 	"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_group_remote_servers;",
 	"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_group_remote_servers;",
 	"CREATE TABLE ".OGP_DB_PREFIX."user_group_remote_servers (
 	"CREATE TABLE ".OGP_DB_PREFIX."user_group_remote_servers (
 		`remote_server_id` int(11) NOT NULL,
 		`remote_server_id` int(11) NOT NULL,
 		`group_id` int(11) NOT NULL,
 		`group_id` int(11) NOT NULL,
 		`access_rights` varchar(63) default NULL,
 		`access_rights` varchar(63) default NULL,
 		PRIMARY KEY (`remote_server_id`, `group_id`)
 		PRIMARY KEY (`remote_server_id`, `group_id`)
-	)ENGINE=MyISAM DEFAULT CHARSET=latin1;",
+	)ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
 	"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_group_homes;",
 	"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_group_homes;",
 	"CREATE TABLE ".OGP_DB_PREFIX."user_group_homes (
 	"CREATE TABLE ".OGP_DB_PREFIX."user_group_homes (
 		`home_id` int(11) NOT NULL,
 		`home_id` int(11) NOT NULL,
 		`group_id` int(11) NOT NULL,
 		`group_id` int(11) NOT NULL,
 		`access_rights` varchar(63) default NULL,
 		`access_rights` varchar(63) default NULL,
 		PRIMARY KEY (`home_id`, `group_id`)
 		PRIMARY KEY (`home_id`, `group_id`)
-	)ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+	)ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
 
 
 $install_queries[1] = array(
 $install_queries[1] = array(
 	"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."master_server_homes`;",
 	"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."master_server_homes`;",
@@ -61,7 +61,7 @@ $install_queries[1] = array(
 		`home_cfg_id` int(11) NOT NULL,
 		`home_cfg_id` int(11) NOT NULL,
 		`remote_server_id` int(11) NOT NULL,
 		`remote_server_id` int(11) NOT NULL,
 		PRIMARY KEY (`remote_server_id`, `home_cfg_id`)
 		PRIMARY KEY (`remote_server_id`, `home_cfg_id`)
-	)ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+	)ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
 
 
 $install_queries[2] = array(
 $install_queries[2] = array(
 	"ALTER TABLE `".OGP_DB_PREFIX."user_homes` ADD `user_expiration_date` VARCHAR(21) NOT NULL default 'X';",
 	"ALTER TABLE `".OGP_DB_PREFIX."user_homes` ADD `user_expiration_date` VARCHAR(21) NOT NULL default 'X';",