diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-08-21 14:08:23 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-08-21 14:08:23 +0000 |
| commit | 5f4cd5b65c22a35e8ef3005a9025c2a3f579cfaa (patch) | |
| tree | 8875640acee2d9f66de8afa838cbdf0d239f4191 /phpBB/install/convertors/functions_phpbb20.php | |
| parent | c52e9039cf60f5170978f136bbcac2e1c7843c0d (diff) | |
| download | forums-5f4cd5b65c22a35e8ef3005a9025c2a3f579cfaa.tar forums-5f4cd5b65c22a35e8ef3005a9025c2a3f579cfaa.tar.gz forums-5f4cd5b65c22a35e8ef3005a9025c2a3f579cfaa.tar.bz2 forums-5f4cd5b65c22a35e8ef3005a9025c2a3f579cfaa.tar.xz forums-5f4cd5b65c22a35e8ef3005a9025c2a3f579cfaa.zip | |
#14105 Note that announcements can be global - that's not a bug.
git-svn-id: file:///svn/phpbb/trunk@8060 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/convertors/functions_phpbb20.php')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index ab1a1ede11..74ca47986e 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -587,7 +587,7 @@ function phpbb_convert_authentication($mode) $forum_access = array(); while ($row = $src_db->sql_fetchrow($result)) { - $forum_access[] = $row; + $forum_access[$row['forum_id']] = $row; } $src_db->sql_freeresult($result); @@ -967,6 +967,12 @@ function phpbb_convert_authentication($mode) { // And now the moderators // We make sure that they have at least standard access to the forums they moderate in addition to the moderating permissions + + $mod_post_map = array( + 'auth_announce' => 'f_announce', + 'auth_sticky' => 'f_sticky' + ); + foreach ($user_access as $forum_id => $access_map) { $forum_id = (int) $forum_id; @@ -977,6 +983,13 @@ function phpbb_convert_authentication($mode) { 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'); + foreach ($mod_post_map as $old => $new) + { + if (isset($forum_access[$forum_id]) && isset($forum_access[$forum_id][$old]) && $forum_access[$forum_id][$old] == AUTH_MOD) + { + mass_auth('user', $forum_id, (int) phpbb_user_id($access['user_id']), $new, ACL_YES); + } + } } } } @@ -991,6 +1004,13 @@ function phpbb_convert_authentication($mode) { mass_auth('group_role', $forum_id, (int) $access['group_id'], 'MOD_STANDARD'); mass_auth('group_role', $forum_id, (int) $access['group_id'], 'FORUM_STANDARD'); + foreach ($mod_post_map as $old => $new) + { + if (isset($forum_access[$forum_id]) && isset($forum_access[$forum_id][$old]) && $forum_access[$forum_id][$old] == AUTH_MOD) + { + mass_auth('group', $forum_id, (int) $access['group_id'], $new, ACL_YES); + } + } } } } |