Fix limit retry feature

ulsdevteam · Aug 27, 2021 · 89e2199 · 89e2199
1 parent 066d25e
commit 89e2199
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/features/LimitRetry.inc.php b/features/LimitRetry.inc.php
@@ -60,8 +60,12 @@ private function _handleTemplateDisplay() : void {
 			$time = $user->getFailedTime();
 
 			// Discard old bad password attempts
+			// When the memory has expired
 			if ($count && $time < time() - $this->_lockExpiresSeconds) {
-				$badpwFailedLoginsDao->resetCount($user);
+				// And the user is not currently locked
+				if ($user->getCount() < $this->_maxRetries || $user->getFailedTime() <= time() - $this->_lockSeconds) {
+					$badpwFailedLoginsDao->resetCount($user);
+				}
 			}
 
 			// Update the count to represent this failed attempt

diff --git a/handlers/DisabledLogin.inc.php → handlers/DisabledLoginHandler.inc.php b/handlers/DisabledLogin.inc.php → handlers/DisabledLoginHandler.inc.php