Block password resets from globally blocked IP addresses

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 0258873..9e6203a 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1521,6 +1521,10 @@ $inject_html: Any HTML to inject after the "logged in" message.
 'UserLoginForm': change to manipulate the login form
 $template: SimpleTemplate instance for the form
 
+'UserLoginMailPassword': Block users from emailing passwords
+$name: the username to email the password of.
+&$error: out-param ÐÊthe error message to return.
+
 'UserLogout': before a user logs out
 $user: the user object that is about to be logged out
        

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 250a12d..9a3ab39 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -614,6 +614,13 @@ class LoginForm {
                        $this->mainLoginForm( wfMsg( 'blocked-mailpassword' ) );
                        return;
                }
+               
+               // Check for hooks
+               $error = null;
+               if ( ! wfRunHooks( 'UserLoginMailPassword', array( $this->mName, &$error ) ) ) {
+                       $this->mainLoginForm( $error );
+                       return;
+               }
 
                # Check against the rate limiter
                if( $wgUser->pingLimiter( 'mailpassword' ) ) {