makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17514] Replace phpBB3 with phpBB in installer

Browse source 
PHPBB-17514
This commit is contained in:
Marc Alexander 2025-05-20 20:57:45 +02:00
parent 705df48dff
commit dbc4f16cfa
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/install/convertors/convert_phpbb20.php
View file

@ -103,7 +103,7 @@ $tables = array(
* In either of the latter cases 'table_name' indicates the name of the table in the database * 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 * '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 * 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 * 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. * 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(); } // if (defined("MOD_ATTACHMENT")) { import_attachment_files(); phpbb_copy_thumbnails(); }
// phpBB2 allowed some similar usernames to coexist which would have the same // 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 // of user ids and usernames and let him deicde what he wants to do with them
'execute_first' => ' 'execute_first' => '
phpbb_create_userconv_table(); phpbb_create_userconv_table();

4
phpBB/install/convertors/functions_phpbb20.php
View file

@ -1176,7 +1176,7 @@ function phpbb_convert_group_type($group_type)
break; 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; 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 * 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() function phpbb_create_userconv_table()
{ {

2
phpBB/install/schemas/schema_data.sql
View file

@ -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 ('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 ('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_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_notice', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path', '/'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path', '/');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_secure', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_secure', '0');

2
phpBB/phpbb/install/module/install_database/task/add_config_settings.php
View file

@ -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. // 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 = md5(mt_rand());
$rand_str = str_replace('0', 'z', base_convert($rand_str, 16, 35)); $rand_str = str_replace('0', 'z', base_convert($rand_str, 16, 35));
$rand_str = substr($rand_str, 0, 5); $rand_str = substr($rand_str, 0, 5);