mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-21 16:22:22 +02:00
Code Issues Releases Wiki Activity

- merge r9113: Handle checking for duplicate usernames in chunks (Bug #17285 - Patch by A_Jelly_Doughnut)

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@9114 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2008-11-24 19:31:44 +00:00
parent 81c44f8351
commit 9954d9c29f
2 changed files with 28 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/install/convertors/convert_phpbb20.php
View File

@ -229,6 +229,9 @@ if (!$get_info)
@define('DEFAULT_AVATAR_X_CUSTOM', get_config_value('avatar_max_width'));
@define('DEFAULT_AVATAR_Y_CUSTOM', get_config_value('avatar_max_height'));
// additional table used only during conversion
@define('USERCONV_TABLE', $table_prefix . 'userconv');
/**
* Description on how to use the convertor framework.
*
@ -316,7 +319,7 @@ if (!$get_info)
// username_clean in phpBB3 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_check_username_collisions();
phpbb_create_userconv_table();
import_avatar_gallery();
if (defined("MOD_ATTACHMENT")) phpbb_import_attach_config();
phpbb_insert_forums();
@ -339,6 +342,14 @@ if (!$get_info)
'),
'schema' => array(
array(
'target' => USERCONV_TABLE,
'query_first' => array('target', $convert->truncate_statement . USERCONV_TABLE),
array('user_id', 'users.user_id', ''),
array('username_clean', 'users.username', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_clean_string')),
),
array(
'target' => (defined('MOD_ATTACHMENT')) ? ATTACHMENTS_TABLE : '',
@ -419,6 +430,7 @@ if (!$get_info)
array(
'target' => BANLIST_TABLE,
'execute_first' => 'phpbb_check_username_collisions();',
'query_first' => array('target', $convert->truncate_statement . BANLIST_TABLE),
array('ban_ip', 'banlist.ban_ip', 'decode_ban_ip'),

51
phpBB/install/convertors/functions_phpbb20.php
View File

@ -1716,51 +1716,51 @@ 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.
*/
function phpbb_check_username_collisions()
function phpbb_create_userconv_table()
{
global $db, $src_db, $convert, $table_prefix, $user, $lang;
// create a temporary table in which we store the clean usernames
$drop_sql = 'DROP TABLE ' . $table_prefix . 'userconv';
$drop_sql = 'DROP TABLE ' . USERCONV_TABLE;
switch ($db->dbms_type)
{
case 'firebird':
$create_sql = 'CREATE TABLE ' . $table_prefix . 'userconv (
$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
user_id INTEGER NOT NULL,
username_clean VARCHAR(255) CHARACTER SET UTF8 DEFAULT \'\' NOT NULL COLLATE UNICODE
)';
break;
case 'mssql':
$create_sql = 'CREATE TABLE [' . $table_prefix . 'userconv] (
$create_sql = 'CREATE TABLE [' . USERCONV_TABLE . '] (
[user_id] [int] NOT NULL ,
[username_clean] [varchar] (255) DEFAULT (\'\') NOT NULL
)';
break;
case 'mysql':
$create_sql = 'CREATE TABLE ' . $table_prefix . 'userconv (
$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
user_id mediumint(8) NOT NULL,
username_clean varchar(255) DEFAULT \'\' NOT NULL
) CHARACTER SET `utf8` COLLATE `utf8_bin`';
break;
case 'oracle':
$create_sql = 'CREATE TABLE ' . $table_prefix . 'userconv (
$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
user_id number(8) NOT NULL,
username_clean varchar2(255) DEFAULT \'\'
)';
break;
case 'postgres':
$create_sql = 'CREATE TABLE ' . $table_prefix . 'userconv (
$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
user_id INT4 DEFAULT \'0\',
username_clean varchar_ci DEFAULT \'\' NOT NULL
)';
break;
case 'sqlite':
$create_sql = 'CREATE TABLE ' . $table_prefix . 'userconv (
$create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' (
user_id INTEGER NOT NULL DEFAULT \'0\',
username_clean varchar(255) NOT NULL DEFAULT \'\'
)';
@ -1771,37 +1771,15 @@ function phpbb_check_username_collisions()
$db->sql_query($drop_sql);
$db->sql_return_on_error(false);
$db->sql_query($create_sql);
}
// now select all user_ids and usernames and then convert the username (this can take quite a while!)
$sql = 'SELECT user_id, username
FROM ' . $convert->src_table_prefix . 'users';
$result = $src_db->sql_query($sql);
$insert_ary = array();
$i = 0;
while ($row = $src_db->sql_fetchrow($result))
{
$clean_name = utf8_clean_string(phpbb_set_default_encoding($row['username']));
$insert_ary[] = array('user_id' => (int) $row['user_id'], 'username_clean' => (string) $clean_name);
if ($i % 1000 == 999)
{
$db->sql_multi_insert($table_prefix . 'userconv', $insert_ary);
$insert_ary = array();
}
$i++;
}
$src_db->sql_freeresult($result);
if (sizeof($insert_ary))
{
$db->sql_multi_insert($table_prefix . 'userconv', $insert_ary);
}
unset($insert_ary);
function phpbb_check_username_collisions()
{
global $db, $src_db, $convert, $table_prefix, $user, $lang;
// now find the clean version of the usernames that collide
$sql = 'SELECT username_clean
FROM ' . $table_prefix . 'userconv
FROM ' . USERCONV_TABLE .'
GROUP BY username_clean
HAVING COUNT(user_id) > 1';
$result = $db->sql_query($sql);
@ -1817,7 +1795,7 @@ function phpbb_check_username_collisions()
if (sizeof($colliding_names))
{
$sql = 'SELECT user_id, username_clean
FROM ' . $table_prefix . 'userconv
FROM ' . USERCONV_TABLE . '
WHERE ' . $db->sql_in_set('username_clean', $colliding_names);
$result = $db->sql_query($sql);
unset($colliding_names);
@ -1860,6 +1838,7 @@ function phpbb_check_username_collisions()
$convert->p_master->error('<span style="color:red">' . $user->lang['COLLIDING_USERNAMES_FOUND'] . '</span></b><br /><br />' . $list . '<b>', __LINE__, __FILE__);
}
$drop_sql = 'DROP TABLE ' . USERCONV_TABLE;
$db->sql_query($drop_sql);
}