Ticket #9682: 9682.4.diff

Index: wp-login.php
===================================================================
--- wp-login.php        (revision 11136)
+++ wp-login.php        (working copy)
@@ -147,8 +147,13 @@
        $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') . "\r\n";
-
-       if ( !wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message) )
+       
+       $title = sprintf(__('[%s] Password Reset'), get_option('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('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
 
        return true;
@@ -174,16 +179,22 @@
        if ( empty( $user ) )
                return new WP_Error('invalid_key', __('Invalid key'));
 
-       do_action('password_reset', $user);
-
        // Generate something random for a password...
        $new_pass = wp_generate_password();
+       
+       do_action('password_reset', $user, $new_pass);
+
        wp_set_password($new_pass, $user->ID);
        $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";
+       
+       $title = sprintf(__('[%s] Your new password'), get_option('blogname'));
+       
+       $title = apply_filters('password_reset_title', $title);
+       $message = apply_filters('password_reset_message', $message, $new_pass);
 
-       if (  !wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message) )
+       if ( $message && !wp_mail($user->user_email, $title, $message) )
                die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
 
        wp_password_change_notification($user);
@@ -245,12 +256,19 @@
 // Main
 //
 
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login';
 $errors = new WP_Error();
 
 if ( isset($_GET['key']) )
        $action = 'resetpass';
 
+// validate action so as to default to the login screen
+if ( !in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login', '')) && false === has_filter('login_form_' . $action) )
+       $action = 'login';
+
+// allow plugins to override the wp actions
+$action = apply_filters('login_form_action', $action);
+
 nocache_headers();
 
 header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset'));
@@ -403,7 +421,6 @@
 break;
 
 case 'login' :
-default:
        $secure_cookie = '';
 
        // If the user wants ssl but the session is not ssl, force a secure cookie.
@@ -514,5 +531,9 @@
 <?php
 
 break;
+
+// allow plugins to add extra actions if they want
+default:
+do_action('login_form_' . $action);
 } // end action switch
-?>
+?>
\ No newline at end of file