makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 06:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- now notification redirection working... ?!

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4969 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2004-09-01 08:42:12 +00:00
parent ec5521438e
commit 3c8e36b458
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/viewtopic.php
View file

@ -258,7 +258,7 @@ if (!$auth->acl_get('f_read', $forum_id))
trigger_error($user->lang['SORRY_AUTH_READ']); trigger_error($user->lang['SORRY_AUTH_READ']);
} }
login_box($user->cur_page, '', $user->lang['LOGIN_VIEWFORUM']); login_box($user->cur_page, '', $user->lang['LOGIN_VIEWTOPIC']);
} }
// Forum is passworded ... check whether access has been granted to this // Forum is passworded ... check whether access has been granted to this
@ -272,17 +272,16 @@ if ($forum_password)
if (isset($_GET['e'])) if (isset($_GET['e']))
{ {
$jump_to = (int) $_GET['e']; $jump_to = (int) $_GET['e'];
$redirect_url = "{$phpbb_root_path}viewtopic.$phpEx$SID&f=$forum_id&t=$topic_id";
$redirect_url = str_replace('&e=' . $jump_to, '', $_SERVER['REQUEST_URI']) . (($jump_to) ? '#' . $jump_to : '');
if ($user->data['user_id'] == ANONYMOUS) if ($user->data['user_id'] == ANONYMOUS)
{ {
login_box(preg_replace('#.*?([a-z]+?\.' . $phpEx . '.*?)$#i', '\1', htmlspecialchars($redirect_url)), '', $user->lang['LOGIN_NOTIFY_TOPIC']); login_box($redirect_url . "&p=$post_id&e=$jump_to", '', $user->lang['LOGIN_NOTIFY_TOPIC']);
} }
else if ($jump_to > 0) else if ($jump_to > 0)
{ {
// We direct the already logged in user to the correct post... // We direct the already logged in user to the correct post...
redirect(preg_replace('#^' . $config['script_path'] . '#', '', $redirect_url)); redirect($redirect_url . ((!$post_id) ? "&p=$jump_to" : "&p=$post_id") . "#$jump_to");
} }
} }