From dbc4f16cfa1cc15fdc30a76d6849adcabd864631 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 20 May 2025 20:57:45 +0200 Subject: [PATCH] [ticket/17514] Replace phpBB3 with phpBB in installer PHPBB-17514 --- phpBB/install/convertors/convert_phpbb20.php | 4 ++-- phpBB/install/convertors/functions_phpbb20.php | 4 ++-- phpBB/install/schemas/schema_data.sql | 2 +- .../module/install_database/task/add_config_settings.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index db5a38db1f..6576275d6a 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -103,7 +103,7 @@ $tables = array( * In either of the latter cases 'table_name' indicates the name of the table in the database * * 'settings' is an array which maps the name of the config directive in the source forum -* to the config directive in phpBB3. It can either be a direct mapping or use a function. +* to the config directive in phpBB. It can either be a direct mapping or use a function. * Please note that the contents of the old config value are passed to the function, therefore * an in-built function requiring the variable passed by reference is not able to be used. Since * empty() is such a function we created the function is_empty() to be used instead. @@ -332,7 +332,7 @@ if (!$get_info) // if (defined("MOD_ATTACHMENT")) { import_attachment_files(); phpbb_copy_thumbnails(); } // phpBB2 allowed some similar usernames to coexist which would have the same - // username_clean in phpBB3 which is not possible, so we'll give the admin a list + // username_clean in phpBB which is not possible, so we'll give the admin a list // of user ids and usernames and let him deicde what he wants to do with them 'execute_first' => ' phpbb_create_userconv_table(); diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 168c6be348..450800c314 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1176,7 +1176,7 @@ function phpbb_convert_group_type($group_type) break; } - // Never return GROUP_SPECIAL here, because only phpBB3's default groups are allowed to have this type set. + // Never return GROUP_SPECIAL here, because only phpBB's default groups are allowed to have this type set. return GROUP_HIDDEN; } @@ -1735,7 +1735,7 @@ function phpbb_disallowed_username($username) /** * Checks whether there are any usernames on the old board that would map to the same -* username_clean on phpBB3. Prints out a list if any exist and exits. +* username_clean on phpBB. Prints out a list if any exist and exits. */ function phpbb_create_userconv_table() { diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 7f53a3adc4..0c4910fb78 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -86,7 +86,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('chg_passforce', '0 INSERT INTO phpbb_config (config_name, config_value) VALUES ('confirm_refresh', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('contact_admin_form_enable', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name', 'phpbb3'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name', 'phpbb'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_notice', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path', '/'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_secure', '0'); diff --git a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php index 14c88a04d3..9e3c8d38db 100644 --- a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php +++ b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php @@ -173,7 +173,7 @@ class add_config_settings extends database_task } // We set a (semi-)unique cookie name to bypass login issues related to the cookie name. - $cookie_name = 'phpbb3_'; + $cookie_name = 'phpbb_'; $rand_str = md5(mt_rand()); $rand_str = str_replace('0', 'z', base_convert($rand_str, 16, 35)); $rand_str = substr($rand_str, 0, 5);