+
+
+
-add('error', $error);
unset($error);
@@ -105,6 +113,45 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') {
}
} // End of login_header()
+/**
+ * Outputs the footer for the login page.
+ *
+ * @param string $input_id Which input to auto-focus
+ */
+function login_footer($input_id = '') {
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+add('empty_username', __('
ERROR: Enter a username or e-mail address.'));
-
- if ( strpos($_POST['user_login'], '@') ) {
- $user_data = get_user_by_email(trim($_POST['user_login']));
- if ( empty($user_data) )
+ } else if ( strpos( $_POST['user_login'], '@' ) ) {
+ $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
+ if ( empty( $user_data ) )
$errors->add('invalid_email', __('
ERROR: There is no user registered with that email address.'));
} else {
$login = trim($_POST['user_login']);
- $user_data = get_userdatabylogin($login);
+ $user_data = get_user_by('login', $login);
}
do_action('lostpassword_post');
@@ -161,36 +207,42 @@ function retrieve_password() {
// Now insert the new md5 key into the db
$wpdb->update($wpdb->users, array('user_activation_key' => $key), array('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 = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n";
+ $message .= network_site_url() . "\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 .= site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n";
+ $message .= __('If this was a mistake, just ignore this email and nothing will happen.') . "\r\n\r\n";
+ $message .= __('To reset your password, visit the following address:') . "\r\n\r\n";
+ $message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n";
- // The blogname option is escaped with esc_html on the way into the database in sanitize_option
- // we want to reverse this for the plain text arena of emails.
- $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+ if ( is_multisite() )
+ $blogname = $GLOBALS['current_site']->site_name;
+ else
+ // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+ // we want to reverse this for the plain text arena of emails.
+ $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
- $title = sprintf(__('[%s] Password Reset'), $blogname);
+ $title = sprintf( __('[%s] Password Reset'), $blogname );
$title = apply_filters('retrieve_password_title', $title);
$message = apply_filters('retrieve_password_message', $message, $key);
if ( $message && !wp_mail($user_email, $title, $message) )
- die('
' . __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function...') . '
');
+ wp_die( __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function...') );
return true;
}
/**
- * Handles resetting the user's password.
+ * Retrieves a user row based on password reset key and login
*
* @uses $wpdb WordPress Database object
*
* @param string $key Hash to validate sending user's password
- * @return bool|WP_Error
+ * @param string $login The user login
+ *
+ * @return object|WP_Error
*/
-function reset_password($key, $login) {
+function check_password_reset_key($key, $login) {
global $wpdb;
$key = preg_replace('/[^a-z0-9]/i', '', $key);
@@ -202,35 +254,26 @@ function reset_password($key, $login) {
return new WP_Error('invalid_key', __('Invalid key'));
$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login));
+
if ( empty( $user ) )
return new WP_Error('invalid_key', __('Invalid key'));
- // Generate something random for a password...
- $new_pass = wp_generate_password();
+ return $user;
+}
+/**
+ * Handles resetting the user's password.
+ *
+ * @uses $wpdb WordPress Database object
+ *
+ * @param string $key Hash to validate sending user's password
+ */
+function reset_password($user, $new_pass) {
do_action('password_reset', $user, $new_pass);
wp_set_password($new_pass, $user->ID);
- update_usermeta($user->ID, 'default_password_nag', true); //Set up the Password change nag.
- $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
- $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
- $message .= site_url('wp-login.php', 'login') . "\r\n";
-
- // The blogname option is escaped with esc_html on the way into the database in sanitize_option
- // we want to reverse this for the plain text arena of emails.
- $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-
- $title = sprintf(__('[%s] Your new password'), $blogname);
-
- $title = apply_filters('password_reset_title', $title);
- $message = apply_filters('password_reset_message', $message, $new_pass);
-
- if ( $message && !wp_mail($user->user_email, $title, $message) )
- die('
' . __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function...') . '
');
wp_password_change_notification($user);
-
- return true;
}
/**
@@ -240,45 +283,49 @@ function reset_password($key, $login) {
* @param string $user_email User's email address to send password and add
* @return int|WP_Error Either user's ID or error on failure.
*/
-function register_new_user($user_login, $user_email) {
+function register_new_user( $user_login, $user_email ) {
$errors = new WP_Error();
- $user_login = sanitize_user( $user_login );
+ $sanitized_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', __('
ERROR: Please enter a username.'));
- elseif ( !validate_username( $user_login ) ) {
- $errors->add('invalid_username', __('
ERROR: This username is invalid. Please enter a valid username.'));
- $user_login = '';
- } elseif ( username_exists( $user_login ) )
- $errors->add('username_exists', __('
ERROR: This username is already registered, please choose another one.'));
+ if ( $sanitized_user_login == '' ) {
+ $errors->add( 'empty_username', __( '
ERROR: Please enter a username.' ) );
+ } elseif ( ! validate_username( $user_login ) ) {
+ $errors->add( 'invalid_username', __( '
ERROR: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
+ $sanitized_user_login = '';
+ } elseif ( username_exists( $sanitized_user_login ) ) {
+ $errors->add( 'username_exists', __( '
ERROR: This username is already registered, please choose another one.' ) );
+ }
// Check the e-mail address
- if ($user_email == '') {
- $errors->add('empty_email', __('
ERROR: Please type your e-mail address.'));
- } elseif ( !is_email( $user_email ) ) {
- $errors->add('invalid_email', __('
ERROR: The email address isn’t correct.'));
+ if ( $user_email == '' ) {
+ $errors->add( 'empty_email', __( '
ERROR: Please type your e-mail address.' ) );
+ } elseif ( ! is_email( $user_email ) ) {
+ $errors->add( 'invalid_email', __( '
ERROR: The email address isn’t correct.' ) );
$user_email = '';
- } elseif ( email_exists( $user_email ) )
- $errors->add('email_exists', __('
ERROR: This email is already registered, please choose another one.'));
+ } elseif ( email_exists( $user_email ) ) {
+ $errors->add( 'email_exists', __( '
ERROR: This email is already registered, please choose another one.' ) );
+ }
- do_action('register_post', $user_login, $user_email, $errors);
+ do_action( 'register_post', $sanitized_user_login, $user_email, $errors );
- $errors = apply_filters( 'registration_errors', $errors, $user_login, $user_email );
+ $errors = apply_filters( 'registration_errors', $errors, $sanitized_user_login, $user_email );
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(__('
ERROR: Couldn’t register you... please contact the
webmaster !'), get_option('admin_email')));
+ $user_pass = wp_generate_password( 12, false);
+ $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
+ if ( ! $user_id ) {
+ $errors->add( 'registerfail', sprintf( __( '
ERROR: Couldn’t register you... please contact the
webmaster !' ), get_option( 'admin_email' ) ) );
return $errors;
}
- wp_new_user_notification($user_id, $user_pass);
+ update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.
+
+ wp_new_user_notification( $user_id, $user_pass );
return $user_id;
}
@@ -305,7 +352,7 @@ 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://';
+ $schema = is_ssl() ? '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']) );
}
@@ -316,7 +363,8 @@ if ( SITECOOKIEPATH != COOKIEPATH )
setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);
// allow plugins to override the default actions, and to add extra actions if they want
-do_action('login_form_' . $action);
+do_action( 'login_init' );
+do_action( 'login_form_' . $action );
$http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
switch ($action) {
@@ -325,131 +373,163 @@ case 'logout' :
check_admin_referer('log-out');
wp_logout();
- $redirect_to = 'wp-login.php?loggedout=true';
- if ( isset( $_REQUEST['redirect_to'] ) )
- $redirect_to = $_REQUEST['redirect_to'];
-
- wp_safe_redirect($redirect_to);
+ $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?loggedout=true';
+ wp_safe_redirect( $redirect_to );
exit();
break;
case 'lostpassword' :
case 'retrievepassword' :
+
if ( $http_post ) {
$errors = retrieve_password();
if ( !is_wp_error($errors) ) {
- wp_redirect('wp-login.php?checkemail=confirm');
+ $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?checkemail=confirm';
+ wp_safe_redirect( $redirect_to );
exit();
}
}
if ( isset($_GET['error']) && 'invalidkey' == $_GET['error'] ) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.'));
+ $redirect_to = apply_filters( 'lostpassword_redirect', !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '' );
do_action('lost_password');
- login_header(__('Lost Password'), '
' . __('Please enter your username or e-mail address. You will receive a new password via e-mail.') . '
', $errors);
+ login_header(__('Lost Password'), '
' . __('Please enter your username or email address. You will receive a link to create a new password via email.') . '
', $errors);
$user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : '';
?>
-
-
- |
-
-
-
+
+
+ |
-