diff --git a/src/cpp/HTTPInterface/CheckEmailPage.cpp b/src/cpp/HTTPInterface/CheckEmailPage.cpp index d822ee42e..2c48512b1 100644 --- a/src/cpp/HTTPInterface/CheckEmailPage.cpp +++ b/src/cpp/HTTPInterface/CheckEmailPage.cpp @@ -32,6 +32,8 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:: Poco::Net::HTMLForm form(request, request.stream()); #line 16 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" + const char* pageName = "Email Verification"; + // remove old cookies if exist auto sm = SessionManager::getInstance(); sm->deleteLoginCookies(request, response, mSession); @@ -48,12 +50,16 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:: Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1); std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream; responseStream << "\n"; + // begin include header.cpsp responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; - responseStream << "Gradido Login Server: Email Verification\n"; + responseStream << "Gradido Login Server: "; +#line 6 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\header.cpsp" + responseStream << ( pageName ); + responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; + responseStream << "
\n"; + responseStream << "\t

Login Server in Entwicklung

\n"; + responseStream << "\t

Alpha 0.4.1

\n"; + responseStream << "
"; + // end include header.cpsp + responseStream << "\n"; responseStream << "
\n"; responseStream << "\t\n"; responseStream << "\t

Einen neuen Account anlegen

\n"; responseStream << "\t"; -#line 59 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" +#line 35 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" responseStream << ( getErrorsHtml() ); responseStream << "\n"; responseStream << "\t"; -#line 60 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" +#line 36 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" if(state == MAIL_NOT_SEND) { responseStream << "\n"; responseStream << "\t\t
\n"; responseStream << "\t\t\t

Die E-Mail wurde noch nicht verschickt, bitte habe noch etwas Geduld.

\n"; responseStream << "\t\t\t

Versuche es einfach in 1-2 Minuten erneut.

\n"; responseStream << "\t\t
\n"; responseStream << "\t"; -#line 65 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" +#line 41 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" } else if(state == ASK_VERIFICATION_CODE) { responseStream << "\n"; responseStream << "\t
\n"; responseStream << "\t\t

Bitte gebe deinen E-Mail Verification Code ein.

\n"; responseStream << "\t\t"; -#line 68 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" +#line 44 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" if(mSession && !mSession->getUser().isNull()) { responseStream << "\n"; responseStream << "\t\t\t

Er wurde an deine E-Mail Adresse: "; -#line 69 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" +#line 45 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" responseStream << ( mSession->getUser()->getEmail() ); responseStream << " gesendet.

\n"; responseStream << "\t\t"; -#line 70 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" +#line 46 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" } responseStream << "\n"; responseStream << "\t\t\n"; responseStream << "\t\t\n"; @@ -109,22 +142,25 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:: responseStream << "\t\t

E-Mail erneut zuschicken (in Arbeit)

\n"; responseStream << "\t
\n"; responseStream << "\t"; -#line 76 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" +#line 52 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" } else { responseStream << "\n"; responseStream << "\t
\n"; responseStream << "\t\t\tUngültige Seite, wenn du das siehst stimmt hier etwas nicht. Bitte wende dich an den Server-Admin. \n"; responseStream << "\t\t
\n"; responseStream << "\t"; -#line 80 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" +#line 56 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" } responseStream << "\n"; responseStream << "
\n"; - responseStream << "
\n"; - responseStream << "\t"; -#line 83 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkEmail.cpsp" + // begin include footer.cpsp + responseStream << "\t
\n"; + responseStream << "\t\t\t"; +#line 2 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\footer.cpsp" responseStream << ( mTimeProfiler.string() ); responseStream << "\n"; - responseStream << "
\n"; + responseStream << "\t
\n"; responseStream << "\n"; - responseStream << "\n"; + responseStream << ""; + // end include footer.cpsp + responseStream << "\n"; if (_compressResponse) _gzipStream.close(); } diff --git a/src/cpp/HTTPInterface/CheckTransactionPage.cpp b/src/cpp/HTTPInterface/CheckTransactionPage.cpp index 7113517ff..0f5c74993 100644 --- a/src/cpp/HTTPInterface/CheckTransactionPage.cpp +++ b/src/cpp/HTTPInterface/CheckTransactionPage.cpp @@ -35,6 +35,8 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::HTMLForm form(request, request.stream()); #line 19 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" + const char* pageName = "Überprüfe Transaktion"; + PageState state = PAGE_NO_TRANSACTIONS; size_t notReadyTransactions = 0; size_t sumTransactions = mSession->getProcessingTransactionCount(); @@ -71,12 +73,16 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1); std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream; responseStream << "\n"; + // begin include header.cpsp responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; - responseStream << "Gradido Login Server: Überprüfe Transaktion\n"; + responseStream << "Gradido Login Server: "; +#line 6 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\header.cpsp" + responseStream << ( pageName ); + responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; + responseStream << "
\n"; + responseStream << "\t

Login Server in Entwicklung

\n"; + responseStream << "\t

Alpha 0.4.1

\n"; + responseStream << "
"; + // end include header.cpsp + responseStream << "\n"; responseStream << "
\n"; responseStream << "\t

Eine Transaktion prüfen

\n"; responseStream << "\t"; -#line 81 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 57 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( getErrorsHtml() ); responseStream << "\n"; responseStream << "\t"; -#line 82 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 58 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" if(sumTransactions - notReadyTransactions != 1) { responseStream << "\n"; responseStream << "\t\t
";
-#line 83 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp"
+#line 59 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp"
 	responseStream << ( sumTransactions - notReadyTransactions );
 	responseStream << " von ";
-#line 83 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp"
+#line 59 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp"
 	responseStream << ( sumTransactions );
 	responseStream << " Transaktionen sind bereit zum prüfen
\n"; responseStream << "\t"; -#line 84 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 60 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" } responseStream << "\n"; responseStream << "\t"; -#line 85 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 61 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" if(state == PAGE_NO_TRANSACTIONS) { responseStream << "\n"; responseStream << "\t
\n"; responseStream << "\t\t"; -#line 87 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 63 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" if(sumTransactions == 0) { responseStream << "\n"; responseStream << "\t\t\t
Es gibt zurzeit keine Transaktionen zum überprüfen
\n"; responseStream << "\t\t"; -#line 89 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 65 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" } else { responseStream << "\n"; responseStream << "\t\t\t
Transaktion(en) werden noch vorbereitet, bitte lade die Seite in wenigen Augenblicken erneut.
\n"; responseStream << "\t\t"; -#line 91 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 67 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" } responseStream << "\n"; responseStream << "\t
\n"; responseStream << "\t\n"; responseStream << "\t"; -#line 94 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 70 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" } else if(state == PAGE_TRANSACTION_CREATION) { auto creationTransaction = processingTransaction->getCreationTransaction(); auto transactionUser = creationTransaction->getUser(); @@ -144,57 +177,57 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request, responseStream << "\t\t

Schöpfungstransaktion

\n"; responseStream << "\t\tMemo: \n"; responseStream << "\t\t

"; -#line 102 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 78 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( creationTransaction->getMemo() ); responseStream << "

\n"; responseStream << "\t\tEmpfänger: \n"; responseStream << "\t\t"; -#line 104 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 80 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" if(transactionUser) { responseStream << "\n"; responseStream << "\t\t\t"; -#line 105 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 81 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( transactionUser->getFirstName() ); responseStream << " "; -#line 105 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 81 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( transactionUser->getLastName() ); responseStream << "\n"; responseStream << "\t\t\t"; -#line 106 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 82 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( transactionUser->getEmail() ); responseStream << "\n"; responseStream << "\t\t"; -#line 107 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 83 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" } else { responseStream << "\n"; responseStream << "\t\t\t"; -#line 108 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 84 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( creationTransaction->getPublicHex() ); responseStream << "\n"; responseStream << "\t\t"; -#line 109 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 85 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" } responseStream << "\n"; responseStream << "\t\tSumme: \n"; responseStream << "\t\t"; -#line 111 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 87 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( creationTransaction->getAmountString() ); responseStream << " Gradido\n"; responseStream << "\t\t
\n"; responseStream << "\t\t\tUnterschreiben mit aktuellem Account?
\n"; responseStream << "\t\t\t

"; -#line 114 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 90 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( accountUser->getFirstName() ); responseStream << " "; -#line 114 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 90 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( accountUser->getLastName() ); responseStream << "

\n"; responseStream << "\t\t\t

"; -#line 115 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 91 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" responseStream << ( accountUser->getEmail() ); responseStream << "

\n"; responseStream << "\t\t\t"; -#line 116 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 92 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" // TODO: additional password check responseStream << "\n"; responseStream << "\t\t\t"; -#line 117 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 93 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" if(!accountUser->hasCryptoKey()) { responseStream << "\n"; responseStream << "\t\t\t

Ich brauche nochmal dein Passwort

\n"; responseStream << "\t\t\t\t

\n"; @@ -202,23 +235,25 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request, responseStream << "\t\t\t\t\t\n"; responseStream << "\t\t\t\t

\n"; responseStream << "\t\t\t"; -#line 123 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 99 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" } responseStream << "\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t
\n"; responseStream << "\t
\t\n"; responseStream << "\t"; -#line 128 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" +#line 104 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" } responseStream << "\n"; responseStream << "\n"; - responseStream << "
\n"; - responseStream << "\t"; -#line 131 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\checkTransaction.cpsp" + // begin include footer.cpsp + responseStream << "\t
\n"; + responseStream << "\t\t\t"; +#line 2 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\footer.cpsp" responseStream << ( mTimeProfiler.string() ); responseStream << "\n"; - responseStream << "
\n"; + responseStream << "\t
\n"; responseStream << "\n"; responseStream << ""; + // end include footer.cpsp if (_compressResponse) _gzipStream.close(); } diff --git a/src/cpp/HTTPInterface/ConfigPage.cpp b/src/cpp/HTTPInterface/ConfigPage.cpp index 8eb2cfd96..804412482 100644 --- a/src/cpp/HTTPInterface/ConfigPage.cpp +++ b/src/cpp/HTTPInterface/ConfigPage.cpp @@ -7,7 +7,7 @@ #line 4 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\config.cpsp" - + const char* pageName = "Config"; void ConfigPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::HTTPServerResponse& response) @@ -22,16 +22,63 @@ void ConfigPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net: Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1); std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream; responseStream << "\n"; + // begin include header.cpsp responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; - responseStream << "Gradido Login Server: Config\n"; + responseStream << "Gradido Login Server: "; +#line 6 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\header.cpsp" + responseStream << ( pageName ); + responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; + responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; + responseStream << "
\n"; + responseStream << "\t

Login Server in Entwicklung

\n"; + responseStream << "\t

Alpha 0.4.1

\n"; + responseStream << "
"; + // end include header.cpsp + responseStream << "\n"; responseStream << "

Config

\n"; responseStream << "
\n"; responseStream << "\t
\n"; diff --git a/src/cpp/HTTPInterface/DashboardPage.cpp b/src/cpp/HTTPInterface/DashboardPage.cpp index d0db05183..83b8eab43 100644 --- a/src/cpp/HTTPInterface/DashboardPage.cpp +++ b/src/cpp/HTTPInterface/DashboardPage.cpp @@ -32,54 +32,100 @@ void DashboardPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N responseStream << "\n"; #line 12 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" - + const char* pageName = "Dashboard"; //Poco::Net::NameValueCollection cookies; //request.getCookies(cookies); if(!form.empty()) { //form.get("email-verification-code") } auto uri_start = ServerConfig::g_serverPath;//request.serverParams().getServerName(); - responseStream << "\n"; + // begin include header.cpsp responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; - responseStream << "Gradido Login Server: Dashboard\n"; + responseStream << "Gradido Login Server: "; +#line 6 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\header.cpsp" + responseStream << ( pageName ); + responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; + responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; + responseStream << "
\n"; + responseStream << "\t

Login Server in Entwicklung

\n"; + responseStream << "\t

Alpha 0.4.1

\n"; + responseStream << "
"; + // end include header.cpsp + responseStream << "\n"; responseStream << "
\n"; responseStream << "\t

Willkommen "; -#line 32 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" +#line 22 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" responseStream << ( mSession->getUser()->getFirstName() ); responseStream << " "; -#line 32 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" +#line 22 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" responseStream << ( mSession->getUser()->getLastName() ); responseStream << "

\n"; responseStream << "\t"; -#line 33 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" +#line 23 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" responseStream << ( mSession->getErrorsHtml() ); responseStream << "\n"; responseStream << "\t

Status

\n"; responseStream << "\t

"; -#line 35 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" +#line 25 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" responseStream << ( mSession->getSessionStateString() ); responseStream << "

\n"; responseStream << "\t"; -#line 36 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" +#line 26 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\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 42 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" +#line 32 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\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"; @@ -87,24 +133,27 @@ void DashboardPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N responseStream << "\t\t\n"; responseStream << "\t
\n"; responseStream << "\t"; -#line 48 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" +#line 38 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" } responseStream << "\n"; responseStream << "\tAbmelden\n"; responseStream << "\tAccount löschen\n"; responseStream << "
\n"; - responseStream << "
\n"; - responseStream << "\t"; -#line 53 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\dashboard.cpsp" + // begin include footer.cpsp + responseStream << "\t
\n"; + responseStream << "\t\t\t"; +#line 2 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\footer.cpsp" responseStream << ( mTimeProfiler.string() ); responseStream << "\n"; - responseStream << "
\n"; + responseStream << "\t
\n"; responseStream << "\n"; - responseStream << "\n"; + responseStream << ""; + // end include footer.cpsp + responseStream << "\n"; if (_compressResponse) _gzipStream.close(); } diff --git a/src/cpp/HTTPInterface/Error500Page.cpp b/src/cpp/HTTPInterface/Error500Page.cpp index 21d6fe931..7a7c9f8b7 100644 --- a/src/cpp/HTTPInterface/Error500Page.cpp +++ b/src/cpp/HTTPInterface/Error500Page.cpp @@ -31,18 +31,22 @@ void Error500Page::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne responseStream << "\n"; #line 10 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\Error500.cpsp" + const char* pageName = "Error"; response.setStatusAndReason(Poco::Net::HTTPResponse::HTTP_INTERNAL_SERVER_ERROR); Poco::AutoPtr user; if(mSession) { auto user = mSession->getUser(); } - responseStream << "\n"; + // begin include header.cpsp responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; - responseStream << "Gradido Login Server: Error\n"; + responseStream << "Gradido Login Server: "; +#line 6 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\header.cpsp" + responseStream << ( pageName ); + responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; + responseStream << "
\n"; + responseStream << "\t

Login Server in Entwicklung

\n"; + responseStream << "\t

Alpha 0.4.1

\n"; + responseStream << "
"; + // end include header.cpsp + responseStream << "\n"; responseStream << "\t

Ein Fehler auf dem Server trat ein, der Admin bekam eine E-Mail.

\n"; responseStream << "\t"; -#line 44 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\Error500.cpsp" +#line 19 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\Error500.cpsp" if(mSession) { responseStream << "\n"; responseStream << "\t\t"; -#line 45 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\Error500.cpsp" +#line 20 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\Error500.cpsp" responseStream << ( mSession->getErrorsHtml() ); responseStream << "\n"; responseStream << "\t"; -#line 46 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\Error500.cpsp" +#line 21 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\Error500.cpsp" } responseStream << "\n"; responseStream << "\t"; -#line 47 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\Error500.cpsp" +#line 22 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\Error500.cpsp" if(!user.isNull()) { responseStream << "\n"; responseStream << "\t\t"; -#line 48 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\Error500.cpsp" +#line 23 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\Error500.cpsp" responseStream << ( user->getErrorsHtml() ); responseStream << " \n"; responseStream << "\t"; -#line 49 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\Error500.cpsp" +#line 24 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\Error500.cpsp" } responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; diff --git a/src/cpp/HTTPInterface/LoginPage.cpp b/src/cpp/HTTPInterface/LoginPage.cpp index 47071b36b..46925b88c 100644 --- a/src/cpp/HTTPInterface/LoginPage.cpp +++ b/src/cpp/HTTPInterface/LoginPage.cpp @@ -28,7 +28,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: Poco::Net::HTMLForm form(request, request.stream()); #line 17 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\login.cpsp" - + const char* pageName = "Login"; auto sm = SessionManager::getInstance(); if(!form.empty()) { @@ -87,12 +87,16 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1); std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream; responseStream << "\n"; + // begin include header.cpsp responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; - responseStream << "Gradido Login Server: Login\n"; + responseStream << "Gradido Login Server: "; +#line 6 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\header.cpsp" + responseStream << ( pageName ); + responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; + responseStream << "
\n"; + responseStream << "\t

Login Server in Entwicklung

\n"; + responseStream << "\t

Alpha 0.4.1

\n"; + responseStream << "
"; + // end include header.cpsp + responseStream << "\n"; responseStream << "
\n"; responseStream << "\t
\n"; responseStream << "\t\t

Login

\n"; responseStream << "\t\t"; -#line 103 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\login.cpsp" +#line 77 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\login.cpsp" responseStream << ( getErrorsHtml() ); responseStream << "\n"; responseStream << "\t\t
\n"; @@ -135,16 +166,19 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: responseStream << "\t\t
\n"; responseStream << "\t\t\n"; responseStream << "\t\t

Du hast noch keinen Account? Dann folge dem Link um dir einen anzulegen

\n"; - responseStream << "\t\tNeuen Account anlegen\n"; + responseStream << "\t\tNeuen Account anlegen\n"; responseStream << "\t
\n"; - responseStream << "\t
\n"; - responseStream << "\t\t"; -#line 122 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\login.cpsp" + responseStream << "\t\n"; + responseStream << "\n"; + // begin include footer.cpsp + responseStream << "\t
\n"; + responseStream << "\t\t\t"; +#line 2 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\footer.cpsp" responseStream << ( mTimeProfiler.string() ); responseStream << "\n"; responseStream << "\t
\n"; - responseStream << "\n"; responseStream << "\n"; responseStream << ""; + // end include footer.cpsp if (_compressResponse) _gzipStream.close(); } diff --git a/src/cpp/HTTPInterface/PassphrasePage.cpp b/src/cpp/HTTPInterface/PassphrasePage.cpp index c870f0341..3ed3a31ab 100644 --- a/src/cpp/HTTPInterface/PassphrasePage.cpp +++ b/src/cpp/HTTPInterface/PassphrasePage.cpp @@ -35,6 +35,7 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:: Poco::Net::HTMLForm form(request, request.stream()); #line 19 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" + const char* pageName = "Passphrase"; PageState state = PAGE_ASK_PASSPHRASE; auto sm = SessionManager::getInstance(); @@ -74,12 +75,16 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:: Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1); std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream; responseStream << "\n"; + // begin include header.cpsp responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; - responseStream << "Gradido Login Server: Passphrase\n"; + responseStream << "Gradido Login Server: "; +#line 6 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\header.cpsp" + responseStream << ( pageName ); + responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; + responseStream << "
\n"; + responseStream << "\t

Login Server in Entwicklung

\n"; + responseStream << "\t

Alpha 0.4.1

\n"; + responseStream << "
"; + // end include header.cpsp + responseStream << "\n"; responseStream << "
\n"; responseStream << "\t

Einen neuen Account anlegen

\n"; responseStream << "\t"; -#line 84 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" +#line 59 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" responseStream << ( getErrorsHtml() ); responseStream << "\n"; responseStream << "\t"; -#line 85 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" +#line 60 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" if(state == PAGE_SHOW_PASSPHRASE) { responseStream << "\n"; responseStream << "\t\t
\n"; responseStream << "\t\t\t
\n"; @@ -115,18 +147,18 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:: responseStream << "\t\t\t
\n"; responseStream << "\t\t\t
\n"; responseStream << "\t\t\t\t"; -#line 91 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" +#line 66 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" responseStream << ( mSession->getPassphrase() ); responseStream << "\n"; responseStream << "\t\t\t
\n"; responseStream << "\t\t\tWeiter\n"; responseStream << "\t\t
\n"; responseStream << "\t"; -#line 95 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" +#line 70 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" } else if(state == PAGE_ASK_PASSPHRASE) { responseStream << "\n"; responseStream << "\t

Deine E-Mail Adresse wurde erfolgreich bestätigt.

\n"; responseStream << "\t
\n"; responseStream << "\t\t
\n"; @@ -141,7 +173,7 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:: responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t

\n"; responseStream << "\t\t\t\n"; responseStream << "\t\t
\n"; @@ -149,22 +181,25 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:: responseStream << "\t\t\n"; responseStream << "\t
\n"; responseStream << "\t"; -#line 114 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" +#line 89 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" } else { responseStream << "\n"; responseStream << "\t\t
\n"; responseStream << "\t\t\tUngültige Seite, wenn du das siehst stimmt hier etwas nicht. Bitte wende dich an den Server-Admin. \n"; responseStream << "\t\t
\n"; responseStream << "\t"; -#line 118 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" +#line 93 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" } responseStream << "\n"; responseStream << "
\n"; - responseStream << "
\n"; - responseStream << "\t"; -#line 121 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp" + // begin include footer.cpsp + responseStream << "\t
\n"; + responseStream << "\t\t\t"; +#line 2 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\footer.cpsp" responseStream << ( mTimeProfiler.string() ); responseStream << "\n"; - responseStream << "
\n"; + responseStream << "\t
\n"; responseStream << "\n"; - responseStream << "\n"; + responseStream << ""; + // end include footer.cpsp + responseStream << "\n"; if (_compressResponse) _gzipStream.close(); } diff --git a/src/cpp/HTTPInterface/RegisterPage.cpp b/src/cpp/HTTPInterface/RegisterPage.cpp index 84b66cf48..463e6f984 100644 --- a/src/cpp/HTTPInterface/RegisterPage.cpp +++ b/src/cpp/HTTPInterface/RegisterPage.cpp @@ -21,6 +21,7 @@ void RegisterPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne Poco::Net::HTMLForm form(request, request.stream()); #line 10 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\register.cpsp" + const char* pageName = "Registrieren"; auto sm = SessionManager::getInstance(); bool userReturned = false; @@ -55,12 +56,16 @@ void RegisterPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1); std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream; responseStream << "\n"; + // begin include header.cpsp responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; - responseStream << "Gradido Login Server: Register\n"; + responseStream << "Gradido Login Server: "; +#line 6 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\header.cpsp" + responseStream << ( pageName ); + responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; + responseStream << "
\n"; + responseStream << "\t

Login Server in Entwicklung

\n"; + responseStream << "\t

Alpha 0.4.1

\n"; + responseStream << "
"; + // end include header.cpsp + responseStream << "\n"; responseStream << "
\n"; responseStream << "\t

Einen neuen Account anlegen

\n"; responseStream << "\t"; -#line 70 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\register.cpsp" +#line 45 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\register.cpsp" responseStream << ( getErrorsHtml() ); responseStream << "\n"; responseStream << "\t"; -#line 71 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\register.cpsp" +#line 46 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\register.cpsp" if(!form.empty() && userReturned) { responseStream << "\n"; responseStream << "\t\t
\n"; responseStream << "\t\t\t
\n"; @@ -97,7 +129,7 @@ void RegisterPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne responseStream << "\t\t\t
\n"; responseStream << "\t\t
\n"; responseStream << "\t"; -#line 78 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\register.cpsp" +#line 53 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\register.cpsp" } else { responseStream << "\n"; responseStream << "\t
\n"; responseStream << "\t\t\n"; @@ -107,21 +139,21 @@ void RegisterPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne responseStream << "\t\t\t

\n"; responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t

\n"; responseStream << "\t\t\t

\n"; responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t

\n"; responseStream << "\t\t\t

\n"; responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t

\n"; @@ -138,16 +170,19 @@ void RegisterPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne responseStream << "\t\t\n"; responseStream << "\t
\n"; responseStream << "\t"; -#line 108 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\register.cpsp" +#line 83 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\register.cpsp" } responseStream << "\n"; responseStream << "
\n"; - responseStream << "
\n"; - responseStream << "\t"; -#line 111 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\register.cpsp" + // begin include footer.cpsp + responseStream << "\t
\n"; + responseStream << "\t\t\t"; +#line 2 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\footer.cpsp" responseStream << ( mTimeProfiler.string() ); responseStream << "\n"; - responseStream << "
\n"; + responseStream << "\t
\n"; responseStream << "\n"; - responseStream << "\n"; + responseStream << ""; + // end include footer.cpsp + responseStream << "\n"; if (_compressResponse) _gzipStream.close(); } diff --git a/src/cpp/HTTPInterface/SaveKeysPage.cpp b/src/cpp/HTTPInterface/SaveKeysPage.cpp index d004cf9c5..75ac411ab 100644 --- a/src/cpp/HTTPInterface/SaveKeysPage.cpp +++ b/src/cpp/HTTPInterface/SaveKeysPage.cpp @@ -36,13 +36,19 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne Poco::Net::HTMLForm form(request, request.stream()); #line 20 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" - + const char* pageName = "Daten auf Server speichern?"; bool hasErrors = mSession->errorCount() > 0; // crypto key only in memory, if user has tipped in his passwort in this session bool hasPassword = mSession->getUser()->hasCryptoKey(); PageState state = PAGE_ASK; auto uri_start = ServerConfig::g_serverPath;//request.serverParams().getServerName(); + // skip asking user if he like to save keys and passphrase on server + state = PAGE_SHOW_PUBKEY; + if(!mSession->generateKeys(true, true)) { + getErrors(mSession); + } + if(!form.empty()) { // privkey auto savePrivkeyChoice = form.get("save-privkey"); @@ -87,12 +93,16 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1); std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream; responseStream << "\n"; + // begin include header.cpsp responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; - responseStream << "Gradido Login Server: Daten auf Server speichern?\n"; + responseStream << "Gradido Login Server: "; +#line 6 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\header.cpsp" + responseStream << ( pageName ); + responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; + responseStream << "
\n"; + responseStream << "\t

Login Server in Entwicklung

\n"; + responseStream << "\t

Alpha 0.4.1

\n"; + responseStream << "
"; + // end include header.cpsp + responseStream << "\n"; responseStream << "
\n"; responseStream << "\t

Daten speichern

\n"; responseStream << "\t"; -#line 97 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" +#line 77 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" responseStream << ( getErrorsHtml() ); responseStream << "\n"; responseStream << "\t"; -#line 98 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" +#line 78 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" if(state == PAGE_ASK) { responseStream << "\n"; responseStream << "\t
\n"; responseStream << "\t\t
\n"; @@ -135,7 +172,7 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t

\n"; responseStream << "\t\t\t"; -#line 111 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" +#line 91 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" if(!hasPassword) { responseStream << "\n"; responseStream << "\t\t\t\t

Ich brauche nochmal dein Passwort wenn du dich für ja entscheidest.

\n"; responseStream << "\t\t\t\t

\n"; @@ -143,7 +180,7 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne responseStream << "\t\t\t\t\t\n"; responseStream << "\t\t\t\t

\n"; responseStream << "\t\t\t"; -#line 117 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" +#line 97 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" } responseStream << "\n"; responseStream << "\t\t\t

\n"; responseStream << "\t\t\t\t\n"; @@ -168,43 +205,47 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne responseStream << "\t\t\n"; responseStream << "\t

\n"; responseStream << "\t"; -#line 140 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" +#line 120 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" } else if(state == PAGE_SHOW_PUBKEY) { responseStream << "\n"; responseStream << "\t\t
\n"; - responseStream << "\t\t\t

Je nach Auswahl werden deine Daten nun verschlüsselt und gespeichert.

\n"; - responseStream << "\t\t\t

Deine Gradido Adresse (Hex):

\n"; + responseStream << "\t\t\t\n"; + responseStream << "\t\t\t

Deine Daten werden nun verschlüsselt und gespeichert.

\n"; + responseStream << "\t\t\t\n"; responseStream << "\t\t\tZurück zur Startseite\n"; responseStream << "\t\t
\n"; responseStream << "\t"; -#line 149 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" +#line 130 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" } else if(state == PAGE_ERROR) { responseStream << "\n"; responseStream << "\t\t
\n"; responseStream << "\t\t\t

Ein Fehler trat auf, bitte versuche es erneut oder wende dich an den Server-Admin

\n"; responseStream << "\t\t\t"; -#line 152 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" +#line 133 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" responseStream << ( mSession->getSessionStateString() ); responseStream << "\n"; responseStream << "\t\t
\n"; responseStream << "\t"; -#line 154 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" +#line 135 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" } responseStream << "\n"; responseStream << "
\n"; - responseStream << "
\n"; - responseStream << "\t"; -#line 157 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp" + // begin include footer.cpsp + responseStream << "\t
\n"; + responseStream << "\t\t\t"; +#line 2 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\footer.cpsp" responseStream << ( mTimeProfiler.string() ); responseStream << "\n"; - responseStream << "
\n"; + responseStream << "\t
\n"; responseStream << "\n"; - responseStream << "\n"; + responseStream << ""; + // end include footer.cpsp + responseStream << "\n"; if (_compressResponse) _gzipStream.close(); } diff --git a/src/cpp/HTTPInterface/UpdateUserPasswordPage.cpp b/src/cpp/HTTPInterface/UpdateUserPasswordPage.cpp index b215e4e01..2aeda6934 100644 --- a/src/cpp/HTTPInterface/UpdateUserPasswordPage.cpp +++ b/src/cpp/HTTPInterface/UpdateUserPasswordPage.cpp @@ -28,6 +28,7 @@ void UpdateUserPasswordPage::handleRequest(Poco::Net::HTTPServerRequest& request Poco::Net::HTMLForm form(request, request.stream()); #line 11 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\UpdateUserPassword.cpsp" + const char* pageName = "Passwort bestimmen"; auto user = mSession->getUser(); auto sm = SessionManager::getInstance(); auto uri_start = ServerConfig::g_serverPath; @@ -61,12 +62,16 @@ void UpdateUserPasswordPage::handleRequest(Poco::Net::HTTPServerRequest& request Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1); std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream; responseStream << "\n"; + // begin include header.cpsp responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; - responseStream << "Gradido Login Server: Passwort bestimmen\n"; + responseStream << "Gradido Login Server: "; +#line 6 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\header.cpsp" + responseStream << ( pageName ); + responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; + responseStream << "
\n"; + responseStream << "\t

Login Server in Entwicklung

\n"; + responseStream << "\t

Alpha 0.4.1

\n"; + responseStream << "
"; + // end include header.cpsp + responseStream << "\n"; responseStream << "
\n"; responseStream << "\t

Passwort bestimmen

\n"; responseStream << "\t"; -#line 85 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\UpdateUserPassword.cpsp" +#line 45 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\UpdateUserPassword.cpsp" responseStream << ( getErrorsHtml() ); responseStream << "\n"; responseStream << "\t
\t\n"; @@ -126,13 +143,16 @@ void UpdateUserPasswordPage::handleRequest(Poco::Net::HTTPServerRequest& request responseStream << "\t\t\n"; responseStream << "\t
\n"; responseStream << "
\n"; - responseStream << "
\n"; - responseStream << "\t"; -#line 105 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\UpdateUserPassword.cpsp" + // begin include footer.cpsp + responseStream << "\t
\n"; + responseStream << "\t\t\t"; +#line 2 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\footer.cpsp" responseStream << ( mTimeProfiler.string() ); responseStream << "\n"; - responseStream << "
\n"; + responseStream << "\t
\n"; responseStream << "\n"; - responseStream << "\n"; + responseStream << ""; + // end include footer.cpsp + responseStream << "\n"; if (_compressResponse) _gzipStream.close(); } diff --git a/src/cpp/SingletonManager/SessionManager.cpp b/src/cpp/SingletonManager/SessionManager.cpp index 2175cfc85..e755ebca4 100644 --- a/src/cpp/SingletonManager/SessionManager.cpp +++ b/src/cpp/SingletonManager/SessionManager.cpp @@ -36,7 +36,7 @@ bool SessionManager::init() //case VALIDATE_NAME: mValidations[i] = new Poco::RegularExpression("/^[a-zA-Z_ -]{3,}$/"); break; case VALIDATE_NAME: mValidations[i] = new Poco::RegularExpression("^[^<>&;]{3,}$"); break; case VALIDATE_EMAIL: mValidations[i] = new Poco::RegularExpression("^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$"); break; - case VALIDATE_PASSWORD: mValidations[i] = new Poco::RegularExpression("^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@$!%*?&+-])[A-Za-z0-9@$!%*?&+-]{8,}$"); break; + case VALIDATE_PASSWORD: mValidations[i] = new Poco::RegularExpression("^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@$!%*?&+-_])[A-Za-z0-9@$!%*?&+-_]{8,}$"); break; case VALIDATE_PASSPHRASE: mValidations[i] = new Poco::RegularExpression("^(?:[a-z]* ){23}[a-z]*\s*$"); break; case VALIDATE_HAS_NUMBER: mValidations[i] = new Poco::RegularExpression(".*[0-9].*"); break; case VALIDATE_HAS_SPECIAL_CHARACTER: mValidations[i] = new Poco::RegularExpression(".*[@$!%*?&+-].*"); break; @@ -338,7 +338,7 @@ void SessionManager::deleteLoginCookies(Poco::Net::HTTPServerRequest& request, P bool SessionManager::checkPwdValidation(const std::string& pwd, ErrorList* errorReciver) { if (!isValid(pwd, VALIDATE_PASSWORD)) { - errorReciver->addError(new Error("Passwort", "Bitte gebe ein gültiges Password ein mit mindestens 8 Zeichen, Groß- und Kleinbuchstaben, mindestens einer Zahl und einem Sonderzeichen (@$!%*?&+-) ein!")); + errorReciver->addError(new Error("Passwort", "Bitte gebe ein gültiges Password ein mit mindestens 8 Zeichen, Groß- und Kleinbuchstaben, mindestens einer Zahl und einem Sonderzeichen (@$!%*?&+-_) ein!")); // @$!%*?&+- if (pwd.size() < 8) { diff --git a/src/cpp/model/Session.cpp b/src/cpp/model/Session.cpp index e101f9294..c54def263 100644 --- a/src/cpp/model/Session.cpp +++ b/src/cpp/model/Session.cpp @@ -199,7 +199,7 @@ bool Session::createUser(const std::string& first_name, const std::string& last_ std::stringstream ss; ss << "Hallo " << first_name << " " << last_name << "," << std::endl << std::endl; ss << "Du oder jemand anderes hat sich soeben mit dieser E-Mail Adresse bei Gradido registriert. " << std::endl; - ss << "Wenn du es warst, klicke bitte auf den Link: https://gradido2.dario-rekowski.de/account/checkEmail/" << mEmailVerificationCode << std::endl; + ss << "Wenn du es warst, klicke bitte auf den Link: " << ServerConfig::g_serverPath << "/checkEmail/" << mEmailVerificationCode << std::endl; //ss << "oder kopiere den Code: " << mEmailVerificationCode << " selbst dort hinein." << std::endl; ss << "oder kopiere den obigen Link in Dein Browserfenster." << std::endl; ss << std::endl; diff --git a/src/cpsp/Error500.cpsp b/src/cpsp/Error500.cpsp index 1f6724d13..b44821c81 100644 --- a/src/cpsp/Error500.cpsp +++ b/src/cpsp/Error500.cpsp @@ -8,38 +8,13 @@ %> <% + const char* pageName = "Error"; response.setStatusAndReason(Poco::Net::HTTPResponse::HTTP_INTERNAL_SERVER_ERROR); Poco::AutoPtr user; if(mSession) { auto user = mSession->getUser(); } -%> - - - - - -Gradido Login Server: Error - - - - - +%><%@ include file="header.cpsp" %>

Ein Fehler auf dem Server trat ein, der Admin bekam eine E-Mail.

<% if(mSession) { %> <%= mSession->getErrorsHtml() %> diff --git a/src/cpsp/checkEmail.cpsp b/src/cpsp/checkEmail.cpsp index 5e6559fa8..b94ae0ea2 100644 --- a/src/cpsp/checkEmail.cpsp +++ b/src/cpsp/checkEmail.cpsp @@ -14,6 +14,8 @@ enum PageState }; %> <%% + const char* pageName = "Email Verification"; + // remove old cookies if exist auto sm = SessionManager::getInstance(); sm->deleteLoginCookies(request, response, mSession); @@ -26,33 +28,7 @@ enum PageState } -%> - - - - - -Gradido Login Server: Email Verification - - - - - +%><%@ include file="header.cpsp" %>

Einen neuen Account anlegen

@@ -79,8 +55,4 @@ label:not(.grd_radio_label) {
<% } %>
-
- <%= mTimeProfiler.string() %> -
- - +<%@ include file="footer.cpsp" %> diff --git a/src/cpsp/checkTransaction.cpsp b/src/cpsp/checkTransaction.cpsp index 219ed8857..17d42f8a6 100644 --- a/src/cpsp/checkTransaction.cpsp +++ b/src/cpsp/checkTransaction.cpsp @@ -17,6 +17,8 @@ enum PageState { %> <%% + const char* pageName = "Überprüfe Transaktion"; + PageState state = PAGE_NO_TRANSACTIONS; size_t notReadyTransactions = 0; size_t sumTransactions = mSession->getProcessingTransactionCount(); @@ -49,33 +51,7 @@ enum PageState { } } -%> - - - - - -Gradido Login Server: Überprüfe Transaktion - - - - - +%><%@ include file="header.cpsp" %>

Eine Transaktion prüfen

<%= getErrorsHtml() %> @@ -127,8 +103,4 @@ label:not(.grd_radio_label) {
<% } %>
-
- <%= mTimeProfiler.string() %> -
- - \ No newline at end of file +<%@ include file="footer.cpsp" %> \ No newline at end of file diff --git a/src/cpsp/config.cpsp b/src/cpsp/config.cpsp index 2c33b6ba9..ef77e593c 100644 --- a/src/cpsp/config.cpsp +++ b/src/cpsp/config.cpsp @@ -2,18 +2,8 @@ <%@ page form="true" %> <%@ page compressed="true" %> <%! - -%> - - - - - -Gradido Login Server: Config - - - - + const char* pageName = "Config"; +%><%@ include file="header.cpsp" %>

Config

diff --git a/src/cpsp/dashboard.cpsp b/src/cpsp/dashboard.cpsp index 1132d4b8d..ba429b25c 100644 --- a/src/cpsp/dashboard.cpsp +++ b/src/cpsp/dashboard.cpsp @@ -10,24 +10,14 @@ #include "../ServerConfig.h" %> <% - + const char* pageName = "Dashboard"; //Poco::Net::NameValueCollection cookies; //request.getCookies(cookies); if(!form.empty()) { //form.get("email-verification-code") } auto uri_start = ServerConfig::g_serverPath;//request.serverParams().getServerName(); -%> - - - - - -Gradido Login Server: Dashboard - - - - +%><%@ include file="header.cpsp" %>

Willkommen <%= mSession->getUser()->getFirstName() %> <%= mSession->getUser()->getLastName() %>

<%= mSession->getErrorsHtml() %> @@ -49,8 +39,4 @@ Abmelden Account löschen
-
- <%= mTimeProfiler.string() %> -
- - +<%@ include file="footer.cpsp" %> diff --git a/src/cpsp/footer.cpsp b/src/cpsp/footer.cpsp new file mode 100644 index 000000000..138607f4d --- /dev/null +++ b/src/cpsp/footer.cpsp @@ -0,0 +1,5 @@ +
+ <%= mTimeProfiler.string() %> +
+ + \ No newline at end of file diff --git a/src/cpsp/header.cpsp b/src/cpsp/header.cpsp new file mode 100644 index 000000000..b30866ae9 --- /dev/null +++ b/src/cpsp/header.cpsp @@ -0,0 +1,51 @@ + + + + + +Gradido Login Server: <%= pageName %> + + + + + +
+

Login Server in Entwicklung

+

Alpha 0.4.1

+
\ No newline at end of file diff --git a/src/cpsp/login.cpsp b/src/cpsp/login.cpsp index 074c58d9e..94e720d15 100644 --- a/src/cpsp/login.cpsp +++ b/src/cpsp/login.cpsp @@ -15,7 +15,7 @@ %> <%% - + const char* pageName = "Login"; auto sm = SessionManager::getInstance(); if(!form.empty()) { @@ -70,33 +70,7 @@ sm->deleteLoginCookies(request, response); } -%> - - - - - -Gradido Login Server: Login - - - - - +%><%@ include file="header.cpsp" %>

Login

@@ -116,11 +90,8 @@ label:not(.grd_radio_label) {

Du hast noch keinen Account? Dann folge dem Link um dir einen anzulegen

- Neuen Account anlegen -
-
- <%= mTimeProfiler.string() %> + Neuen Account anlegen
+ - - \ No newline at end of file +<%@ include file="footer.cpsp" %> \ No newline at end of file diff --git a/src/cpsp/passphrase.cpsp b/src/cpsp/passphrase.cpsp index e1a3f1bcd..105718b00 100644 --- a/src/cpsp/passphrase.cpsp +++ b/src/cpsp/passphrase.cpsp @@ -17,6 +17,7 @@ enum PageState }; %> <%% + const char* pageName = "Passphrase"; PageState state = PAGE_ASK_PASSPHRASE; auto sm = SessionManager::getInstance(); @@ -52,33 +53,7 @@ enum PageState mSession->updateState(SESSION_STATE_PASSPHRASE_SHOWN); } getErrors(mSession); -%> - - - - - -Gradido Login Server: Passphrase - - - - - +%><%@ include file="header.cpsp" %>

Einen neuen Account anlegen

<%= getErrorsHtml() %> @@ -117,8 +92,4 @@ label:not(.grd_radio_label) {
<% } %>
-
- <%= mTimeProfiler.string() %> -
- - +<%@ include file="footer.cpsp" %> diff --git a/src/cpsp/register.cpsp b/src/cpsp/register.cpsp index b39aa0691..459c874e9 100644 --- a/src/cpsp/register.cpsp +++ b/src/cpsp/register.cpsp @@ -8,6 +8,7 @@ #include "Poco/Net/HTTPCookie.h" %> <%% + const char* pageName = "Registrieren"; auto sm = SessionManager::getInstance(); bool userReturned = false; @@ -38,33 +39,7 @@ // remove old cookies if exist sm->deleteLoginCookies(request, response); } -%> - - - - - -Gradido Login Server: Register - - - - - +%><%@ include file="header.cpsp" %>

Einen neuen Account anlegen

<%= getErrorsHtml() %> @@ -107,8 +82,4 @@ label:not(.grd_radio_label) { <% } %>
-
- <%= mTimeProfiler.string() %> -
- - +<%@ include file="footer.cpsp" %> diff --git a/src/cpsp/saveKeys.cpsp b/src/cpsp/saveKeys.cpsp index 216d3badf..575e31dbb 100644 --- a/src/cpsp/saveKeys.cpsp +++ b/src/cpsp/saveKeys.cpsp @@ -18,13 +18,19 @@ enum PageState %> <%% - + const char* pageName = "Daten auf Server speichern?"; bool hasErrors = mSession->errorCount() > 0; // crypto key only in memory, if user has tipped in his passwort in this session bool hasPassword = mSession->getUser()->hasCryptoKey(); PageState state = PAGE_ASK; auto uri_start = ServerConfig::g_serverPath;//request.serverParams().getServerName(); + // skip asking user if he like to save keys and passphrase on server + state = PAGE_SHOW_PUBKEY; + if(!mSession->generateKeys(true, true)) { + getErrors(mSession); + } + if(!form.empty()) { // privkey auto savePrivkeyChoice = form.get("save-privkey"); @@ -65,33 +71,7 @@ enum PageState //hasErrors, mSession->getSessionState(), SESSION_STATE_KEY_PAIR_GENERATED); } getErrors(mSession); -%> - - - - - -Gradido Login Server: Daten auf Server speichern? - - - - - +%><%@ include file="header.cpsp" %>

Daten speichern

<%= getErrorsHtml() %> @@ -139,11 +119,12 @@ label:not(.grd_radio_label) { <% } else if(state == PAGE_SHOW_PUBKEY) { %>
-

Je nach Auswahl werden deine Daten nun verschlüsselt und gespeichert.

-

Deine Gradido Adresse (Hex):

+ +

Deine Daten werden nun verschlüsselt und gespeichert.

+ Zurück zur Startseite
<% } else if(state == PAGE_ERROR) { %> @@ -153,8 +134,4 @@ label:not(.grd_radio_label) {
<% } %> -
- <%= mTimeProfiler.string() %> -
- - +<%@ include file="footer.cpsp" %> diff --git a/src/cpsp/updateUser.cpsp b/src/cpsp/updateUser.cpsp index 9553f9347..8b39eee5b 100644 --- a/src/cpsp/updateUser.cpsp +++ b/src/cpsp/updateUser.cpsp @@ -10,6 +10,7 @@ #include "../model/Profiler.h" %> <%% + const char* pageName = "Update"; Profiler timeUsed; auto user = mSession->getUser(); @@ -25,33 +26,7 @@ } } } -%> - - - - - -Gradido Login Server: Register - - - - - +%><%@ include file="header.cpsp" %>

Einen neuen Account anlegen

<% if(!form.empty()) {%> @@ -91,8 +66,4 @@ label:not(.grd_radio_label) { <% } %>
-
- s<%= timeUsed.string() %> -
- - +<%@ include file="footer.cpsp" %> diff --git a/src/cpsp/updateUserPassword.cpsp b/src/cpsp/updateUserPassword.cpsp index 9e68f853a..240e6d75a 100644 --- a/src/cpsp/updateUserPassword.cpsp +++ b/src/cpsp/updateUserPassword.cpsp @@ -9,6 +9,7 @@ #include "../ServerConfig.h" %> <%% + const char* pageName = "Passwort bestimmen"; auto user = mSession->getUser(); auto sm = SessionManager::getInstance(); auto uri_start = ServerConfig::g_serverPath; @@ -38,48 +39,7 @@ } getErrors(mSession); getErrors(user); -%> - - - - - -Gradido Login Server: Passwort bestimmen - - - - - +%><%@ include file="header.cpsp" %>

Passwort bestimmen

<%= getErrorsHtml() %> @@ -101,8 +61,4 @@ label:not(.grd_radio_label) {
-
- <%= mTimeProfiler.string() %> -
- - +<%@ include file="footer.cpsp" %>