mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-27 02:05:02 +02:00
- added confirmation to removing bbcodes
- added optional MX and DNSBL checks - added backtrace (triggering sql error) on error within sql_in_set as well as making sure it is handling an array - let users having f_list access to a forum actually see the forum without a topic list and not displaying an error message - this allows for giving people access to subforums but not the parent forum without the need to add the (sub-)forum to the index. - some additional bugfixes git-svn-id: file:///svn/phpbb/trunk@6414 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -77,7 +77,7 @@ if (isset($_GET['e']) && !$user->data['is_registered'])
|
||||
}
|
||||
|
||||
// Permissions check
|
||||
if (!$auth->acl_get('f_read', $forum_id))
|
||||
if (!$auth->acl_gets('f_list', 'f_read', $forum_id))
|
||||
{
|
||||
if ($user->data['user_id'] != ANONYMOUS)
|
||||
{
|
||||
@@ -114,7 +114,10 @@ if ($forum_data['forum_password'])
|
||||
generate_forum_nav($forum_data);
|
||||
|
||||
// Forum Rules
|
||||
generate_forum_rules($forum_data);
|
||||
if ($auth->acl_get('f_read', $forum_id))
|
||||
{
|
||||
generate_forum_rules($forum_data);
|
||||
}
|
||||
|
||||
// Do we have subforums?
|
||||
$active_forum_ary = $moderators = array();
|
||||
@@ -144,6 +147,12 @@ if (!($forum_data['forum_type'] == FORUM_POST || (($forum_data['forum_flags'] &
|
||||
page_footer();
|
||||
}
|
||||
|
||||
// Ok, if someone has only list-access, we only display the forum list
|
||||
if (!$auth->acl_get('f_read', $forum_id))
|
||||
{
|
||||
page_footer();
|
||||
}
|
||||
|
||||
// Handle marking posts
|
||||
if ($mark_read == 'topics')
|
||||
{
|
||||
|
Reference in New Issue
Block a user