Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3933 from gschlager/phpbb3-importer 

FIX: Correctly import users and passwords from phpBB 3.1
This commit is contained in:
Robin Ward 2015-12-29 10:20:56 -05:00
parent e4adfdb624 f2663ecb09
commit 55a5154323
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
script/import_scripts/phpbb3/database/database_3_1.rb
View File

@ -1,16 +1,20 @@
require_relative 'database_3_0' require_relative 'database_3_0'
require_relative '../support/constants/constants' require_relative '../support/constants'
module ImportScripts::PhpBB3 module ImportScripts::PhpBB3
class Database_3_1 < Database_3_0 class Database_3_1 < Database_3_0
def fetch_users(offset) def fetch_users(offset)
query(<<-SQL) query(<<-SQL)
SELECT u.user_id, u.user_email, u.username, u.user_password, u.user_regdate, u.user_lastvisit, u.user_ip, SELECT u.user_id, u.user_email, u.username,
CASE WHEN u.user_password LIKE '$2y$%'
THEN CONCAT('$2a$', SUBSTRING(u.user_password, 5))
ELSE u.user_password
END AS user_password, u.user_regdate, u.user_lastvisit, u.user_ip,
u.user_type, u.user_inactive_reason, g.group_name, b.ban_start, b.ban_end, b.ban_reason, u.user_type, u.user_inactive_reason, g.group_name, b.ban_start, b.ban_end, b.ban_reason,
u.user_posts, f.pf_phpbb_website AS user_website, f.pf_phpbb_location AS user_from, u.user_posts, f.pf_phpbb_website AS user_website, f.pf_phpbb_location AS user_from,
u.user_birthday, u.user_avatar_type, u.user_avatar u.user_birthday, u.user_avatar_type, u.user_avatar
FROM #{@table_prefix}_users u FROM #{@table_prefix}_users u
JOIN #{@table_prefix}_profile_fields_data f ON (u.user_id = f.user_id) LEFT OUTER JOIN #{@table_prefix}_profile_fields_data f ON (u.user_id = f.user_id)
JOIN #{@table_prefix}_groups g ON (g.group_id = u.group_id) JOIN #{@table_prefix}_groups g ON (g.group_id = u.group_id)
LEFT OUTER JOIN #{@table_prefix}_banlist b ON ( LEFT OUTER JOIN #{@table_prefix}_banlist b ON (
u.user_id = b.ban_userid AND b.ban_exclude = 0 AND u.user_id = b.ban_userid AND b.ban_exclude = 0 AND