From 598f899fb86b5c477507652a81ecb00fdf98178a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 11 Aug 2023 21:53:08 +0200 Subject: [PATCH] [ticket/9687] Fix converting phpBB2 bans PHPBB3-9687 --- phpBB/install/convertors/convert_phpbb20.php | 22 ++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index af114ee398..e8266de86c 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -446,28 +446,38 @@ if (!$get_info) array( 'target' => BANS_TABLE, - 'execute_first' => 'phpbb_check_username_collisions();', + 'execute_first' => 'phpbb_check_username_collisions();', 'query_first' => array('target', $convert->truncate_statement . BANS_TABLE), array('ban_mode', 'user', ''), array('ban_item', 'banlist.ban_userid', 'phpbb_user_id'), + array('ban_userid', 'banlist.ban_userid', 'phpbb_user_id'), array('ban_reason', '', ''), - array('ban_give_reason', '', ''), + array('ban_reason_display', '', ''), - 'where' => "banlist.ban_ip NOT LIKE '%.%' AMD banlist.ban_userid <> 0", + 'where' => "banlist.ban_ip NOT LIKE '%.%' AND banlist.ban_userid <> 0", ), array( 'target' => BANS_TABLE, - 'execute_first' => 'phpbb_check_username_collisions();', - 'query_first' => array('target', $convert->truncate_statement . BANS_TABLE), array('ban_mode', 'email', ''), array('ban_item', 'banlist.ban_email', ''), array('ban_reason', '', ''), array('ban_reason_display', '', ''), - 'where' => "banlist.ban_ip NOT LIKE '%.%' AMD banlist.ban_email <> ''", + 'where' => "banlist.ban_ip NOT LIKE '%.%' AND banlist.ban_email <> ''", + ), + + array( + 'target' => BANS_TABLE, + + array('ban_mode', 'ip', ''), + array('ban_item', 'banlist.ban_ip', 'decode_ban_ip'), + array('ban_reason', '', ''), + array('ban_reason_display', '', ''), + + 'where' => "banlist.ban_userid = 0 AND banlist.ban_ip <> ''", ), array(