X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/2329f698283944696a7076258cf816545970bb47..46588ee871246a923d972538dbc93b26f4fda932:/wp-login.php
diff --git a/wp-login.php b/wp-login.php
index 5ab6fc67..d52ccb3a 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -25,7 +25,8 @@ if ( force_ssl_admin() && ! is_ssl() ) {
/**
* Output the login page header.
*
- * @param string $title Optional. WordPress Log In Page title to display in
element. Default 'Log In'.
+ * @param string $title Optional. WordPress login Page title to display in the `` element.
+ * Default 'Log In'.
* @param string $message Optional. Message to display in header. Default empty.
* @param WP_Error $wp_error Optional. The error to pass. Default empty.
*/
@@ -263,7 +264,8 @@ function wp_login_viewport_meta() {
/**
* Handles sending password retrieval email to user.
*
- * @uses $wpdb WordPress Database object
+ * @global wpdb $wpdb WordPress database abstraction object.
+ * @global PasswordHash $wp_hasher Portable PHP password hashing framework.
*
* @return bool|WP_Error True: when finish. WP_Error on error
*/
@@ -274,7 +276,7 @@ function retrieve_password() {
if ( empty( $_POST['user_login'] ) ) {
$errors->add('empty_username', __('ERROR: Enter a username or e-mail address.'));
- } else if ( strpos( $_POST['user_login'], '@' ) ) {
+ } elseif ( 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.'));
@@ -331,10 +333,11 @@ function retrieve_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) )
+ if ( ! $allow ) {
+ return new WP_Error( 'no_password_reset', __('Password reset is not allowed for this user') );
+ } elseif ( is_wp_error( $allow ) ) {
return $allow;
+ }
// Generate something random for a password reset key.
$key = wp_generate_password( 20, false );
@@ -383,15 +386,19 @@ function retrieve_password() {
* @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
+ * @since 4.1.0 Added `$user_login` and `$user_data` parameters.
*
- * @param string $message Default mail message.
- * @param string $key The activation key.
+ * @param string $message Default mail message.
+ * @param string $key The activation key.
+ * @param string $user_login The username for the user.
+ * @param WP_User $user_data WP_User object.
*/
- $message = apply_filters( 'retrieve_password_message', $message, $key );
+ $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.') );
@@ -441,7 +448,7 @@ do_action( 'login_init' );
/**
* Fires before a specified login form action.
*
- * The dynamic portion of the hook name, $action, refers to the 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.
*
@@ -477,9 +484,28 @@ case 'postpass' :
case 'logout' :
check_admin_referer('log-out');
+
+ $user = wp_get_current_user();
+
wp_logout();
- $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?loggedout=true';
+ if ( ! empty( $_REQUEST['redirect_to'] ) ) {
+ $redirect_to = $requested_redirect_to = $_REQUEST['redirect_to'];
+ } else {
+ $redirect_to = 'wp-login.php?loggedout=true';
+ $requested_redirect_to = '';
+ }
+
+ /**
+ * Filter the log out redirect URL.
+ *
+ * @since 4.2.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 $user The WP_User object for the user that's logging out.
+ */
+ $redirect_to = apply_filters( 'logout_redirect', $redirect_to, $requested_redirect_to, $user );
wp_safe_redirect( $redirect_to );
exit();
@@ -532,7 +558,7 @@ case 'retrievepassword' :
tags, before the hidden fields.
+ * Fires inside the lostpassword form tags, before the hidden fields.
*
* @since 2.1.0
*/
@@ -629,8 +655,7 @@ case 'rp' :
-
-
+
ERROR: Cookies are blocked due to unexpected output. For help, please see this documentation or try the support forums.' ),
- __( 'http://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) );
+ __( 'https://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) );
} elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
// If cookies are disabled we can't log in even with a valid user+pass
$user = new WP_Error( 'test_cookie', sprintf( __( 'ERROR: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress.' ),
- __( 'http://codex.wordpress.org/Cookies' ) ) );
+ __( 'https://codex.wordpress.org/Cookies' ) ) );
}
}
@@ -864,16 +889,22 @@ default:
if ( isset($_POST['log']) )
$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : '';
$rememberme = ! empty( $_POST['rememberme'] );
+
+ if ( ! empty( $errors->errors ) ) {
+ $aria_describedby_error = ' aria-describedby="login_error"';
+ } else {
+ $aria_describedby_error = '';
+ }
?>