1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 03:29:23 +02:00

Bug Spray!

- No longer asks a user to login to a passworded forum even though his auth is not high enough, it just rejects the user now.


git-svn-id: file:///svn/phpbb/trunk@5394 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2005-12-29 16:57:56 +00:00
parent e7acc9c82c
commit 72b3d6ca78

View File

@ -71,6 +71,23 @@ if (!($forum_data = $db->sql_fetchrow($result)))
}
$db->sql_freeresult($result);
// Redirect to login upon emailed notification links
if (isset($_GET['e']) && !$user->data['is_registered'])
{
login_box('', $user->lang['LOGIN_NOTIFY_FORUM']);
}
// Permissions check
if (!$auth->acl_get('f_read', $forum_id))
{
if ($user->data['user_id'] != ANONYMOUS)
{
trigger_error($user->lang['SORRY_AUTH_READ']);
}
login_box('', $user->lang['LOGIN_VIEWFORUM']);
}
// Is this forum a link? ... User got here either because the
// number of clicks is being tracked or they guessed the id
if ($forum_data['forum_link'])
@ -97,23 +114,6 @@ if ($forum_data['forum_password'])
login_forum_box($forum_data);
}
// Redirect to login upon emailed notification links
if (isset($_GET['e']) && !$user->data['is_registered'])
{
login_box('', $user->lang['LOGIN_NOTIFY_FORUM']);
}
// Permissions check
if (!$auth->acl_get('f_read', $forum_id))
{
if ($user->data['user_id'] != ANONYMOUS)
{
trigger_error($user->lang['SORRY_AUTH_READ']);
}
login_box('', $user->lang['LOGIN_VIEWFORUM']);
}
// Build navigation links
generate_forum_nav($forum_data);