From 7f9024465f3f0752e0958be043af665f13dab148 Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Mon, 30 Sep 2019 15:10:29 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B02311=20-=20Refactor=20Login=20FSM=20for?=
 =?UTF-8?q?=20errors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/logindefault.class.inc.php | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/application/logindefault.class.inc.php b/application/logindefault.class.inc.php
index 7f718bbaf..5227efe14 100644
--- a/application/logindefault.class.inc.php
+++ b/application/logindefault.class.inc.php
@@ -51,21 +51,6 @@ class LoginDefaultBefore extends AbstractLoginFSMExtension
 		}
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}
-
-	protected function OnError(&$iErrorCode)
-	{
-		LoginWebPage::ResetSession();
-		$iOnExit = LoginWebPage::getIOnExit();
-		if ($iOnExit == LoginWebPage::EXIT_RETURN)
-		{
-			return LoginWebPage::LOGIN_FSM_RETURN; // Error, exit FSM
-		}
-		elseif ($iOnExit == LoginWebPage::EXIT_HTTP_401)
-		{
-			LoginWebPage::HTTP401Error(); // Error, exit
-		}
-		return LoginWebPage::LOGIN_FSM_CONTINUE;
-	}
 }
 
 /**
@@ -88,6 +73,16 @@ class LoginDefaultAfter extends AbstractLoginFSMExtension implements iLogoutExte
 	protected function OnError(&$iErrorCode)
 	{
 		self::ResetLoginSession();
+		$iOnExit = LoginWebPage::getIOnExit();
+		if ($iOnExit == LoginWebPage::EXIT_RETURN)
+		{
+			return LoginWebPage::LOGIN_FSM_RETURN; // Error, exit FSM
+		}
+		elseif ($iOnExit == LoginWebPage::EXIT_HTTP_401)
+		{
+			LoginWebPage::HTTP401Error(); // Error, exit
+		}
+		// LoginWebPage::EXIT_PROMPT
 		return LoginWebPage::LOGIN_FSM_CONTINUE;
 	}