From 50631d1b470fbe210ecc6041704cccea97ea7181 Mon Sep 17 00:00:00 2001
From: einhornimmond <dario.rekowski@gmx.de>
Date: Mon, 15 Mar 2021 13:20:01 +0100
Subject: [PATCH] fix bug with disabled users

---
 src/cpp/HTTPInterface/LoginPage.cpp | 23 ++++++++++++-----------
 src/cpsp/.gitignore                 |  3 +++
 src/cpsp/login.cpsp                 |  1 +
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/cpp/HTTPInterface/LoginPage.cpp b/src/cpp/HTTPInterface/LoginPage.cpp
index 887768b58..5c510fe41 100644
--- a/src/cpp/HTTPInterface/LoginPage.cpp
+++ b/src/cpp/HTTPInterface/LoginPage.cpp
@@ -200,6 +200,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 				if(mSession) {
 					getErrors(mSession);
 					sm->releaseSession(mSession);
+					mSession = nullptr;
 				}
 				sm->deleteLoginCookies(request, response);
 				break;
@@ -338,11 +339,11 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 	responseStream << "            </div>";
 	// end include header.cpsp
 	responseStream << "\n";
-#line 229 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+#line 230 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( getErrorsHtml() );
 	responseStream << "\n";
 	responseStream << "<!--<input type=\"hidden\" name=\"lang\" value=\"";
-#line 230 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+#line 231 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( LanguageManager::keyForLanguage(lang) );
 	responseStream << "\">-->\n";
 	responseStream << "<div class=\"center-form-container\">\n";
@@ -376,22 +377,22 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 	responseStream << "\n";
 	responseStream << "    <div class=\"center-form-form\">\n";
 	responseStream << "\t\t<form action=\"";
-#line 234 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+#line 235 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( form_action_url );
 	responseStream << "\" method=\"POST\">\n";
 	responseStream << "\t\t\t<input class=\"form-control\" type=\"text\" name=\"login-email\" placeholder=\"";
-#line 235 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+#line 236 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( langCatalog->gettext("E-Mail") );
 	responseStream << "\" value=\"";
-#line 235 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+#line 236 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( presetEmail );
 	responseStream << "\"/>\n";
 	responseStream << "\t\t\t<input class=\"form-control\" type=\"password\" name=\"login-password\" placeholder=\"";
-#line 236 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+#line 237 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( langCatalog->gettext("Password") );
 	responseStream << "\" />\n";
 	responseStream << "\t\t    <button type=\"submit\" name=\"submit\" class=\"center-form-submit form-button\">";
-#line 237 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+#line 238 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( langCatalog->gettext(" Login ") );
 	responseStream << "</button>\n";
 	responseStream << "\t\t</form>\n";
@@ -399,7 +400,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 	responseStream << "    <div class=\"center-form-bottom\">\n";
 	responseStream << "        <div class=\"signup-link\">\n";
 	responseStream << "\t      <p>";
-#line 242 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+#line 243 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( langCatalog->gettext("You haven't any account yet? Please follow the link to create one.") );
 	responseStream << "</p>\n";
 	responseStream << "\t      <a href=\"";
@@ -407,17 +408,17 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 	responseStream << ( ServerConfig::g_serverPath );
 	responseStream << "/registerDirect\">\n";
 	responseStream << "\t\t\t";
-#line 244 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+#line 245 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( langCatalog->gettext("Create New Account") );
 	responseStream << "\n";
 	responseStream << "\t\t  </a>\n";
 	responseStream << "\t    </div>\n";
 	responseStream << "\t\t<div class=\"reset-pwd-link\">\n";
 	responseStream << "\t\t\t<a href=\"";
-#line 248 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+#line 249 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( getBaseUrl() );
 	responseStream << "/resetPassword\">";
-#line 248 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
+#line 249 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
 	responseStream << ( langCatalog->gettext("Passwort vergessen") );
 	responseStream << "</a>\n";
 	responseStream << "\t\t</div>\n";
diff --git a/src/cpsp/.gitignore b/src/cpsp/.gitignore
index 863ee1751..7d12f04b4 100644
--- a/src/cpsp/.gitignore
+++ b/src/cpsp/.gitignore
@@ -1,2 +1,5 @@
 /compile.sh
 /*.dll
+/.vscode
+/*.exe
+/*.bat
\ No newline at end of file
diff --git a/src/cpsp/login.cpsp b/src/cpsp/login.cpsp
index 9fce06102..c6491e405 100644
--- a/src/cpsp/login.cpsp
+++ b/src/cpsp/login.cpsp
@@ -176,6 +176,7 @@
 				if(mSession) {
 					getErrors(mSession);
 					sm->releaseSession(mSession);
+					mSession = nullptr;
 				}
 				sm->deleteLoginCookies(request, response);
 				break;