X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiLogin.php;h=133f0ce55626599431be3f8d9b718afb6e921361;hb=4691389fa46f79cbeaf2daffda407cf7daa66fd4;hp=0248f25ef685ef6f7be60efb8ec4973fc73d7d86;hpb=b37772a99128afe1699a60718ebe2a6f8469aa8f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index 0248f25ef6..133f0ce556 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -130,9 +130,10 @@ class ApiLogin extends ApiBase {
 				$session = $status->getValue();
 				$authRes = 'Success';
 				$loginType = 'BotPassword';
-			} elseif ( !$botLoginData[2] ||
+			} elseif (
 				$status->hasMessage( 'login-throttled' ) ||
-				$status->hasMessage( 'botpasswords-needs-reset' )
+				$status->hasMessage( 'botpasswords-needs-reset' ) ||
+				$status->hasMessage( 'botpasswords-locked' )
 			) {
 				$authRes = 'Failed';
 				$message = $status->getMessage();
@@ -140,6 +141,7 @@ class ApiLogin extends ApiBase {
 					'BotPassword login failed: ' . $status->getWikiText( false, false, 'en' )
 				);
 			}
+			// For other errors, let's see if it's a valid non-bot login
 		}
 
 		if ( $authRes === false ) {
@@ -195,7 +197,7 @@ class ApiLogin extends ApiBase {
 				$injected_html = '';
 				Hooks::run( 'UserLoginComplete', [ &$user, &$injected_html, true ] );
 
-				$result['lguserid'] = intval( $user->getId() );
+				$result['lguserid'] = (int)$user->getId();
 				$result['lgusername'] = $user->getName();
 				break;
 
@@ -219,15 +221,15 @@ class ApiLogin extends ApiBase {
 				);
 				break;
 
+			// @codeCoverageIgnoreStart
+			// Unreachable
 			default:
 				ApiBase::dieDebug( __METHOD__, "Unhandled case value: {$authRes}" );
+			// @codeCoverageIgnoreEnd
 		}
 
 		$this->getResult()->addValue( null, 'login', $result );
 
-		if ( $loginType === 'LoginForm' && isset( LoginForm::$statusCodes[$authRes] ) ) {
-			$authRes = LoginForm::$statusCodes[$authRes];
-		}
 		LoggerFactory::getInstance( 'authevents' )->info( 'Login attempt', [
 			'event' => 'login',
 			'successful' => $authRes === 'Success',