diff --git a/phpBB/images/icons/smile/index.htm b/phpBB/images/icons/smile/index.htm new file mode 100644 index 0000000000..ee1f723a7d --- /dev/null +++ b/phpBB/images/icons/smile/index.htm @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/phpBB/login.php b/phpBB/login.php deleted file mode 100644 index 135fb4e317..0000000000 --- a/phpBB/login.php +++ /dev/null @@ -1,105 +0,0 @@ -start(); -$user->setup(); -$auth->acl($user->data); -// End session management - -$redirect = $username = $password = ''; -extract($_GET); -extract($_POST); - -// Do the login/logout/form/whatever -if (isset($login) || isset($logout)) -{ - if (isset($login) && $user->data['user_id'] == ANONYMOUS) - { - $autologin = (!empty($autologin)) ? true : false; - $viewonline = (!empty($viewonline)) ? 0 : 1; - - // 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_')) - { - redirect("index.$phpEx$SID"); - } - - if (($result = $auth->login($username, $password, $autologin, $viewonline)) !== true) - { - // If we get a non-numeric (e.g. string) value we output an error - if (!is_numeric($result)) - { - trigger_error($result, E_USER_ERROR); - } - - // If we get an integer zero then we are inactive, else the username/password is wrong - $message = ($result === 0) ? $user->lang['ACTIVE_ERROR'] : $user->lang['LOGIN_ERROR']; - $message .= '

' . sprintf($user->lang['RETURN_LOGIN'], '', '') . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); - - trigger_error($message); - } - } - else if ($user->data['user_id'] != ANONYMOUS) - { - $user->destroy(); - } - - // Redirect to wherever we're supposed to go ... - $redirect_url = (preg_match('#^redirect=(.*?)$#', $redirect)) ? preg_replace('#^redirect=(.*?)&(.*?)$#', '\1.' . $phpEx . $SID . '&\2', $redirect) : 'index.'.$phpEx . $SID; - redirect($redirect_url); -} - -if ($user->data['user_id'] == ANONYMOUS) -{ - $redirect = (!empty($_SERVER['QUERY_STRING'])) ? preg_replace('#^sid=[a-z0-9]*?&?(redirect=.*?)$#', '\1', $_SERVER['QUERY_STRING']) : ''; - - $template->assign_vars(array( - 'U_SEND_PASSWORD' => "ucp.$phpEx$SID&mode=sendpassword", - 'U_TERMS_USE' => "ucp.$phpEx$SID&mode=terms", - 'U_PRIVACY' => "ucp.$phpEx$SID&mode=privacy", - - 'S_HIDDEN_FIELDS' => '') - ); - - $page_title = $user->lang['LOGIN']; - include($phpbb_root_path . 'includes/page_header.'.$phpEx); - - $template->set_filenames(array( - 'body' => 'login_body.html') - ); - make_jumpbox('viewforum.'.$phpEx, $forum_id); - - include($phpbb_root_path . 'includes/page_tail.'.$phpEx); -} -else -{ - redirect("index.$phpEx$SID"); -} - -?> \ No newline at end of file