WordPress 4.3-scripts

[autoinstalls/wordpress.git] / wp-login.php

diff --git a/wp-login.php b/wp-login.php
index d52ccb3a4ab27d1c7cae6578d56a2c06b2dd30c3..57b2a2ef17ceeff1851ae9ed9c7989dcfdd5deb1 100644 (file)
--- a/wp-login.php
+++ b/wp-login.php
@@ -241,6 +241,9 @@ function login_footer($input_id = '') {
        <?php
 }
 
        <?php
 }
 

+/**
+ * @since 3.0.0
+ */

 function wp_shake_js() {
        if ( wp_is_mobile() )
                return;
 function wp_shake_js() {
        if ( wp_is_mobile() )
                return;


@@ -255,6 +258,9 @@ addLoadEvent(function(){ var p=new Array(15,30,15,0,-15,-30,-15,0);p=p.concat(p.
 <?php
 }
 
 <?php
 }
 

+/**
+ * @since 3.7.0
+ */

 function wp_login_viewport_meta() {
        ?>
        <meta name="viewport" content="width=device-width" />
 function wp_login_viewport_meta() {
        ?>
        <meta name="viewport" content="width=device-width" />


@@ -357,7 +363,7 @@ function retrieve_password() {
                require_once ABSPATH . WPINC . '/class-phpass.php';
                $wp_hasher = new PasswordHash( 8, true );
        }
                require_once ABSPATH . WPINC . '/class-phpass.php';
                $wp_hasher = new PasswordHash( 8, true );
        }

-       $hashed = $wp_hasher->HashPassword( $key );
+       $hashed = time() . ':' . $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";
        $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";


@@ -522,10 +528,11 @@ case 'retrievepassword' :
        }
 
        if ( isset( $_GET['error'] ) ) {
        }
 
        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'] : '';
        }
 
        $lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';


@@ -645,16 +652,20 @@ case 'rp' :
 <form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off">
        <input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" />
 
 <form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off">
        <input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" />
 

-       <p>
-               <label for="pass1"><?php _e('New password') ?><br />
-               <input type="password" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" /></label>
+       <p class="user-pass1-wrap">
+               <label for="pass1"><?php _e('New password') ?></label><br />
+               <div class="wp-pwd">
+                       <span class="password-input-wrapper">
+                               <input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" />
+                       </span>
+                       <div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
+               </div>

        </p>
        </p>

-       <p>
-               <label for="pass2"><?php _e('Confirm new password') ?><br />
-               <input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" /></label>
+       <p class="user-pass2-wrap">
+               <label for="pass2"><?php _e('Confirm new password') ?></label><br />
+               <input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" />

        </p>
 
        </p>
 

-       <div id="pass-strength-result" class="hide-if-no-js"><?php _e('Strength indicator'); ?></div>

        <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
        <br class="clear" />
 
        <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
        <br class="clear" />
 


@@ -748,7 +759,7 @@ case 'register' :
         */
        do_action( 'register_form' );
        ?>
         */
        do_action( 'register_form' );
        ?>

-       <p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p>
+       <p id="reg_passmail"><?php _e( 'Registration confirmation will be e-mailed to you.' ); ?></p>

        <br class="clear" />
        <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
        <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Register'); ?>" /></p>
        <br class="clear" />
        <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
        <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Register'); ?>" /></p>