aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-09-22 13:25:28 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-09-22 13:25:28 +0000
commite1d1c6039b36699edc24b5c19a589dfacf5fa51b (patch)
tree19bdc05af03a00edef0e877c0a05cd4c64cdbc64 /phpBB/viewforum.php
parent20f9b87f04fb2eab0eef9411918878ef9e689891 (diff)
downloadforums-e1d1c6039b36699edc24b5c19a589dfacf5fa51b.tar
forums-e1d1c6039b36699edc24b5c19a589dfacf5fa51b.tar.gz
forums-e1d1c6039b36699edc24b5c19a589dfacf5fa51b.tar.bz2
forums-e1d1c6039b36699edc24b5c19a589dfacf5fa51b.tar.xz
forums-e1d1c6039b36699edc24b5c19a589dfacf5fa51b.zip
adding more hashes
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8904 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 06b43a6d39..b95a009baa 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -173,8 +173,11 @@ if (!$auth->acl_get('f_read', $forum_id))
// Handle marking posts
if ($mark_read == 'topics')
{
- markread('topics', $forum_id);
-
+ $token = request_var('hash', '');
+ if (check_link_hash($token, 'global'))
+ {
+ markread('topics', $forum_id);
+ }
$redirect_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id);
meta_refresh(3, $redirect_url);
@@ -307,7 +310,7 @@ $template->assign_vars(array(
'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&amp;i=main&amp;mode=forum_view", true, $user->session_id) : '',
'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=post&amp;f=' . $forum_id) : '',
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : '') . "&amp;start=$start"),
- 'U_MARK_TOPICS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&amp;mark=topics") : '',
+ 'U_MARK_TOPICS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . "&amp;f=$forum_id&amp;mark=topics") : '',
));
// Grab icons