mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-12 06:18:52 +00:00
More ANONYMOUS changes
git-svn-id: file:///svn/phpbb/trunk@3489 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
f3a3543476
commit
7c96e14e76
1 changed files with 4 additions and 6 deletions
|
@ -40,14 +40,12 @@ $redirect = (!empty($redirect)) ? $_SERVER['QUERY_STRING'] : '';
|
||||||
// Do the login/logout/form/whatever
|
// Do the login/logout/form/whatever
|
||||||
if (isset($login) || isset($logout))
|
if (isset($login) || isset($logout))
|
||||||
{
|
{
|
||||||
if (isset($login) && !$user->data['user_id'])
|
if (isset($login) && $user->data['user_id'] == ANONYMOUS)
|
||||||
{
|
{
|
||||||
$autologin = (!empty($autologin)) ? true : false;
|
$autologin = (!empty($autologin)) ? true : false;
|
||||||
|
|
||||||
//
|
|
||||||
// Is the board disabled? Are we an admin? No, then back to the index we go
|
// Is the board disabled? Are we an admin? No, then back to the index we go
|
||||||
//
|
if (!empty($config['board_disable']) && !$auth->acl_get('a_'))
|
||||||
if ($config['board_disable'] && !$auth->acl_get('a_'))
|
|
||||||
{
|
{
|
||||||
redirect("index.$phpEx$SID");
|
redirect("index.$phpEx$SID");
|
||||||
}
|
}
|
||||||
|
@ -59,7 +57,7 @@ if (isset($login) || isset($logout))
|
||||||
);
|
);
|
||||||
|
|
||||||
$message = $user->lang['Error_login'] . '<br /><br />' . sprintf($user->lang['Click_return_login'], '<a href="' . "login.$phpEx$SID&redirect=$redirect" . '">', '</a>') . '<br /><br />' . sprintf($user->lang['Click_return_index'], '<a href="' . "index.$phpEx$SID" . '">', '</a>');
|
$message = $user->lang['Error_login'] . '<br /><br />' . sprintf($user->lang['Click_return_login'], '<a href="' . "login.$phpEx$SID&redirect=$redirect" . '">', '</a>') . '<br /><br />' . sprintf($user->lang['Click_return_index'], '<a href="' . "index.$phpEx$SID" . '">', '</a>');
|
||||||
message_die(MESSAGE, $message);
|
trigger_error($message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ($user->data['user_id'] != ANONYMOUS)
|
else if ($user->data['user_id'] != ANONYMOUS)
|
||||||
|
@ -74,7 +72,7 @@ if (isset($login) || isset($logout))
|
||||||
redirect($redirect_url);
|
redirect($redirect_url);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !$user->data['user_id'] )
|
if ($user->data['user_id'] == ANONYMOUS)
|
||||||
{
|
{
|
||||||
$template->assign_vars(array(
|
$template->assign_vars(array(
|
||||||
'L_ENTER_PASSWORD' => $user->lang['Enter_password'],
|
'L_ENTER_PASSWORD' => $user->lang['Enter_password'],
|
||||||
|
|
Loading…
Add table
Reference in a new issue