Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-29 07:37:44 +02:00
Code Issues Projects Releases Wiki Activity

Login cleanup.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@1893 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
rboren 2004-11-27 22:54:23 +00:00
parent 39bf85133f
commit 75804fd8ab
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
wp-login.php
View File

@ -86,7 +86,7 @@ case 'lostpassword':
<p><?php _e('Please enter your information here. We will send you a new password.') ?></p> <p><?php _e('Please enter your information here. We will send you a new password.') ?></p>
<?php <?php
if ($error) if ($error)
echo "<div id='loginerror'>$error</div>"; echo "<div id='login_error'>$error</div>";
?> ?>
<form name="lostpass" action="wp-login.php" method="post" id="lostpass"> <form name="lostpass" action="wp-login.php" method="post" id="lostpass">
@ -140,44 +140,46 @@ break;
case 'login' : case 'login' :
default: default:
$user_login = '';
$user_pass = '';
$redirect_to = '';
$using_cookie = false;
if( !empty($_POST) ) { if( !empty($_POST) ) {
$log = $_POST['log']; $user_login = $_POST['log'];
$pwd = $_POST['pwd']; $user_pass = $_POST['pwd'];
$redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_POST['redirect_to']); $redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_POST['redirect_to']);
} else { } elseif ( !empty($_COOKIE) ) {
$log = ''; if (! empty($_COOKIE['wordpressuser_' . COOKIEHASH]))
$pwd = ''; $user_login = $_COOKIE['wordpressuser_' . COOKIEHASH];
$redirect_to = ''; if (! empty($_COOKIE['wordpresspass_' . COOKIEHASH])) {
$user_pass = $_COOKIE['wordpresspass_' . COOKIEHASH];
$using_cookie = true;
}
$redirect_to = 'wp-admin/';
} }
$user = get_userdatabylogin($log); $user = get_userdatabylogin($user_login);
if (0 == $user->user_level) { if (0 == $user->user_level) {
$redirect_to = get_settings('siteurl') . '/wp-admin/profile.php'; $redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
} }
if ($log && $pwd) { if ($user_login && $user_pass) {
if ( wp_login($log, $pwd) ) { if ( wp_login($user_login, $user_pass, $using_cookie) ) {
$user_login = $log; if (! $using_cookie) {
$user_pass = md5(md5($pwd)); // Double hash the password in the cookie. $user_pass = md5(md5($user_pass)); // Double hash the password in the cookie.
setcookie('wordpressuser_'. COOKIEHASH, $user_login, time() + 31536000, COOKIEPATH); setcookie('wordpressuser_'. COOKIEHASH, $user_login, time() + 31536000, COOKIEPATH);
setcookie('wordpresspass_'. COOKIEHASH, $user_pass, time() + 31536000, COOKIEPATH); setcookie('wordpresspass_'. COOKIEHASH, $user_pass, time() + 31536000, COOKIEPATH);
}
if ($is_IIS) if ($is_IIS)
header("Refresh: 0;url=$redirect_to"); header("Refresh: 0;url=$redirect_to");
else else
header("Location: $redirect_to"); header("Location: $redirect_to");
}
} else if ( !empty($_COOKIE['wordpressuser_' . COOKIEHASH]) && !empty($_COOKIE['wordpresspass_' . COOKIEHASH]) ) {
$user_login = $_COOKIE['wordpressuser_' . COOKIEHASH];
$user_pass_md5 = $_COOKIE['wordpresspass_' . COOKIEHASH];
if ( wp_login($user_login, $user_pass_md5, true) ) {
header('Location: wp-admin/');
exit(); exit();
} else { } else {
if ( !empty($_COOKIE['wordpressuser_' . COOKIEHASH]) ) if ($using_cookie)
$error = 'Your session has expired.'; $error = __('Your session has expired.');
} }
} }