makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

a little polish

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8585 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2008-06-03 16:29:56 +00:00
parent 459db0eb1b
commit 3116f279a1
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/index.php
View file

@ -34,7 +34,7 @@ if ($user->data['user_id'] != ANONYMOUS && (!isset($user->data['session_admin']
}
else if ($user->data['user_id'] == ANONYMOUS)
{
login_box();
login_box('');
}
// Is user any type of admin? No, then stop here, each script needs to

8
phpBB/includes/functions.php
View file

@ -2420,7 +2420,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
// If we are not within the admin directory we use the page dir...
$redirect = '';
if (!$admin)
if (!$admin && !defined('ADMIN_START'))
{
$redirect .= ($user->page['page_dir']) ? $user->page['page_dir'] . '/' : '';
}
@ -2453,7 +2453,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
'S_DISPLAY_FULL_LOGIN' => ($s_display) ? true : false,
'S_LOGIN_ACTION' => (!$admin) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("index.$phpEx", false, true, $user->session_id), // Needs to stay index.$phpEx because we are within the admin directory
'S_LOGIN_ACTION' => (!$admin && !defined('ADMIN_START')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("index.$phpEx", false, true, $user->session_id), // Needs to stay index.$phpEx because we are within the admin directory
'S_HIDDEN_FIELDS' => $s_hidden_fields,
'S_ADMIN_AUTH' => $admin,
@ -3095,7 +3095,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
if (!defined('HEADER_INC'))
{
if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin'])
if (defined('ADMIN_START') || (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin']))
{
adm_page_header($msg_title);
}
@ -3119,7 +3119,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
// We do not want the cron script to be called on error messages
define('IN_CRON', true);
if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin'])
if (defined('ADMIN_START') || (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin']))
{
adm_page_footer();
}

1
phpBB/language/en/acp/common.php
View file

@ -239,6 +239,7 @@ $lang = array_merge($lang, array(
'LOOK_UP_FORUM' => 'Select a forum',
'LOOK_UP_FORUMS_EXPLAIN'=> 'You are able to select more than one forum.',
'LOGIN_REDIRECT' => 'You have been successfully logged in.',
'MANAGE' => 'Manage',
'MENU_TOGGLE' => 'Hide or display the side menu',
'MOVE_DOWN' => 'Move down',