\n";
}
}
- if ( !empty($errors) )
- echo '
' . apply_filters('login_errors', $errors) . "
\n";
- if ( !empty($messages) )
- echo '
' . apply_filters('login_messages', $messages) . "
\n";
+ if ( ! empty( $errors ) ) {
+ /**
+ * Filter the error messages displayed above the login form.
+ *
+ * @since 2.1.0
+ *
+ * @param string $errors Login error message.
+ */
+ echo '
' . apply_filters( 'login_errors', $errors ) . "
\n";
+ }
+ if ( ! empty( $messages ) ) {
+ /**
+ * Filter instructional messages displayed above the login form.
+ *
+ * @since 2.5.0
+ *
+ * @param string $messages Login messages.
+ */
+ echo '
' . apply_filters( 'login_messages', $messages ) . "
\n";
+ }
}
} // End of login_header()
@@ -146,7 +221,13 @@ function login_footer($input_id = '') {
-
+
@@ -167,6 +248,12 @@ addLoadEvent(function(){ var p=new Array(15,30,15,0,-15,-30,-15,0);p=p.concat(p.
+
+ get_error_code() )
return $errors;
@@ -204,24 +296,60 @@ function retrieve_password() {
$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);
-
- $allow = apply_filters('allow_password_reset', true, $user_data->ID);
+ /**
+ * Fires before a new password is retrieved.
+ *
+ * @since 1.5.2
+ * @deprecated 1.5.2 Misspelled. Use 'retrieve_password' hook instead.
+ *
+ * @param string $user_login The user login name.
+ */
+ do_action( 'retreive_password', $user_login );
+ /**
+ * Fires before a new password is retrieved.
+ *
+ * @since 1.5.2
+ *
+ * @param string $user_login The user login name.
+ */
+ do_action( 'retrieve_password', $user_login );
+
+ /**
+ * Filter whether to allow a password to be reset.
+ *
+ * @since 2.7.0
+ *
+ * @param bool true Whether to allow the password to be reset. Default true.
+ * @param int $user_data->ID The ID of the user attempting to reset a password.
+ */
+ $allow = apply_filters( 'allow_password_reset', true, $user_data->ID );
if ( ! $allow )
return new WP_Error('no_password_reset', __('Password reset is not allowed for this user'));
else if ( is_wp_error($allow) )
return $allow;
- $key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login));
- if ( empty($key) ) {
- // Generate something random for a key...
- $key = wp_generate_password(20, false);
- do_action('retrieve_password_key', $user_login, $key);
- // Now insert the new md5 key into the db
- $wpdb->update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login));
+ // Generate something random for a password reset key.
+ $key = wp_generate_password( 20, false );
+
+ /**
+ * Fires when a password reset key is generated.
+ *
+ * @since 2.5.0
+ *
+ * @param string $user_login The username for the user.
+ * @param string $key The generated password reset key.
+ */
+ do_action( 'retrieve_password_key', $user_login, $key );
+
+ // Now insert the key, hashed, into the DB.
+ if ( empty( $wp_hasher ) ) {
+ require_once ABSPATH . 'wp-includes/class-phpass.php';
+ $wp_hasher = new PasswordHash( 8, true );
}
+ $hashed = $wp_hasher->HashPassword( $key );
+ $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user_login ) );
+
$message = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n";
$message .= network_home_url( '/' ) . "\r\n\r\n";
$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
@@ -238,111 +366,30 @@ function retrieve_password() {
$title = sprintf( __('[%s] Password Reset'), $blogname );
- $title = apply_filters('retrieve_password_title', $title);
- $message = apply_filters('retrieve_password_message', $message, $key);
+ /**
+ * Filter the subject of the password reset email.
+ *
+ * @since 2.8.0
+ *
+ * @param string $title Default email title.
+ */
+ $title = apply_filters( 'retrieve_password_title', $title );
+ /**
+ * Filter the message body of the password reset mail.
+ *
+ * @since 2.8.0
+ *
+ * @param string $message Default mail message.
+ * @param string $key The activation key.
+ */
+ $message = apply_filters( 'retrieve_password_message', $message, $key );
if ( $message && !wp_mail($user_email, $title, $message) )
- wp_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;
}
-/**
- * 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
- * @param string $login The user login
- * @return object|WP_Error User's database row on success, error object for invalid keys
- */
-function check_password_reset_key($key, $login) {
- global $wpdb;
-
- $key = preg_replace('/[^a-z0-9]/i', '', $key);
-
- if ( empty( $key ) || !is_string( $key ) )
- return new WP_Error('invalid_key', __('Invalid key'));
-
- if ( empty($login) || !is_string($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'));
-
- return $user;
-}
-
-/**
- * Handles resetting the user's password.
- *
- * @param object $user The user
- * @param string $new_pass New password for the user in plaintext
- */
-function reset_password($user, $new_pass) {
- do_action('password_reset', $user, $new_pass);
-
- wp_set_password($new_pass, $user->ID);
-
- wp_password_change_notification($user);
-}
-
-/**
- * Handles registering a new user.
- *
- * @param string $user_login User's username for logging in
- * @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 ) {
- $errors = new WP_Error();
-
- $sanitized_user_login = sanitize_user( $user_login );
- $user_email = apply_filters( 'user_registration_email', $user_email );
-
- // Check the username
- 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.' ) );
- $user_email = '';
- } elseif ( email_exists( $user_email ) ) {
- $errors->add( 'email_exists', __( '
ERROR: This email is already registered, please choose another one.' ) );
- }
-
- do_action( 'register_post', $sanitized_user_login, $user_email, $errors );
-
- $errors = apply_filters( 'registration_errors', $errors, $sanitized_user_login, $user_email );
-
- if ( $errors->get_error_code() )
- return $errors;
-
- $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;
- }
-
- 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;
-}
-
//
// Main
//
@@ -361,13 +408,13 @@ nocache_headers();
header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset'));
-if ( defined('RELOCATE') ) { // Move flag is set
+if ( defined( 'RELOCATE' ) && 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 = 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']) );
+ $url = dirname( set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
+ if ( $url != get_option( 'siteurl' ) )
+ update_option( 'siteurl', $url );
}
//Set a cookie now to see if they are supported by the browser.
@@ -375,22 +422,44 @@ setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);
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
+/**
+ * Fires when the login form is initialized.
+ *
+ * @since 3.2.0
+ */
do_action( 'login_init' );
+/**
+ * Fires before a specified login form action.
+ *
+ * The dynamic portion of the hook name, $action, refers to the action
+ * that brought the visitor to the login form. Actions include 'postpass',
+ * 'logout', 'lostpassword', etc.
+ *
+ * @since 2.8.0
+ */
do_action( 'login_form_' . $action );
$http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
+$interim_login = isset($_REQUEST['interim-login']);
+
switch ($action) {
case 'postpass' :
- if ( empty( $wp_hasher ) ) {
- require_once( ABSPATH . 'wp-includes/class-phpass.php' );
- // By default, use the portable hash from phpass
- $wp_hasher = new PasswordHash(8, true);
- }
-
- // 10 days
- setcookie( 'wp-postpass_' . COOKIEHASH, $wp_hasher->HashPassword( stripslashes( $_POST['post_password'] ) ), time() + 864000, COOKIEPATH );
+ require_once ABSPATH . 'wp-includes/class-phpass.php';
+ $hasher = new PasswordHash( 8, true );
+
+ /**
+ * Filter the life span of the post password cookie.
+ *
+ * By default, the cookie expires 10 days from creation. To turn this
+ * into a session cookie, return 0.
+ *
+ * @since 3.7.0
+ *
+ * @param int $expires The expiry time, as passed to setcookie().
+ */
+ $expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS );
+ setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH );
wp_safe_redirect( wp_get_referer() );
exit();
@@ -419,31 +488,67 @@ case 'retrievepassword' :
}
}
- 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'] : '' );
+ if ( isset( $_GET['error'] ) ) {
+ if ( 'invalidkey' == $_GET['error'] )
+ $errors->add( 'invalidkey', __( 'Sorry, that key does not appear to be valid.' ) );
+ elseif ( 'expiredkey' == $_GET['error'] )
+ $errors->add( 'expiredkey', __( 'Sorry, that key has expired. Please try again.' ) );
+ }
+
+ $lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+ /**
+ * Filter the URL redirected to after submitting the lostpassword/retrievepassword form.
+ *
+ * @since 3.0.0
+ *
+ * @param string $lostpassword_redirect The redirect destination URL.
+ */
+ $redirect_to = apply_filters( 'lostpassword_redirect', $lostpassword_redirect );
+
+ /**
+ * Fires before the lost password form.
+ *
+ * @since 1.5.2
+ */
+ do_action( 'lost_password' );
- do_action('lost_password');
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']) : '';
+ $user_login = isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : '';
?>
-
- |
-
+%s', esc_url( wp_registration_url() ), __( 'Register' ) );
+ /**
+ * Filter the registration URL below the login form.
+ *
+ * @since 1.5.2
+ *
+ * @param string $registration_url Registration URL.
+ */
+ echo ' | ' . apply_filters( 'register', $registration_url );
+endif;
+?>
get_error_code() === 'expired_key' )
+ wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) );
+ else
+ wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) );
exit;
}
- $errors = '';
+ $errors = new WP_Error();
+
+ if ( isset($_POST['pass1']) && $_POST['pass1'] != $_POST['pass2'] )
+ $errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) );
- if ( isset($_POST['pass1']) && $_POST['pass1'] != $_POST['pass2'] ) {
- $errors = new WP_Error('password_reset_mismatch', __('The passwords do not match.'));
- } elseif ( isset($_POST['pass1']) && !empty($_POST['pass1']) ) {
+ /**
+ * Fires before the password reset procedure is validated.
+ *
+ * @since 3.5.0
+ *
+ * @param object $errors WP Error object.
+ * @param WP_User|WP_Error $user WP_User object if the login and reset key match. WP_Error object otherwise.
+ */
+ do_action( 'validate_password_reset', $errors, $user );
+
+ if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) {
reset_password($user, $_POST['pass1']);
login_header( __( 'Password Reset' ), '
' . __( 'Your password has been reset.' ) . ' ' . __( 'Log in' ) . '
' );
login_footer();
@@ -476,7 +595,7 @@ case 'rp' :
login_header(__('Reset Password'), '
' . __('Enter your new password below.') . '
', $errors );
?>
-
-
- |
-
+%s', esc_url( wp_registration_url() ), __( 'Register' ) );
+ /** This filter is documented in wp-login.php */
+ echo ' | ' . apply_filters( 'register', $registration_url );
+endif;
+?>
' . __('Register For This Site') . '', $errors);
?>
@@ -563,7 +708,6 @@ break;
case 'login' :
default:
$secure_cookie = '';
- $interim_login = isset($_REQUEST['interim-login']);
$customize_login = isset( $_REQUEST['customize-login'] );
if ( $customize_login )
wp_enqueue_script( 'customize-base' );
@@ -596,22 +740,33 @@ default:
if ( !$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) )
$secure_cookie = false;
- $user = wp_signon('', $secure_cookie);
-
- $redirect_to = apply_filters('login_redirect', $redirect_to, isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '', $user);
+ // If cookies are disabled we can't log in even with a valid user+pass
+ if ( isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]) )
+ $user = new WP_Error('test_cookie', __("ERROR: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress."));
+ else
+ $user = wp_signon('', $secure_cookie);
+
+ $requested_redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+ /**
+ * Filter the login redirect URL.
+ *
+ * @since 3.0.0
+ *
+ * @param string $redirect_to The redirect destination URL.
+ * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter.
+ * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.
+ */
+ $redirect_to = apply_filters( 'login_redirect', $redirect_to, $requested_redirect_to, $user );
if ( !is_wp_error($user) && !$reauth ) {
if ( $interim_login ) {
$message = '
' . __('You have logged in successfully.') . '
';
+ $interim_login = 'success';
login_header( '', $message ); ?>
-
-
-
-
-
-
-
+
@@ -637,25 +792,34 @@ default:
if ( !empty($_GET['loggedout']) || $reauth )
$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', __("