diff --git a/src/cpp/HTTPInterface/LoginPage.cpp b/src/cpp/HTTPInterface/LoginPage.cpp index e0b586aea..6db0da706 100644 --- a/src/cpp/HTTPInterface/LoginPage.cpp +++ b/src/cpp/HTTPInterface/LoginPage.cpp @@ -5,7 +5,7 @@ #include "Poco/DeflatingStream.h" -#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" +#line 7 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\login.cpsp" #include "../gettext.h" @@ -16,7 +16,7 @@ #include "../SingletonManager/LanguageManager.h" #include "../SingletonManager/ErrorManager.h" -#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" +#line 1 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\header.cpsp" #include "../ServerConfig.h" @@ -35,7 +35,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: if (_compressResponse) response.set("Content-Encoding", "gzip"); Poco::Net::HTMLForm form(request, request.stream()); -#line 18 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" +#line 18 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\login.cpsp" const char* pageName = "Login"; auto sm = SessionManager::getInstance(); @@ -114,7 +114,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: auto uri_start = request.serverParams().getServerName(); auto lastExternReferer = mSession->getLastReferer(); - //printf("userState: %d\n", userState); + printf("userState: %d\n", userState); switch(userState) { case USER_EMPTY: @@ -177,7 +177,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: sm->deleteLoginCookies(request, response); } -#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" +#line 3 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\header.cpsp" bool withMaterialIcons = false; std::ostream& _responseStream = response.send(); @@ -192,20 +192,20 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "\n"; responseStream << "\n"; responseStream << "Gradido Login Server: "; -#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" +#line 11 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\header.cpsp" responseStream << ( pageName ); responseStream << "\n"; responseStream << "\n"; -#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" +#line 13 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\header.cpsp" if(withMaterialIcons) { responseStream << "\n"; responseStream << "\n"; -#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" +#line 15 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\header.cpsp" } responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; @@ -213,20 +213,20 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "
\n"; responseStream << "
\n"; responseStream << " \n"; responseStream << " \n"; responseStream << " \n"; responseStream << " \n"; responseStream << " \"logo\"\n"; responseStream << " \n"; @@ -234,11 +234,11 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "
"; // end include header.cpsp responseStream << "\n"; -#line 160 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" +#line 160 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\login.cpsp" responseStream << ( getErrorsHtml() ); responseStream << "\n"; responseStream << "\n"; responseStream << "
\n"; @@ -247,22 +247,22 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "
\n"; responseStream << "
\n"; responseStream << "\t\n"; responseStream << "\t\n"; @@ -272,22 +272,22 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "\n"; responseStream << "
\n"; responseStream << "\t\t\n"; responseStream << "\t\t\tgettext("E-Mail") ); responseStream << "\" value=\""; -#line 166 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" +#line 166 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\login.cpsp" responseStream << ( presetEmail ); responseStream << "\"/>\n"; responseStream << "\t\t\tgettext("Password") ); responseStream << "\" />\n"; responseStream << "\t\t \n"; responseStream << "\t\t\n"; @@ -295,25 +295,25 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "
\n"; responseStream << "
\n"; responseStream << "\t

"; -#line 173 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" +#line 173 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\login.cpsp" responseStream << ( langCatalog->gettext("You haven't any account yet? Please follow the link to create one.") ); responseStream << "

\n"; responseStream << "\t \n"; responseStream << "\t\t\t"; -#line 175 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" +#line 175 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\login.cpsp" responseStream << ( langCatalog->gettext("Create New Account") ); responseStream << "\n"; responseStream << "\t\t \n"; responseStream << "\t
\n"; responseStream << "\t\t
\n"; responseStream << "\t\t\t"; -#line 179 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" +#line 179 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\login.cpsp" responseStream << ( langCatalog->gettext("Passwort vergessen") ); responseStream << "\n"; responseStream << "\t\t
\n"; @@ -326,14 +326,14 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "
\n"; responseStream << "
\n"; responseStream << " "; -#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp" +#line 6 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\footer.cpsp" responseStream << ( mTimeProfiler.string() ); responseStream << "\n"; responseStream << "
\n"; responseStream << "
\n"; responseStream << "

Login Server in Entwicklung

\n"; responseStream << "

Alpha "; -#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp" +#line 10 "F:\\Gradido\\gradido_login_server_production\\src\\cpsp\\footer.cpsp" responseStream << ( ServerConfig::g_versionString ); responseStream << "

\n"; responseStream << "
\n"; diff --git a/src/cpp/model/Session.cpp b/src/cpp/model/Session.cpp index 568d4c6e6..3a2eabab7 100644 --- a/src/cpp/model/Session.cpp +++ b/src/cpp/model/Session.cpp @@ -788,7 +788,7 @@ UserStates Session::loadUser(const std::string& email, const std::string& passwo } //Profiler usedTime; lock(functionName); - if (mSessionUser && mSessionUser->getEmail() != email) { + if (!mSessionUser.isNull() && mSessionUser->getEmail() != email) { mSessionUser.assign(nullptr); mNewUser.assign(nullptr); } @@ -941,7 +941,7 @@ SESSION_STATE_COUNT */ void Session::detectSessionState() { - if (!mSessionUser || !mSessionUser->hasCryptoKey()) { + if (mSessionUser.isNull() || !mSessionUser->hasCryptoKey()) { return; } UserStates userState = mSessionUser->getUserState(); diff --git a/src/cpsp/login.cpsp b/src/cpsp/login.cpsp index 70018bc79..48a6e2807 100644 --- a/src/cpsp/login.cpsp +++ b/src/cpsp/login.cpsp @@ -93,7 +93,7 @@ auto uri_start = request.serverParams().getServerName(); auto lastExternReferer = mSession->getLastReferer(); - //printf("userState: %d\n", userState); + printf("userState: %d\n", userState); switch(userState) { case USER_EMPTY: