From: Raimond Spekking Date: Fri, 29 Jan 2010 15:25:20 +0000 (+0000) Subject: * Add USER_BLOCKED case to UserLogin. X-Git-Tag: 1.31.0-rc.0~38055 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=c99c50c599771cd47b53fd12606434b971c7dad3;p=lhc%2Fweb%2Fwiklou.git * Add USER_BLOCKED case to UserLogin. * Let Lockout extension use this case for a proper error message --- diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index 5e8e3d8524..59d584be77 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -34,6 +34,7 @@ class LoginForm { const ABORTED = 8; const CREATE_BLOCKED = 9; const THROTTLED = 10; + const USER_BLOCKED = 11; var $mName, $mPassword, $mRetype, $mReturnTo, $mCookieCheck, $mPosted; var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword; @@ -622,6 +623,9 @@ class LoginForm { case self::THROTTLED: $this->mainLoginForm( wfMsg( 'login-throttled' ) ); break; + case self::USER_BLOCKED: + $this->mainLoginForm( wfMsg( 'login-userblocked' ) ); + break; default: throw new MWException( "Unhandled case value" ); } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 86b04b1919..5b3e44c088 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1076,6 +1076,7 @@ Check your spelling, or [[Special:UserLogin/signup|create a new account]].', 'nosuchusershort' => 'There is no user by the name "$1". Check your spelling.', 'nouserspecified' => 'You have to specify a username.', +'login-userblocked' => 'This user is blocked. Login not allowed.', 'wrongpassword' => 'Incorrect password entered. Please try again.', 'wrongpasswordempty' => 'Password entered was blank. diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 10d9b45f89..671c94f755 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -434,6 +434,7 @@ $wgMessageStructure = array( 'nosuchuser', 'nosuchusershort', 'nouserspecified', + 'login-userblocked', 'wrongpassword', 'wrongpasswordempty', 'passwordtooshort',