diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-06-04 11:40:53 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-06-04 11:40:53 +0000 |
| commit | 80f123acb32eaf4c7a0766ddca916f42f4b01bbe (patch) | |
| tree | 98c48070cd4b00968da094564f17a5fc2bc18a41 /phpBB/adm | |
| parent | d46b1392b7ff3676978125b415389f99a98c2370 (diff) | |
| download | forums-80f123acb32eaf4c7a0766ddca916f42f4b01bbe.tar forums-80f123acb32eaf4c7a0766ddca916f42f4b01bbe.tar.gz forums-80f123acb32eaf4c7a0766ddca916f42f4b01bbe.tar.bz2 forums-80f123acb32eaf4c7a0766ddca916f42f4b01bbe.tar.xz forums-80f123acb32eaf4c7a0766ddca916f42f4b01bbe.zip | |
Too much for a minor; sorry
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8591 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/index.php | 11 | ||||
| -rwxr-xr-x | phpBB/adm/style/acp_login.html | 46 | ||||
| -rw-r--r-- | phpBB/adm/style/overall_header.html | 2 |
3 files changed, 2 insertions, 57 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 00acd1359a..c0fa2fdddb 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -28,14 +28,10 @@ $user->setup('acp/common'); // End session management // Have they authenticated (again) as an admin for this session? -if ($user->data['user_id'] != ANONYMOUS && (!isset($user->data['session_admin']) || !$user->data['session_admin'])) +if (!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 @@ -112,7 +108,7 @@ function adm_page_header($page_title) $template->assign_vars(array( 'PAGE_TITLE' => $page_title, - 'USERNAME' => ($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : '', + 'USERNAME' => $user->data['username'], 'SID' => $SID, '_SID' => $_SID, @@ -124,9 +120,6 @@ function adm_page_header($page_title) 'U_ADM_INDEX' => append_sid("{$phpbb_admin_path}index.$phpEx"), 'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"), - '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']}/", diff --git a/phpBB/adm/style/acp_login.html b/phpBB/adm/style/acp_login.html deleted file mode 100755 index 015f3ec908..0000000000 --- a/phpBB/adm/style/acp_login.html +++ /dev/null @@ -1,46 +0,0 @@ -<!-- INCLUDE overall_header.html --> -<h1>{PAGE_TITLE}</h1> -<p><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></p> - -<!-- IF LOGIN_ERROR --> - <div class="errorbox"> - <h3>{L_WARNING}</h3> - <p>{LOGIN_ERROR}</p> - </div> -<!-- ENDIF --> -<form action="{S_LOGIN_ACTION}" method="post" id="login"> - - <fieldset> - <dl> - <dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt> - <dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd> - </dl> - <dl> - <dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt> - <dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd> - <!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) --> - <!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF --> - <!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF --> - <!-- ENDIF --> - </dl> - - <!-- IF S_CONFIRM_CODE --> - <dl> - <dt><label for="confirm_code">{L_CONFIRM_CODE}:</label><br /><span>{L_CONFIRM_CODE_EXPLAIN}</span></dt> - <dd><input type="hidden" name="confirm_id" value="{CONFIRM_ID}" />{CONFIRM_IMAGE}</dd> - <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="3" class="inputbox narrow" title="{L_CONFIRM_CODE}" /></dd> - </dl> - <!-- ENDIF --> - - <p class="submit-buttons"> - <!-- IF S_DISPLAY_FULL_LOGIN --> - <!-- IF S_AUTOLOGIN_ENABLED --><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label><!-- ENDIF --> - <label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label> - <!-- ENDIF --> - - {S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /> - </p> - </fieldset> -</form> - -<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index adafc0aa6d..5294a101f9 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -186,7 +186,6 @@ function switch_menu() <!-- ENDIF --> <div id="menu"> <p><!-- IF S_USER_LOGGED_IN --> {L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [ <a href="{U_LOGOUT}">{L_LOGOUT}</a> ]<!-- ENDIF --><!-- IF S_USER_ADMIN -->[ <a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a> ]<!-- ENDIF --></p> - <!-- IF S_USER_ADMIN --> <ul> <!-- BEGIN l_block1 --> <!-- IF l_block1.S_SELECTED --> @@ -204,7 +203,6 @@ function switch_menu() <!-- ENDIF --> <!-- END l_block1 --> </ul> - <!-- ENDIF --> </div> <div id="main"> |