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

Fix "Specified key was too long; max key length is 1000 bytes"

https://opengamepanel.org/forum/viewthread.php?thread_id=7984
DieFeM 3 лет назад
Родитель
Сommit
cbc2afe0f3
4 измененных файлов с 11 добавлено и 59 удалено
  1. 2 2
      modules/gamemanager/module.php
  2. 4 4
      modules/server/module.php
  3. 3 51
      modules/update/module.php
  4. 2 2
      modules/user_admin/module.php

+ 2 - 2
modules/gamemanager/module.php

@@ -44,9 +44,9 @@ $install_queries[0] = array(
 	`home_id` int(50) NOT NULL auto_increment,
 	`home_id` int(50) NOT NULL auto_increment,
 	`remote_server_id` int(11) NOT NULL,
 	`remote_server_id` int(11) NOT NULL,
 	`user_id_main` int(11) NOT NULL,
 	`user_id_main` int(11) NOT NULL,
-	`home_path` varchar(500) NOT NULL,
+	`home_path` varchar(128) NOT NULL,
 	`home_cfg_id` int(50) NOT NULL,
 	`home_cfg_id` int(50) NOT NULL,
-	`home_name` varchar(500) NOT NULL,
+	`home_name` varchar(128) NOT NULL,
 	`control_password` VARCHAR( 128 ) NULL,
 	`control_password` VARCHAR( 128 ) NULL,
 	`ftp_password` VARCHAR( 128 ) NULL,
 	`ftp_password` VARCHAR( 128 ) NULL,
 	`last_param` LONGTEXT NULL,
 	`last_param` LONGTEXT NULL,

+ 4 - 4
modules/server/module.php

@@ -37,7 +37,7 @@ $install_queries[0] = array(
 "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."remote_server_ips` (
 "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."remote_server_ips` (
   `ip_id` int(11) NOT NULL AUTO_INCREMENT,
   `ip_id` int(11) NOT NULL AUTO_INCREMENT,
   `remote_server_id` int(11) NOT NULL,
   `remote_server_id` int(11) NOT NULL,
-  `ip` varchar(255) NOT NULL,
+  `ip` varchar(128) NOT NULL,
   PRIMARY KEY (`ip_id`)
   PRIMARY KEY (`ip_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;",
 "DROP TABLE IF EXISTS `".OGP_DB_PREFIX."remote_servers`;",
 "DROP TABLE IF EXISTS `".OGP_DB_PREFIX."remote_servers`;",
@@ -45,7 +45,7 @@ $install_queries[0] = array(
   `remote_server_id` int(11) NOT NULL auto_increment,
   `remote_server_id` int(11) NOT NULL auto_increment,
   `remote_server_name` varchar(100) NOT NULL,
   `remote_server_name` varchar(100) NOT NULL,
   `ogp_user` varchar(100) NOT NULL,
   `ogp_user` varchar(100) NOT NULL,
-  `agent_ip` varchar(255) NOT NULL,
+  `agent_ip` varchar(128) NOT NULL,
   `agent_port` int(11) NOT NULL,
   `agent_port` int(11) NOT NULL,
   `ftp_port` int(11) NOT NULL,
   `ftp_port` int(11) NOT NULL,
   `encryption_key` varchar(50) NOT NULL,
   `encryption_key` varchar(50) NOT NULL,
@@ -62,7 +62,7 @@ $install_queries[2] = array(
 	 ADD `ufw_status` CHAR(8);");
 	 ADD `ufw_status` CHAR(8);");
 $install_queries[3] = array(
 $install_queries[3] = array(
 	"ALTER TABLE `OGP_DB_PREFIXremote_servers` 
 	"ALTER TABLE `OGP_DB_PREFIXremote_servers` 
-	 ADD `ftp_ip` varchar(255) NOT NULL;");
+	 ADD `ftp_ip` varchar(128) NOT NULL;");
 	 
 	 
 $install_queries[4] = array(
 $install_queries[4] = array(
 "DROP TABLE IF EXISTS `".OGP_DB_PREFIX."arrange_ports`;",
 "DROP TABLE IF EXISTS `".OGP_DB_PREFIX."arrange_ports`;",
@@ -89,6 +89,6 @@ $install_queries[6] = array(
 
 
 $install_queries[7] = array(
 $install_queries[7] = array(
         "ALTER TABLE `OGP_DB_PREFIXremote_servers`
         "ALTER TABLE `OGP_DB_PREFIXremote_servers`
-        MODIFY `display_public_ip` varchar(255) NOT NULL;");
+        MODIFY `display_public_ip` varchar(128) NOT NULL;");
 
 
 ?>
 ?>

+ 3 - 51
modules/update/module.php

@@ -35,7 +35,7 @@ $install_queries = array();
 $install_queries[0] = array();
 $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(128) UNIQUE NOT NULL
     ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
     ) 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
@@ -44,55 +44,7 @@ WHERE file_path IN (SELECT *
                    GROUP BY file_path HAVING (COUNT(*) > 1)
                    GROUP BY file_path HAVING (COUNT(*) > 1)
                   ) AS A
                   ) AS A
             );",
             );",
-    "ALTER TABLE ".OGP_DB_PREFIX."update_blacklist MODIFY file_path VARCHAR(1000);",
+    "ALTER TABLE ".OGP_DB_PREFIX."update_blacklist MODIFY file_path VARCHAR(128);",
 	"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;");
-?>
- */
+?>

+ 2 - 2
modules/user_admin/module.php

@@ -71,14 +71,14 @@ $install_queries[0] = array(
     "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(128), PRIMARY KEY (`group_id`),
         UNIQUE KEY (`group_name`)
         UNIQUE KEY (`group_name`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;");
         ) 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 utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL",
+	"ALTER TABLE `".OGP_DB_PREFIX."users` CHANGE `users_email` `users_email` VARCHAR( 128 ) 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