From 8b5fa733753717538408f9fc274251550b65caa6 Mon Sep 17 00:00:00 2001 From: Dario Date: Mon, 2 Dec 2019 10:45:59 +0100 Subject: [PATCH] fix crash (missing return) --- src/cpp/HTTPInterface/DashboardPage.cpp | 23 ++++++++++---------- src/cpp/JSONInterface/JsonRequestHandler.cpp | 3 ++- src/cpsp/dashboard.cpsp | 1 + 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/cpp/HTTPInterface/DashboardPage.cpp b/src/cpp/HTTPInterface/DashboardPage.cpp index d8e4a1ec3..3be82c07e 100644 --- a/src/cpp/HTTPInterface/DashboardPage.cpp +++ b/src/cpp/HTTPInterface/DashboardPage.cpp @@ -42,6 +42,7 @@ void DashboardPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N } auto uri_start = ServerConfig::g_serverPath;//request.serverParams().getServerName(); response.redirect(ServerConfig::g_php_serverPath + "/"); + return; // begin include header_old.cpsp responseStream << "\n"; responseStream << "\n"; @@ -116,34 +117,34 @@ void DashboardPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N responseStream << "\n"; responseStream << "
\n"; responseStream << "\t

Willkommen "; -#line 22 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" +#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" responseStream << ( mSession->getUser()->getFirstName() ); responseStream << " "; -#line 22 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" +#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" responseStream << ( mSession->getUser()->getLastName() ); responseStream << "

\n"; responseStream << "\t"; -#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" +#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" responseStream << ( mSession->getErrorsHtml() ); responseStream << "\n"; responseStream << "\t

Status

\n"; responseStream << "\t

"; -#line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" +#line 26 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" responseStream << ( mSession->getSessionStateString() ); responseStream << "

\n"; responseStream << "\t"; -#line 26 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" +#line 27 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" if(mSession->getSessionState() == SESSION_STATE_EMAIL_VERIFICATION_SEND) { responseStream << "\n"; responseStream << "\t

Verification Code E-Mail wurde erfolgreich an dich verschickt, bitte schaue auch in dein Spam-Verzeichnis nach wenn du sie nicht findest und klicke auf den Link den du dort findest oder kopiere den Code hier her:

\n"; responseStream << "\t
\n"; responseStream << "\t\t\n"; responseStream << "\t\t\n"; responseStream << "\t
\n"; responseStream << "\t"; -#line 32 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" +#line 33 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" } else if(mSession->getSessionState() == SESSION_STATE_EMAIL_VERIFICATION_WRITTEN) { responseStream << "\n"; responseStream << "\t

Hast du schon eine E-Mail mit einem Verification Code erhalten? Wenn ja kannst du ihn hier hinein kopieren:

\n"; responseStream << "\t
\n"; @@ -151,14 +152,14 @@ void DashboardPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N responseStream << "\t\t\n"; responseStream << "\t
\n"; responseStream << "\t"; -#line 38 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" +#line 39 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\dashboard.cpsp" } responseStream << "\n"; responseStream << "\tAbmelden\n"; responseStream << "\tAccount löschen\n"; responseStream << "
\n"; @@ -166,7 +167,7 @@ void DashboardPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N responseStream << "\t
\n"; responseStream << "\t\t