makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 04:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source
This commit is contained in:
Joas Schilling 2015-01-13 23:29:25 +01:00
commit 26beafa564
1 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
phpBB/viewtopic.php
View file

@ -336,8 +336,41 @@ if (($topic_data['topic_type'] == POST_STICKY || $topic_data['topic_type'] == PO
// Setup look and feel // Setup look and feel
$user->setup('viewtopic', $topic_data['forum_style']); $user->setup('viewtopic', $topic_data['forum_style']);
$overrides_f_read_check = false;
$overrides_forum_password_check = false;
$topic_tracking_info = isset($topic_tracking_info) ? $topic_tracking_info : null;
/**
* Event to apply extra permissions and to override original phpBB's f_read permission and forum password check
* on viewtopic access
*
* @event core.viewtopic_before_f_read_check
* @var int forum_id The forum id from where the topic belongs
* @var int topic_id The id of the topic the user tries to access
* @var int post_id The id of the post the user tries to start viewing at.
* It may be 0 for none given.
* @var array topic_data All the information from the topic and forum tables for this topic
* It includes posts information if post_id is not 0
* @var bool overrides_f_read_check Set true to remove f_read check afterwards
* @var bool overrides_forum_password_check Set true to remove forum_password check afterwards
* @var array topic_tracking_info Information upon calling get_topic_tracking()
* Set it to NULL to allow auto-filling later.
* Set it to an array to override original data.
* @since 3.1.3-RC1
*/
$vars = array(
'forum_id',
'topic_id',
'post_id',
'topic_data',
'overrides_f_read_check',
'overrides_forum_password_check',
'topic_tracking_info',
);
extract($phpbb_dispatcher->trigger_event('core.viewtopic_before_f_read_check', compact($vars)));
// Start auth check // Start auth check
if (!$auth->acl_get('f_read', $forum_id)) if (!$overrides_f_read_check && !$auth->acl_get('f_read', $forum_id))
{ {
if ($user->data['user_id'] != ANONYMOUS) if ($user->data['user_id'] != ANONYMOUS)
{ {
@ -349,7 +382,7 @@ if (!$auth->acl_get('f_read', $forum_id))
// Forum is passworded ... check whether access has been granted to this // Forum is passworded ... check whether access has been granted to this
// user this session, if not show login box // user this session, if not show login box
if ($topic_data['forum_password']) if (!$overrides_forum_password_check && $topic_data['forum_password'])
{ {
login_forum_box($topic_data); login_forum_box($topic_data);
} }