diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-05 17:57:03 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-05 17:57:03 +0000 |
| commit | f3e1495bb5cf5771152ebd818a33b1e2ac6aef98 (patch) | |
| tree | 9871c2c8f5e38e65ac13e9216ebb4a6e9521423c /wp-login.php | |
| parent | e41198006c55cedc142942dbe3e7291653a04722 (diff) | |
| download | wordpress-mu-f3e1495bb5cf5771152ebd818a33b1e2ac6aef98.tar.gz wordpress-mu-f3e1495bb5cf5771152ebd818a33b1e2ac6aef98.tar.xz wordpress-mu-f3e1495bb5cf5771152ebd818a33b1e2ac6aef98.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@791 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-login.php')
| -rw-r--r-- | wp-login.php | 321 |
1 files changed, 176 insertions, 145 deletions
diff --git a/wp-login.php b/wp-login.php index f7d3be4..c70515b 100644 --- a/wp-login.php +++ b/wp-login.php @@ -2,7 +2,7 @@ require( dirname(__FILE__) . '/wp-config.php' ); $action = $_REQUEST['action']; -$error = ''; +$errors = array(); if ( isset($_GET['key']) ) $action = 'resetpass'; @@ -20,16 +20,62 @@ if ( defined('RELOCATE') ) { // Move flag is set update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) ); } -switch($action) { -case 'logout': +// Rather than duplicating this HTML all over the place, we'll stick it in function +function login_header($title = 'Login', $message = '') { + global $errors, $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"> +<head> + <title><?php bloginfo('name'); ?> › <?php echo $title; ?></title> + <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> + <link rel="stylesheet" href="<?php bloginfo('wpurl'); ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" /> + <!--[if IE]><style type="text/css">#login h1 a { margin-top: 35px; } #login ul { padding-bottom: 65px; }</style><![endif]--><!-- Curse you, IE! --> + <script type="text/javascript"> + function focusit() { + document.getElementById('user_login').focus(); + } + window.onload = focusit; + </script> +<?php do_action('login_head'); ?> +</head> +<body> + +<div id="login"> +<h1><a href="<?php echo apply_filters('login_headerurl', 'http://' . $current_site->domain . $current_site->path ); ?>" title="<?php echo apply_filters('login_headertitle', $current_site->site_name ); ?>"><span class="hide"><?php bloginfo('name'); ?></span></a></h1> +<?php + if ( !empty( $message ) ) echo apply_filters('login_message', $message) . "\n"; + + // Incase a plugin uses $error rather than the $errors array + if ( !empty( $error ) ) { + $errors['error'] = $error; + unset($error); + } + + if ( !empty( $errors ) ) { + if ( is_array( $errors ) ) { + $newerrors = "\n"; + foreach ( $errors as $error ) $newerrors .= ' ' . $error . "<br />\n"; + $errors = $newerrors; + } + + 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>"; + } +} // End of login_header() + + +switch ($action) { + +case 'logout' : wp_clearcookie(); do_action('wp_logout'); - nocache_headers(); - $redirect_to = 'wp-login.php'; - if ( isset($_REQUEST['redirect_to']) ) + $redirect_to = 'wp-login.php?loggedout=true'; + if ( isset( $_REQUEST['redirect_to'] ) ) $redirect_to = $_REQUEST['redirect_to']; wp_redirect($redirect_to); @@ -37,53 +83,78 @@ case 'logout': break; -case 'lostpassword': -do_action('lost_password'); -?> -<!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"> -<head> - <title>WordPress » <?php _e('Lost Password') ?></title> - <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> - <link rel="stylesheet" href="<?php echo get_option('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" /> - <script type="text/javascript"> - function focusit() { - // focus on first input field - document.getElementById('user_login').focus(); - } - window.onload = focusit; - </script> - <style type="text/css"> - #user_login, #email, #submit { - font-size: 1.7em; +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(); + } + } + } } - </style> -</head> -<body> -<div id="login"> -<h1><a href="http://<?php echo $current_site->domain . $current_site->path ?>"><?php echo $current_site->site_name ?></a></h1> -<p><?php _e('Please enter your information here. We will send you a new password.') ?></p> -<?php -if ($error) - echo "<div id='login_error'>$error</div>"; + + if ( 'invalidkey' == $_GET['error'] ) $errors['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 recieve a new password via e-mail.') . '</p>'); ?> -<form name="lostpass" action="wp-login.php" method="post" id="lostpass"> -<p> -<input type="hidden" name="action" value="retrievepassword" /> -<label><?php _e('Username:') ?><br /> -<input type="text" name="user_login" id="user_login" value="" size="20" tabindex="1" /></label></p> -<p><label><?php _e('E-mail:') ?><br /> -<input type="text" name="email" id="email" value="" size="25" tabindex="2" /></label><br /> -</p> -<p class="submit"><input type="submit" name="submit" id="submit" value="<?php _e('Retrieve Password »'); ?>" tabindex="3" /></p> +<form name="lostpasswordform" id="lostpasswordform" action="wp-login.php?action=lostpassword" method="post"> + <p> + <label><?php _e('Username:') ?><br /> + <input type="text" name="user_login" id="user_login" class="input" value="<?php echo wp_specialchars(stripslashes($_POST['user_login']), 1); ?>" 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 wp_specialchars(stripslashes($_POST['user_email']), 1); ?>" size="25" tabindex="20" /></label> + </p> +<?php do_action('lostpassword_form'); ?> + <p class="submit"><input type="submit" name="submit" id="submit" value="<?php _e('Get New Password »'); ?>" tabindex="100" /></p> </form> <ul> - <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">« <?php _e('Back to blog') ?></a></li> <?php if (get_option('users_can_register')) : ?> - <li><a href="<?php bloginfo('wpurl'); ?>/wp-signup.php"><?php _e('Register') ?></a></li> -<?php endif; ?> <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li> + <li><a href="<?php bloginfo('wpurl'); ?>/signup/"><?php _e('Register') ?></a></li> + <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>" class="fullwidth">« <?php _e('Back to blog') ?></a></li> +<?php else : ?> + <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">« <?php _e('Back to blog') ?></a></li> + <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li> +<?php endif; ?> </ul> </div> </body> @@ -91,93 +162,57 @@ if ($error) <?php break; -case 'retrievepassword': - $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['email']) - wp_die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or e-mail address? <a href="%s">Try again</a>.'), 'wp-login.php?action=lostpassword')); - -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"; - - $m = wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message); - - if ($m == false) { - echo '<p>' . __('The e-mail could not be sent.') . "<br />\n"; - echo __('Possible reason: your host may have disabled the mail() function...') . "</p>"; - die(); - } else { - echo '<p>' . sprintf(__("The e-mail was sent successfully to %s's e-mail address."), $user_login) . '<br />'; - echo "<a href='wp-login.php' title='" . __('Check your e-mail first, of course') . "'>" . __('Click here to login!') . '</a></p>'; - die(); - } - -break; - case 'resetpass' : case 'rp' : - // Generate something random for a password... md5'ing current time with a rand salt $key = preg_replace('/a-z0-9/i', '', $_GET['key']); - if ( empty($key) ) - wp_die( __('Sorry, that key does not appear to be valid.') ); + if ( empty( $key ) ) { + wp_redirect('wp-login.php?action=lostpassword&error=invalidkey'); + exit(); + } + $user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_activation_key = '$key'"); - if ( !$user ) - wp_die( __('Sorry, that key does not appear to be valid.') ); + if ( empty( $user ) ) { + wp_redirect('wp-login.php?action=lostpassword&error=invalidkey'); + exit(); + } do_action('password_reset'); + // 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'"); + $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"; - $m = wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message); - - if ($m == false) { - echo '<p>' . __('The e-mail could not be sent.') . "<br />\n"; - echo __('Possible reason: your host may have disabled the mail() function...') . '</p>'; - die(); + 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 { - echo '<p>' . sprintf(__('Your new password is in the mail.'), $user_login) . '<br />'; - echo "<a href='wp-login.php' title='" . __('Check your e-mail first, of course') . "'>" . __('Click here to login!') . '</a></p>'; - // send a copy of password change notification to the admin - $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n"; - wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message); - die(); + wp_redirect('wp-login.php?checkemail=newpass'); + exit(); } break; +case 'auth' : + $_COOKIE = array(); // Prevent redirect loops caused by corrupted cookies + case 'login' : default: - $user_login = ''; $user_pass = ''; - $using_cookie = false; + $using_cookie = FALSE; + if ( !isset( $_REQUEST['redirect_to'] ) ) $redirect_to = 'wp-admin/'; else $redirect_to = $_REQUEST['redirect_to']; - if( $_POST ) { - $user_login = $_POST['log']; + if ( $_POST ) { + $user_login = $_POST['user_login']; $user_login = sanitize_user( $user_login ); - $user_pass = $_POST['pwd']; + $user_pass = $_POST['user_pass']; $rememberme = $_POST['rememberme']; } else { $cookie_login = wp_get_cookie_login(); @@ -190,7 +225,7 @@ default: do_action_ref_array('wp_authenticate', array(&$user_login, &$user_pass)); - if ( $user_login && $user_pass ) { + if ( $user_login && $user_pass && empty( $errors ) ) { $user = new WP_User(0, $user_login); // If the user can't edit posts, send them to their profile. @@ -202,59 +237,55 @@ default: wp_setcookie($user_login, $user_pass, false, '', '', $rememberme); do_action('wp_login', $user_login); wp_redirect($redirect_to); - exit; + exit(); } else { if ( $using_cookie ) - $error = __('Your session has expired.'); + $errors['expiredsession'] = __('Your session has expired.'); } - } else if ( $user_login || $user_pass ) { - $error = __('<strong>Error</strong>: The password field is empty.'); } + + 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.'); + + // 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 -?> -<!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"> -<head> - <title>WordPress › <?php _e('Login') ?></title> - <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> - <link rel="stylesheet" href="<?php bloginfo('wpurl'); ?>/wp-admin/wp-admin.css" type="text/css" /> - <script type="text/javascript"> - function focusit() { - document.getElementById('log').focus(); - } - window.onload = focusit; - </script> -</head> -<body> - -<div id="login"> -<h1><a href="http://<?php echo $current_site->domain . $current_site->path ?>"><?php echo $current_site->site_name ?></a></h1> -<?php -if ( $error ) { - echo "<div id='login_error'>$error</div>"; - echo '<p align="center">'.__('<strong>Note:</strong> You must <a href="http://www.google.com/cookies.html">enable cookies</a> to use WordPress.').'</p>'; -} + login_header(__('Login')); ?> <form name="loginform" id="loginform" action="wp-login.php" method="post"> -<p><label><?php _e('Username:') ?><br /><input type="text" name="log" id="log" value="<?php echo wp_specialchars(stripslashes($user_login), 1); ?>" size="20" tabindex="1" /></label></p> -<p><label><?php _e('Password:') ?><br /> <input type="password" name="pwd" id="pwd" value="" size="20" tabindex="2" /></label></p> -<p> - <label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" /> - <?php _e('Remember me'); ?></label></p> -<p class="submit"> - <input type="submit" name="submit" id="submit" value="<?php _e('Login'); ?> »" tabindex="4" /> - <input type="hidden" name="redirect_to" value="<?php echo wp_specialchars($redirect_to); ?>" /> -</p> + <p> + <label><?php _e('Username:') ?><br /> + <input type="text" name="user_login" id="user_login" class="input" value="<?php echo wp_specialchars(stripslashes($user_login), 1); ?>" size="20" tabindex="10" /></label> + </p> + <p> + <label><?php _e('Password:') ?><br /> + <input type="password" name="user_pass" 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="submit"> + <input type="submit" name="submit" id="submit" value="<?php _e('Login'); ?> »" tabindex="100" /> + <input type="hidden" name="redirect_to" value="<?php echo wp_specialchars($redirect_to); ?>" /> + </p> </form> <ul> - <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">« <?php _e('Back to blog') ?></a></li> <?php if (get_option('users_can_register')) : ?> - <li><a href="<?php bloginfo('wpurl'); ?>/wp-signup.php"><?php _e('Register') ?></a></li> -<?php endif; ?> + <li><a href="<?php bloginfo('wpurl'); ?>/signup/"><?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('home'); ?>/" title="<?php _e('Are you lost?') ?>" class="fullwidth">« <?php _e('Back to blog') ?></a></li> +<?php else : ?> + <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">« <?php _e('Back to blog') ?></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> +<?php endif; ?> </ul> </div> |