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

- some bugfixes

Browse Source 
- bugfixes for the convertor (typecasting for example was totally broken)


git-svn-id: file:///svn/phpbb/trunk@6865 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-01-09 14:10:44 +00:00
parent 164fb66f44
commit 2b35b9d60d
15 changed files with 82 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,6 +390,7 @@ if (!$get_info)
array('ban_ip', 'banlist.ban_ip', 'decode_ban_ip'),
array('ban_userid', 'banlist.ban_userid', 'phpbb_user_id'),
array('ban_email', 'banlist.ban_email', ''),
'where' => "banlist.ban_ip NOT LIKE '%.%'",
),
@@ -397,10 +398,11 @@ if (!$get_info)
array(
'target' => BANLIST_TABLE,
array('ban_email', 'banlist.ban_email', ''),
array('ban_userid', 'banlist.ban_userid', 'phpbb_user_id'),
array('ban_ip', 'banlist.ban_ip', ''),
array('ban_userid', '0', ''),
array('ban_email', '', ''),
'where' => "banlist.ban_ip = ''",
'where' => "banlist.ban_ip LIKE '%.%'",
),
array(

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

@@ -749,7 +749,7 @@ function phpbb_convert_authentication($mode)
// We only check for ACL_YES equivalence entry
if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1)
{
mass_auth('group', $new_forum_id, $access['group_id'], $new_acl, ACL_YES);
mass_auth('group', $new_forum_id, (int) $access['group_id'], $new_acl, ACL_YES);
}
}
}
@@ -761,7 +761,7 @@ function phpbb_convert_authentication($mode)
// We only check for ACL_YES equivalence entry
if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1)
{
mass_auth('user', $new_forum_id, phpbb_user_id($access['user_id']), $new_acl, ACL_YES);
mass_auth('user', $new_forum_id, (int) phpbb_user_id($access['user_id']), $new_acl, ACL_YES);
}
}
}
@@ -776,7 +776,7 @@ function phpbb_convert_authentication($mode)
// We only check for ACL_YES equivalence entry
if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1)
{
mass_auth('group', $new_forum_id, $access['group_id'], $new_acl, ACL_YES);
mass_auth('group', $new_forum_id, (int) $access['group_id'], $new_acl, ACL_YES);
}
}
}
@@ -788,7 +788,7 @@ function phpbb_convert_authentication($mode)
// We only check for ACL_YES equivalence entry
if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1)
{
mass_auth('user', $new_forum_id, phpbb_user_id($access['user_id']), $new_acl, ACL_YES);
mass_auth('user', $new_forum_id, (int) phpbb_user_id($access['user_id']), $new_acl, ACL_YES);
}
}
}
@@ -820,7 +820,7 @@ function phpbb_convert_authentication($mode)
while ($row = $db->sql_fetchrow($result))
{
mass_auth('user_role', 0, phpbb_user_id($row['user_id']), 'USER_NOAVATAR');
mass_auth('user_role', 0, (int) phpbb_user_id($row['user_id']), 'USER_NOAVATAR');
}
$db->sql_freeresult($result);
@@ -832,7 +832,7 @@ function phpbb_convert_authentication($mode)
while ($row = $db->sql_fetchrow($result))
{
mass_auth('user_role', 0, phpbb_user_id($row['user_id']), 'USER_NOPM');
mass_auth('user_role', 0, (int) phpbb_user_id($row['user_id']), 'USER_NOPM');
}
$db->sql_freeresult($result);
}
@@ -848,8 +848,8 @@ function phpbb_convert_authentication($mode)
{
if (isset($access['auth_mod']) && $access['auth_mod'] == 1)
{
mass_auth('user_role', $forum_id, phpbb_user_id($access['user_id']), 'MOD_STANDARD');
mass_auth('user_role', $forum_id, phpbb_user_id($access['user_id']), 'FORUM_STANDARD');
mass_auth('user_role', $forum_id, (int) phpbb_user_id($access['user_id']), 'MOD_STANDARD');
mass_auth('user_role', $forum_id, (int) phpbb_user_id($access['user_id']), 'FORUM_STANDARD');
}
}
}
@@ -862,8 +862,8 @@ function phpbb_convert_authentication($mode)
{
if (isset($access['auth_mod']) && $access['auth_mod'] == 1)
{
mass_auth('group_role', $forum_id, $access['group_id'], 'MOD_STANDARD');
mass_auth('group_role', $forum_id, $access['group_id'], 'FORUM_STANDARD');
mass_auth('group_role', $forum_id, (int) $access['group_id'], 'MOD_STANDARD');
mass_auth('group_role', $forum_id, (int) $access['group_id'], 'FORUM_STANDARD');
}
}
}