diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-06-03 16:33:02 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-06-03 16:33:02 +0000 |
| commit | 65fb840b761cb04d52bd03ef0d5ed20053ae16ba (patch) | |
| tree | fa273e401ee711a6c5250fbb6b3fec617495ac44 /phpBB/adm/index.php | |
| parent | 59e6bc27f1f1f91a5242074d216bc1f2de9fe45c (diff) | |
| download | forums-65fb840b761cb04d52bd03ef0d5ed20053ae16ba.tar forums-65fb840b761cb04d52bd03ef0d5ed20053ae16ba.tar.gz forums-65fb840b761cb04d52bd03ef0d5ed20053ae16ba.tar.bz2 forums-65fb840b761cb04d52bd03ef0d5ed20053ae16ba.tar.xz forums-65fb840b761cb04d52bd03ef0d5ed20053ae16ba.zip | |
merge
git-svn-id: file:///svn/phpbb/trunk@8587 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/index.php')
| -rw-r--r-- | phpBB/adm/index.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index af5511f3b6..819e4a1a8f 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -28,10 +28,14 @@ $user->setup('acp/common'); // End session management // Have they authenticated (again) as an admin for this session? -if (!isset($user->data['session_admin']) || !$user->data['session_admin']) +if ($user->data['user_id'] != ANONYMOUS && (!isset($user->data['session_admin']) || !$user->data['session_admin'])) { login_box('', $user->lang['LOGIN_ADMIN_CONFIRM'], $user->lang['LOGIN_ADMIN_SUCCESS'], true, false); } +else if ($user->data['user_id'] == ANONYMOUS) +{ + login_box(''); +} // Is user any type of admin? No, then stop here, each script needs to // check specific permissions but this is a catchall @@ -108,7 +112,7 @@ function adm_page_header($page_title) $template->assign_vars(array( 'PAGE_TITLE' => $page_title, - 'USERNAME' => $user->data['username'], + 'USERNAME' => ($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : '', 'SID' => $SID, '_SID' => $_SID, @@ -116,9 +120,13 @@ function adm_page_header($page_title) 'ROOT_PATH' => PHPBB_ADMIN_PATH, 'U_LOGOUT' => append_sid('ucp', 'mode=logout'), + 'U_ADM_LOGOUT' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'action=admlogout'), 'U_ADM_INDEX' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT), 'U_INDEX' => append_sid('index'), + 'S_USER_ADMIN' => $user->data['session_admin'], + 'S_USER_LOGGED_IN' => ($user->data['user_id'] != ANONYMOUS && !$user->data['is_bot']), + 'T_IMAGES_PATH' => PHPBB_ROOT_PATH . 'images/', 'T_SMILIES_PATH' => PHPBB_ROOT_PATH . $config['smilies_path'] . '/', 'T_AVATAR_PATH' => PHPBB_ROOT_PATH . $config['avatar_path'] . '/', |