1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-06 22:45:02 +02:00

#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
This commit is contained in:
Henry Sudhof 2007-08-21 14:08:23 +00:00
parent c52e9039cf
commit 5f4cd5b65c
2 changed files with 23 additions and 1 deletions

View File

@ -232,6 +232,8 @@ p a {
<li>[Fix] Ordered BBcode parsing functions in the same way everywhere where they are used</li>
<li>[Fix] Prevent {URL} token in custom BBCodes from make_clickable messing (Bug #14151)</li>
<li>[Sec] Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses.</li>
<li>[Fix] Convert 2.0 moderator posting permissions (Bug #14105)</li>
</ul>
</div>

View File

@ -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);
}
}
}
}
}