X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/7f1521bf193b382565eb753043c161f4cb3fcda7..8d3bb1a5dcfdea9857d3c88c3751f09593e34dc8:/wp-login.php diff --git a/wp-login.php b/wp-login.php index d52ccb3a..01c754f0 100644 --- a/wp-login.php +++ b/wp-login.php @@ -45,7 +45,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) { // Shake it! $shake_error_codes = array( 'empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password' ); /** - * Filter the error codes array for shaking the login form. + * Filters the error codes array for shaking the login form. * * @since 3.0.0 * @@ -56,6 +56,8 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) { if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) add_action( 'login_head', 'wp_shake_js', 12 ); + $separator = is_rtl() ? ' › ' : ' ‹ '; + ?> - <?php bloginfo('name'); ?> › <?php echo $title; ?> + <?php echo get_bloginfo( 'name', 'display' ) . $separator . $title; ?> +

-

+

@@ -241,6 +256,9 @@ function login_footer($input_id = '') { @@ -275,9 +296,9 @@ function retrieve_password() { $errors = new WP_Error(); if ( empty( $_POST['user_login'] ) ) { - $errors->add('empty_username', __('ERROR: Enter a username or e-mail address.')); + $errors->add('empty_username', __('ERROR: Enter a username or email address.')); } elseif ( strpos( $_POST['user_login'], '@' ) ) { - $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) ); + $user_data = get_user_by( 'email', trim( wp_unslash( $_POST['user_login'] ) ) ); if ( empty( $user_data ) ) $errors->add('invalid_email', __('ERROR: There is no user registered with that email address.')); } else { @@ -289,78 +310,31 @@ function retrieve_password() { * Fires before errors are returned from a password reset request. * * @since 2.1.0 + * @since 4.4.0 Added the `$errors` parameter. + * + * @param WP_Error $errors A WP_Error object containing any errors generated + * by using invalid credentials. */ - do_action( 'lostpassword_post' ); + do_action( 'lostpassword_post', $errors ); if ( $errors->get_error_code() ) return $errors; if ( !$user_data ) { - $errors->add('invalidcombo', __('ERROR: Invalid username or e-mail.')); + $errors->add('invalidcombo', __('ERROR: Invalid username or email.')); 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; + $key = get_password_reset_key( $user_data ); - /** - * Fires before a new password is retrieved. - * - * @since 1.5.0 - * @deprecated 1.5.1 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.1 - * - * @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') ); - } elseif ( is_wp_error( $allow ) ) { - return $allow; + if ( is_wp_error( $key ) ) { + return $key; } - // 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 . WPINC . '/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 = __('Someone has requested a password 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"; $message .= __('If this was a mistake, just ignore this email and nothing will happen.') . "\r\n\r\n"; @@ -379,16 +353,19 @@ function retrieve_password() { $title = sprintf( __('[%s] Password Reset'), $blogname ); /** - * Filter the subject of the password reset email. + * Filters the subject of the password reset email. * * @since 2.8.0 + * @since 4.4.0 Added the `$user_login` and `$user_data` parameters. * - * @param string $title Default email title. + * @param string $title Default email title. + * @param string $user_login The username for the user. + * @param WP_User $user_data WP_User object. */ - $title = apply_filters( 'retrieve_password_title', $title ); + $title = apply_filters( 'retrieve_password_title', $title, $user_login, $user_data ); /** - * Filter the message body of the password reset mail. + * Filters the message body of the password reset mail. * * @since 2.8.0 * @since 4.1.0 Added `$user_login` and `$user_data` parameters. @@ -401,7 +378,7 @@ function retrieve_password() { $message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data ); if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $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 email could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function.') ); return true; } @@ -434,7 +411,7 @@ if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set } //Set a cookie now to see if they are supported by the browser. -$secure = ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) && 'https' === parse_url( home_url(), PHP_URL_SCHEME ) ); +$secure = ( 'https' === parse_url( wp_login_url(), PHP_URL_SCHEME ) ); setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure ); if ( SITECOOKIEPATH != COOKIEPATH ) setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure ); @@ -462,11 +439,16 @@ $interim_login = isset($_REQUEST['interim-login']); switch ($action) { case 'postpass' : + if ( ! array_key_exists( 'post_password', $_POST ) ) { + wp_safe_redirect( wp_get_referer() ); + exit(); + } + require_once ABSPATH . WPINC . '/class-phpass.php'; $hasher = new PasswordHash( 8, true ); /** - * Filter the life span of the post password cookie. + * Filters 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. @@ -476,7 +458,12 @@ case 'postpass' : * @param int $expires The expiry time, as passed to setcookie(). */ $expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS ); - $secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) ); + $referer = wp_get_referer(); + if ( $referer ) { + $secure = ( 'https' === parse_url( $referer, PHP_URL_SCHEME ) ); + } else { + $secure = false; + } setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure ); wp_safe_redirect( wp_get_referer() ); @@ -497,7 +484,7 @@ case 'logout' : } /** - * Filter the log out redirect URL. + * Filters the log out redirect URL. * * @since 4.2.0 * @@ -522,15 +509,16 @@ case 'retrievepassword' : } 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.' ) ); + if ( 'invalidkey' == $_GET['error'] ) { + $errors->add( 'invalidkey', __( 'Your password reset link appears to be invalid. Please request a new link below.' ) ); + } elseif ( 'expiredkey' == $_GET['error'] ) { + $errors->add( 'expiredkey', __( 'Your password reset link has expired. Please request a new link below.' ) ); + } } $lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : ''; /** - * Filter the URL redirected to after submitting the lostpassword/retrievepassword form. + * Filters the URL redirected to after submitting the lostpassword/retrievepassword form. * * @since 3.0.0 * @@ -553,7 +541,7 @@ case 'retrievepassword' :

-

" method="post" autocomplete="off"> -

- -

-

- +

+

+ +

+ +
+ + + +
+
+
+ +

+
+

-


@@ -691,7 +687,7 @@ break; case 'register' : if ( is_multisite() ) { /** - * Filter the Multisite sign up URL. + * Filters the Multisite sign up URL. * * @since 3.0.0 * @@ -709,8 +705,8 @@ case 'register' : $user_login = ''; $user_email = ''; if ( $http_post ) { - $user_login = $_POST['user_login']; - $user_email = $_POST['user_email']; + $user_login = isset( $_POST['user_login'] ) ? $_POST['user_login'] : ''; + $user_email = isset( $_POST['user_email'] ) ? $_POST['user_email'] : ''; $errors = register_new_user($user_login, $user_email); if ( !is_wp_error($errors) ) { $redirect_to = !empty( $_POST['redirect_to'] ) ? $_POST['redirect_to'] : 'wp-login.php?checkemail=registered'; @@ -721,7 +717,7 @@ case 'register' : $registration_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : ''; /** - * Filter the registration redirect URL. + * Filters the registration redirect URL. * * @since 3.0.0 * @@ -730,25 +726,24 @@ case 'register' : $redirect_to = apply_filters( 'registration_redirect', $registration_redirect ); login_header(__('Registration Form'), '

' . __('Register For This Site') . '

', $errors); ?> - - +

-

-

+


@@ -756,7 +751,7 @@ case 'register' : ID) ) { $secure_cookie = true; force_ssl_admin(true); @@ -792,7 +793,7 @@ default: $reauth = empty($_REQUEST['reauth']) ? false : true; - $user = wp_signon( '', $secure_cookie ); + $user = wp_signon( array(), $secure_cookie ); if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) { if ( headers_sent() ) { @@ -807,7 +808,7 @@ default: $requested_redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : ''; /** - * Filter the login redirect URL. + * Filters the login redirect URL. * * @since 3.0.0 * @@ -840,7 +841,10 @@ default: elseif ( is_multisite() && !$user->has_cap('read') ) $redirect_to = get_dashboard_url( $user->ID ); elseif ( !$user->has_cap('edit_posts') ) - $redirect_to = admin_url('profile.php'); + $redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url(); + + wp_redirect( $redirect_to ); + exit(); } wp_safe_redirect($redirect_to); exit(); @@ -853,7 +857,7 @@ default: if ( $interim_login ) { if ( ! $errors->get_error_code() ) - $errors->add('expired', __('Session expired. Please log in again. You will not move away from this page.'), 'message'); + $errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' ); } else { // Some parts of this script use the main login form to display a message if ( isset($_GET['loggedout']) && true == $_GET['loggedout'] ) @@ -861,17 +865,17 @@ default: elseif ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] ) $errors->add('registerdisabled', __('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'); + $errors->add('confirm', __('Check your email for the confirmation link.'), 'message'); elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] ) - $errors->add('newpass', __('Check your e-mail for your new password.'), 'message'); + $errors->add('newpass', __('Check your email for your new password.'), 'message'); elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) - $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message'); + $errors->add('registered', __('Registration complete. Please check your email.'), 'message'); elseif ( strpos( $redirect_to, 'about.php?updated' ) ) $errors->add('updated', __( 'You have successfully updated WordPress! Please log back in to see what’s new.' ), 'message' ); } /** - * Filter the login page errors. + * Filters the login page errors. * * @since 3.6.0 * @@ -899,7 +903,7 @@ default:

-

@@ -939,7 +943,7 @@ default: echo apply_filters( 'register', $registration_url ) . ' | '; endif; ?> - +