diff options
| author | brunoais <brunoaiss@gmail.com> | 2014-12-13 18:48:53 +0000 |
|---|---|---|
| committer | brunoais <brunoaiss@gmail.com> | 2015-01-10 17:08:40 +0000 |
| commit | a5a6855a0d9f198f43184f36fe997cb85e24777a (patch) | |
| tree | 3c6787e9a3a6ce0be6aa421b5b210c357e20ac86 /phpBB/viewtopic.php | |
| parent | a0287a62c105df121c46f827c71d8c3808f67964 (diff) | |
| download | forums-a5a6855a0d9f198f43184f36fe997cb85e24777a.tar forums-a5a6855a0d9f198f43184f36fe997cb85e24777a.tar.gz forums-a5a6855a0d9f198f43184f36fe997cb85e24777a.tar.bz2 forums-a5a6855a0d9f198f43184f36fe997cb85e24777a.tar.xz forums-a5a6855a0d9f198f43184f36fe997cb85e24777a.zip | |
[ticket/13160] Allow override f_read and forum password
Adds a couple of variables to the event that allows extension authors to
bypass the f_read and forum password checks as if the user had those permissions
whether or not he actually has them.
PHPBB3-13160
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 82f091b1cf..269d2fed04 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -336,6 +336,8 @@ if (($topic_data['topic_type'] == POST_STICKY || $topic_data['topic_type'] == PO // Setup look and feel $user->setup('viewtopic', $topic_data['forum_style']); +$overrides_f_read = false; +$overrides_forum_password = false; /** * Event to apply extra permissions and to override original phpBB's f_read permission and forum password check * on viewtopic access @@ -346,6 +348,8 @@ $user->setup('viewtopic', $topic_data['forum_style']); * @var int post_id The id of the post the user tries to start viewing at. It may be 0 for none given. * @var string 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 array overrides_f_read Set true to remove f_read check afterwards +* @var array overrides_forum_password Set true to remove forum_password check afterwards * * @since 3.1.3-RC1 */ @@ -354,11 +358,13 @@ $vars = array( 'topic_id', 'post_id', 'topic_data', + 'overrides_f_read', + 'overrides_forum_password', ); extract($phpbb_dispatcher->trigger_event('core.viewtopic_before_f_read_check', compact($vars))); // Start auth check -if (!$auth->acl_get('f_read', $forum_id)) +if (!$overrides_f_read && !$auth->acl_get('f_read', $forum_id)) { if ($user->data['user_id'] != ANONYMOUS) { @@ -370,7 +376,7 @@ if (!$auth->acl_get('f_read', $forum_id)) // Forum is passworded ... check whether access has been granted to this // user this session, if not show login box -if ($topic_data['forum_password']) +if (!$overrides_forum_password && $topic_data['forum_password']) { login_forum_box($topic_data); } |