From 7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Fri, 4 Apr 2008 16:44:15 +0000
Subject: Merged with WordPress 2.5, unstable, only for testing

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-login.php | 481 ++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 294 insertions(+), 187 deletions(-)

(limited to 'wp-login.php')
diff --git a/wp-login.php b/wp-login.php
index 9eacdb0..4de102a 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -1,42 +1,22 @@
 <?php
 require( dirname(__FILE__) . '/wp-config.php' );
 
-$action = $_REQUEST['action'];
-$errors = array();
-
-if ( isset($_GET['key']) )
-	$action = 'resetpass';
-
-nocache_headers();
-
-header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset'));
-
-if ( defined('RELOCATE') ) { // Move flag is set
-	if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
-		$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
-
-	$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
-	if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') )
-		update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
-}
-
-//Set a cookie now to see if they are supported by the browser.
-setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);
-if ( SITECOOKIEPATH != COOKIEPATH )
-	setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);
-
 // Rather than duplicating this HTML all over the place, we'll stick it in function
-function login_header($title = 'Login', $message = '') {
-	global $errors, $error, $wp_locale, $current_site;
+function login_header($title = 'Login', $message = '', $wp_error = '') {
+	global $error, $current_site;
 
+	if ( empty($wp_error) )
+		$wp_error = new WP_Error();
 	?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
 <head>
 	<title><?php bloginfo('name'); ?> &rsaquo; <?php echo $title; ?></title>
 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
-	<?php wp_admin_css(); ?>
-	<!--[if IE]><style type="text/css">#login h1 a { margin-top: 35px; } #login #login_error { margin-bottom: 10px; }</style><![endif]--><!-- Curse you, IE! -->
+	<?php
+	wp_admin_css( 'css/login' );
+	wp_admin_css( 'css/colors-fresh' );
+	?>
 	<script type="text/javascript">
 		function focusit() {
 			document.getElementById('user_login').focus();
@@ -51,31 +31,195 @@ function login_header($title = 'Login', $message = '') {
 <?php
 	if ( !empty( $message ) ) echo apply_filters('login_message', $message) . "\n";
 
-	// Incase a plugin uses $error rather than the $errors array
+	// Incase a plugin uses $error rather than the $errors object
 	if ( !empty( $error ) ) {
-		$errors['error'] = $error;
+		$wp_error->add('error', $error);
 		unset($error);
 	}
 
-	if ( !empty( $errors ) ) {
-		if ( is_array( $errors ) ) {
-			$newerrors = "\n";
-			foreach ( $errors as $error ) $newerrors .= '	' . $error . "<br />\n";
-			$errors = $newerrors;
+	if ( $wp_error->get_error_code() ) {
+		$errors = '';
+		$messages = '';
+		foreach ( $wp_error->get_error_codes() as $code ) {
+			$severity = $wp_error->get_error_data($code);
+			foreach ( $wp_error->get_error_messages($code) as $error ) {
+				if ( 'message' == $severity )
+					$messages .= '	' . $error . "<br />\n";
+				else
+					$errors .= '	' . $error . "<br />\n";
+			}
 		}
-
-		echo '<div id="login_error">' . apply_filters('login_errors', $errors) . "</div>\n";
-		echo "<p align='center'>".__("<strong>Note:</strong> You must <a style=\"color: #fff;\" href='http://www.google.com/cookies.html'>enable cookies</a> to use this site.")."</p>";
+		if ( !empty($errors) )
+			echo '<div id="login_error">' . apply_filters('login_errors', $errors) . "</div>\n";
+		if ( !empty($messages) )
+			echo '<p class="message">' . apply_filters('login_messages', $messages) . "</p>\n";
 	}
 } // End of login_header()
 
+function retrieve_password() {
+	global $wpdb;
+
+	$errors = new WP_Error();
+
+	if ( empty( $_POST['user_login'] ) && empty( $_POST['user_email'] ) )
+		$errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.'));
+
+	if ( strstr($_POST['user_login'], '@') ) {
+		$user_data = get_user_by_email(trim($_POST['user_login']));
+		if ( empty($user_data) )
+			$errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));
+	} else {
+		$login = trim($_POST['user_login']);
+		$user_data = get_userdatabylogin($login);
+	}
+
+	do_action('lostpassword_post');
+
+	if ( $errors->get_error_code() )
+		return $errors;
+
+	if ( !$user_data ) {
+		$errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.'));
+		return $errors;
+	}
+
+	// redefining user_login ensures we return the right case in the email
+	$user_login = $user_data->user_login;
+	$user_email = $user_data->user_email;
+
+	do_action('retreive_password', $user_login);  // Misspelled and deprecated
+	do_action('retrieve_password', $user_login);
+
+	$key = $wpdb->get_var("SELECT user_activation_key FROM $wpdb->users WHERE user_login = '$user_login'");
+	if ( empty($key) ) {
+		// Generate something random for a key...
+		$key = wp_generate_password();
+		do_action('retrieve_password_key', $user_login, $key);
+		// Now insert the new md5 key into the db
+		$wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'");
+	}
+	$message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n";
+	$message .= get_option('siteurl') . "\r\n\r\n";
+	$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
+	$message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
+	$message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
+
+	if ( !wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message) )
+		die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
+
+	return true;
+}
+
+function reset_password($key) {
+	global $wpdb;
+
+	$key = preg_replace('/[^a-z0-9]/i', '', $key);
+
+	if ( empty( $key ) )
+		return new WP_Error('invalid_key', __('Invalid key'));
+
+	$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_activation_key = '$key'");
+	if ( empty( $user ) )
+		return new WP_Error('invalid_key', __('Invalid key'));
+
+	do_action('password_reset', $user);
+
+	// Generate something random for a password...
+	$new_pass = wp_generate_password();
+	wp_set_password($new_pass, $user->ID);
+	$message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
+	$message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
+	$message .= get_option('siteurl') . "/wp-login.php\r\n";
+
+	if (  !wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message) )
+		die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
+
+	// send a copy of password change notification to the admin
+	// but check to see if it's the admin whose password we're changing, and skip this
+	if ( $user->user_email != get_option('admin_email') ) {
+		$message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
+	}
+
+	return true;
+}
+
+function register_new_user($user_login, $user_email) {
+	$errors = new WP_Error();
+
+	$user_login = sanitize_user( $user_login );
+	$user_email = apply_filters( 'user_registration_email', $user_email );
+
+	// Check the username
+	if ( $user_login == '' )
+		$errors->add('empty_username', __('<strong>ERROR</strong>: Please enter a username.'));
+	elseif ( !validate_username( $user_login ) ) {
+		$errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.'));
+		$user_login = '';
+	} elseif ( username_exists( $user_login ) )
+		$errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.'));
+
+	// Check the e-mail address
+	if ($user_email == '') {
+		$errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.'));
+	} elseif ( !is_email( $user_email ) ) {
+		$errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.'));
+		$user_email = '';
+	} elseif ( email_exists( $user_email ) )
+		$errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'));
+
+	do_action('register_post', $user_login, $user_email, $errors);
+
+	$errors = apply_filters( 'registration_errors', $errors );
+
+	if ( $errors->get_error_code() )
+		return $errors;
+
+	$user_pass = wp_generate_password();
+	$user_id = wp_create_user( $user_login, $user_pass, $user_email );
+	if ( !$user_id ) {
+		$errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email')));
+		return $errors;
+	}
+
+	wp_new_user_notification($user_id, $user_pass);
+
+	return $user_id;
+}
+
+//
+// Main
+//
+
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
+$errors = new WP_Error();
+
+if ( isset($_GET['key']) )
+	$action = 'resetpass';
+
+nocache_headers();
+
+header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset'));
+
+if ( defined('RELOCATE') ) { // Move flag is set
+	if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
+		$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
 
+	$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+	if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') )
+		update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
+}
+
+//Set a cookie now to see if they are supported by the browser.
+setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);
+if ( SITECOOKIEPATH != COOKIEPATH )
+	setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);
+
+$http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
 switch ($action) {
 
 case 'logout' :
 
-	wp_clearcookie();
-	do_action('wp_logout');
+	wp_logout();
 
 	$redirect_to = 'wp-login.php?loggedout=true';
 	if ( isset( $_REQUEST['redirect_to'] ) )
@@ -88,79 +232,41 @@ break;
 
 case 'lostpassword' :
 case 'retrievepassword' :
-	$user_login = '';
-	$user_pass = '';
-
-	if ( $_POST ) {
-		if ( empty( $_POST['user_login'] ) )
-			$errors['user_login'] = __('<strong>ERROR</strong>: The username field is empty.');
-		if ( empty( $_POST['user_email'] ) )
-			$errors['user_email'] = __('<strong>ERROR</strong>: The e-mail field is empty.');
-
-		do_action('lostpassword_post');
-
-		if ( empty( $errors ) ) {
-			$user_data = get_userdatabylogin(trim($_POST['user_login']));
-			// redefining user_login ensures we return the right case in the email
-			$user_login = $user_data->user_login;
-			$user_email = $user_data->user_email;
-
-			if (!$user_email || $user_email != $_POST['user_email']) {
-				$errors['invalidcombo'] = __('<strong>ERROR</strong>: Invalid username / e-mail combination.');
-			} else {
-				do_action('retreive_password', $user_login);  // Misspelled and deprecated
-				do_action('retrieve_password', $user_login);
-
-				// Generate something random for a password... md5'ing current time with a rand salt
-				$key = substr( md5( uniqid( microtime() ) ), 0, 8);
-				// Now insert the new pass md5'd into the db
-				$wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'");
-				$message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n";
-				$message .= get_option('siteurl') . "\r\n\r\n";
-				$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
-				$message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
-				$message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
-
-				if (FALSE == wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message)) {
-					die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
-				} else {
-					wp_redirect('wp-login.php?checkemail=confirm');
-					exit();
-				}
-			}
+	if ( $http_post ) {
+		$errors = retrieve_password();
+		if ( !is_wp_error($errors) ) {
+			wp_redirect('wp-login.php?checkemail=confirm');
+			exit();
 		}
 	}
 
-	if ( 'invalidkey' == $_GET['error'] ) $errors['invalidkey'] = __('Sorry, that key does not appear to be valid.');
+	if ( 'invalidkey' == $_GET['error'] ) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.'));
 
 	do_action('lost_password');
-	login_header(__('Lost Password'), '<p class="message">' . __('Please enter your username and e-mail address. You will receive a new password via e-mail.') . '</p>');
+	login_header(__('Lost Password'), '<p class="message">' . __('Please enter your username or e-mail address. You will receive a new password via e-mail.') . '</p>', $errors);
 ?>
 
 <form name="lostpasswordform" id="lostpasswordform" action="wp-login.php?action=lostpassword" method="post">
 	<p>
-		<label><?php _e('Username:') ?><br />
+		<label><?php _e('Username or E-mail:') ?><br />
 		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo attribute_escape(stripslashes($_POST['user_login'])); ?>" size="20" tabindex="10" /></label>
 	</p>
-	<p>
-		<label><?php _e('E-mail:') ?><br />
-		<input type="text" name="user_email" id="user_email" class="input" value="<?php echo attribute_escape(stripslashes($_POST['user_email'])); ?>" size="25" tabindex="20" /></label>
-	</p>
 <?php do_action('lostpassword_form'); ?>
-	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Get New Password &raquo;'); ?>" tabindex="100" /></p>
+	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Get New Password'); ?>" tabindex="100" /></p>
 </form>
-</div>
 
-<ul>
+<p id="nav">
 <?php if (get_option('users_can_register')) : ?>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-signup.php"><?php _e('Register') ?></a></li>
-	<li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Log in') ?></a> |
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=register"><?php _e('Register') ?></a>
 <?php else : ?>
-	<li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Log in') ?></a>
 <?php endif; ?>
-</ul>
+</p>
+
+</div>
+
+<p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&laquo; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
 
 </body>
 </html>
@@ -169,142 +275,143 @@ break;
 
 case 'resetpass' :
 case 'rp' :
-	$key = preg_replace('/[^a-z0-9]/i', '', $_GET['key']);
-	if ( empty( $key ) ) {
-		wp_redirect('wp-login.php?action=lostpassword&error=invalidkey');
-		exit();
-	}
+	$errors = reset_password($_GET['key']);
 
-	$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_activation_key = '$key'");
-	if ( empty( $user ) ) {
-		wp_redirect('wp-login.php?action=lostpassword&error=invalidkey');
+	if ( ! is_wp_error($errors) ) {
+		wp_redirect('wp-login.php?checkemail=newpass');
 		exit();
 	}
 
-	do_action('password_reset');
+	wp_redirect('wp-login.php?action=lostpassword&error=invalidkey');
+	exit();
 
-	// Generate something random for a password... md5'ing current time with a rand salt
-	$new_pass = substr( md5( uniqid( microtime() ) ), 0, 7);
-	$wpdb->query("UPDATE $wpdb->users SET user_pass = MD5('$new_pass'), user_activation_key = '' WHERE user_login = '$user->user_login'");
-	wp_cache_delete($user->ID, 'users');
-	wp_cache_delete($user->user_login, 'userlogins');
-	$message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
-	$message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
-	$message .= get_option('siteurl') . "/wp-login.php\r\n";
+break;
 
-	if (FALSE == wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message)) {
-		die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
-	} else {
-		wp_redirect('wp-login.php?checkemail=newpass');
+case 'register' :
+	// WPMU doesn't use this
+	wp_redirect( bloginfo('wpurl') . '/wp-signup.php' );
+	exit;
+	if ( !get_option('users_can_register') ) {
+		wp_redirect('wp-login.php?registration=disabled');
 		exit();
 	}
-break;
 
-case 'auth' :
-	$_COOKIE = array(); // Prevent redirect loops caused by corrupted cookies
-
-case 'login' :
-default:
 	$user_login = '';
-	$user_pass = '';
-	$using_cookie = FALSE;
-
-	if ( !isset( $_REQUEST['redirect_to'] ) || is_user_logged_in() )
-		$redirect_to = 'wp-admin/';
-	else
-		$redirect_to = $_REQUEST['redirect_to'];
-
-	if ( $_POST ) {
-		$user_login = $_POST['log'];
-		$user_login = sanitize_user( $user_login );
-		$user_pass  = $_POST['pwd'];
-		$rememberme = $_POST['rememberme'];
-	} else {
-		$cookie_login = wp_get_cookie_login();
-		if ( ! empty($cookie_login) ) {
-			$using_cookie = true;
-			$user_login = $cookie_login['login'];
-			$user_pass = $cookie_login['password'];
+	$user_email = '';
+	if ( $http_post ) {
+		require_once( ABSPATH . WPINC . '/registration.php');
+
+		$user_login = $_POST['user_login'];
+		$user_email = $_POST['user_email'];
+		$errors = register_new_user($user_login, $user_email);
+		if ( !is_wp_error($errors) ) {
+			wp_redirect('wp-login.php?checkemail=registered');
+			exit();
 		}
 	}
 
-	do_action_ref_array('wp_authenticate', array(&$user_login, &$user_pass));
+	login_header(__('Registration Form'), '<p class="message register">' . __('Register For This Site') . '</p>', $errors);
+?>
 
-	// If cookies are disabled we can't log in even with a valid user+pass
-	if ( $_POST && empty($_COOKIE[TEST_COOKIE]) )
-		$errors['test_cookie'] = __('<strong>ERROR</strong>: WordPress requires Cookies but your browser does not support them or they are blocked.');
+<form name="registerform" id="registerform" action="wp-login.php?action=register" method="post">
+	<p>
+		<label><?php _e('Username') ?><br />
+		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo attribute_escape(stripslashes($user_login)); ?>" size="20" tabindex="10" /></label>
+	</p>
+	<p>
+		<label><?php _e('E-mail') ?><br />
+		<input type="text" name="user_email" id="user_email" class="input" value="<?php echo attribute_escape(stripslashes($user_email)); ?>" size="25" tabindex="20" /></label>
+	</p>
+<?php do_action('register_form'); ?>
+	<p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p>
+	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Register'); ?>" tabindex="100" /></p>
+</form>
+
+<p id="nav">
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Log in') ?></a> |
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
+</p>
+
+</div>
+
+<p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&laquo; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
 
-	if ( $user_login && $user_pass && empty( $errors ) ) {
-		$user = new WP_User(0, $user_login);
+</body>
+</html>
+<?php
+break;
 
+case 'login' :
+default:
+	if ( isset( $_REQUEST['redirect_to'] ) )
+		$redirect_to = $_REQUEST['redirect_to'];
+	else
+		$redirect_to = 'wp-admin/';
+
+	$user = wp_signon();
+
+	if ( !is_wp_error($user) ) {
 		// If the user can't edit posts, send them to their profile.
 		if ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' ) )
 			$redirect_to = get_option('siteurl') . '/wp-admin/profile.php';
-
-		if ( wp_login($user_login, $user_pass, $using_cookie) ) {
-			if ( !$using_cookie )
-				wp_setcookie($user_login, $user_pass, false, '', '', $rememberme);
-			do_action('wp_login', $user_login);
-			wp_safe_redirect($redirect_to);
-			exit();
-		} else {
-			if ( $using_cookie )
-				$errors['expiredsession'] = __('Your session has expired.');
-		}
+		wp_safe_redirect($redirect_to);
+		exit();
 	}
 
-	if ( $_POST && empty( $user_login ) )
-		$errors['user_login'] = __('<strong>ERROR</strong>: The username field is empty.');
-	if ( $_POST && empty( $user_pass ) )
-		$errors['user_pass'] = __('<strong>ERROR</strong>: The password field is empty.');
+	$errors = $user;
+	// Clear errors if loggedout is set.
+	if ( !empty($_GET['loggedout']) )
+		$errors = new WP_Error();
+
+	// If cookies are disabled we can't log in even with a valid user+pass
+	if ( isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]) )
+		$errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress."));
 
 	// Some parts of this script use the main login form to display a message
-	if		( TRUE == $_GET['loggedout'] )			$errors['loggedout']		= __('Successfully logged you out.');
-	elseif	( 'disabled' == $_GET['registration'] )	$errors['registerdiabled']	= __('User registration is currently not allowed.');
-	elseif	( 'confirm' == $_GET['checkemail'] )	$errors['confirm']			= __('Check your e-mail for the confirmation link.');
-	elseif	( 'newpass' == $_GET['checkemail'] )	$errors['newpass']			= __('Check your e-mail for your new password.');
-	elseif	( 'registered' == $_GET['checkemail'] )	$errors['registered']		= __('Registration complete. Please check your e-mail.');
-
-	if ( ! is_user_logged_in() )
-		wp_clearcookie(); // Start with a clean slate
-	login_header(__('Login'));
+	if		( isset($_GET['loggedout']) && TRUE == $_GET['loggedout'] )			$errors->add('loggedout', __('You are now logged out.'), 'message');
+	elseif	( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )	$errors->add('registerdiabled', __('User registration is currently not allowed.'));
+	elseif	( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )	$errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message');
+	elseif	( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )	$errors->add('newpass', __('Check your e-mail for your new password.'), 'message');
+	elseif	( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )	$errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message');
+
+	login_header(__('Login'), '', $errors);
 ?>
 
 <form name="loginform" id="loginform" action="http://<?php echo $current_blog->domain . $current_blog->path ?>wp-login.php" method="post">
-<?php if ( !in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
+<?php if ( !isset($_GET['checkemail']) || !in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
 	<p>
-		<label><?php _e('Username:') ?><br />
+		<label><?php _e('Username') ?><br />
 		<input type="text" name="log" id="user_login" class="input" value="<?php echo attribute_escape(stripslashes($user_login)); ?>" size="20" tabindex="10" /></label>
 	</p>
 	<p>
-		<label><?php _e('Password:') ?><br />
+		<label><?php _e('Password') ?><br />
 		<input type="password" name="pwd" id="user_pass" class="input" value="" size="20" tabindex="20" /></label>
 	</p>
 <?php do_action('login_form'); ?>
-	<p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90" /> <?php _e('Remember me'); ?></label></p>
+	<p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90" /> <?php _e('Remember Me'); ?></label></p>
 	<p class="submit">
-		<input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Login'); ?> &raquo;" tabindex="100" />
+		<input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Log In'); ?>" tabindex="100" />
 		<input type="hidden" name="redirect_to" value="<?php echo attribute_escape($redirect_to); ?>" />
+		<input type="hidden" name="testcookie" value="1" />
 	</p>
 <?php else : ?>
 	<p>&nbsp;</p>
 <?php endif; ?>
 </form>
-</div>
 
-<ul>
-<?php if ( in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
-	<li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title', 'display')); ?></a></li>
+<p id="nav">
+<?php if ( isset($_GET['checkemail']) && in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
 <?php elseif (get_option('users_can_register')) : ?>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-signup.php"><?php _e('Register') ?></a></li>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
-	<li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title', 'display')); ?></a></li>
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=register"><?php _e('Register') ?></a> |
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
 <?php else : ?>
-	<li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title', 'display')); ?></a></li>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
 <?php endif; ?>
-</ul>
+</p>
+
+</div>
 
+<p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&laquo; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
 
 </body>
 </html>
-- 
cgit 

