From fc1999d960ee6ce4244cc84c9ea5baa04475dc6f Mon Sep 17 00:00:00 2001 From: Dario Date: Wed, 27 Nov 2019 17:20:07 +0100 Subject: [PATCH] update passphrase description and using old header for pages not updated to new style --- src/cpp/HTTPInterface/DashboardPage.cpp | 52 ++++++++++++-------- src/cpp/HTTPInterface/PassphrasePage.cpp | 35 +++++++------ src/cpp/HTTPInterface/RegisterPage.cpp | 56 +++++++++++++++++---- src/cpsp/dashboard.cpsp | 2 +- src/cpsp/header_old.cpsp | 62 ++++++++++++++++++++++++ src/cpsp/passphrase.cpsp | 11 +++-- src/cpsp/register.cpsp | 2 +- 7 files changed, 171 insertions(+), 49 deletions(-) create mode 100644 src/cpsp/header_old.cpsp diff --git a/src/cpp/HTTPInterface/DashboardPage.cpp b/src/cpp/HTTPInterface/DashboardPage.cpp index 73fa4913a..d8e4a1ec3 100644 --- a/src/cpp/HTTPInterface/DashboardPage.cpp +++ b/src/cpp/HTTPInterface/DashboardPage.cpp @@ -9,7 +9,7 @@ #include "../SingletonManager/SessionManager.h" #include "Poco/Net/HTTPServerParams.h" -#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" +#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp" #include "../ServerConfig.h" @@ -41,20 +41,21 @@ void DashboardPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N //form.get("email-verification-code") } auto uri_start = ServerConfig::g_serverPath;//request.serverParams().getServerName(); - // begin include header.cpsp + response.redirect(ServerConfig::g_php_serverPath + "/"); + // begin include header_old.cpsp responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; - responseStream << "\n"; + responseStream << "\n"; responseStream << "Gradido Login Server: "; -#line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" +#line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.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.8.0

\n"; + responseStream << "\t

Alpha 0.8.1

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

Einen neuen Account anlegen

\n"; diff --git a/src/cpsp/dashboard.cpsp b/src/cpsp/dashboard.cpsp index 40d7570c7..a42bb0eb3 100644 --- a/src/cpsp/dashboard.cpsp +++ b/src/cpsp/dashboard.cpsp @@ -17,7 +17,7 @@ } auto uri_start = ServerConfig::g_serverPath;//request.serverParams().getServerName(); response.redirect(ServerConfig::g_php_serverPath + "/"); -%><%@ include file="header.cpsp" %> +%><%@ include file="header_old.cpsp" %>

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

<%= mSession->getErrorsHtml() %> diff --git a/src/cpsp/header_old.cpsp b/src/cpsp/header_old.cpsp new file mode 100644 index 000000000..2d4599515 --- /dev/null +++ b/src/cpsp/header_old.cpsp @@ -0,0 +1,62 @@ +<%! +#include "../ServerConfig.h" +%> + + + + + +Gradido Login Server: <%= pageName %> + + + + + +
+

Login Server in Entwicklung

+

Alpha 0.8.1

+
+ \ No newline at end of file diff --git a/src/cpsp/passphrase.cpsp b/src/cpsp/passphrase.cpsp index 8a2c44716..f17187332 100644 --- a/src/cpsp/passphrase.cpsp +++ b/src/cpsp/passphrase.cpsp @@ -51,18 +51,23 @@ enum PageState mSession->updateState(SESSION_STATE_PASSPHRASE_SHOWN); } getErrors(mSession); -%><%@ include file="header.cpsp" %> +%><%@ include file="header_old.cpsp" %>

Einen neuen Account anlegen

<%= getErrorsHtml() %> <% if(state == PAGE_SHOW_PASSPHRASE) {%>
- Schreibe dir die Passphrase auf und packe sie gut weg. Du brauchst sie um deine Adresse wiederherzustellen. Wenn du ihn verlierst, sind auch deine Gradidos verloren. + Schreibe dir die Passphrase auf und packe sie gut weg. Du brauchst sie um deine Adresse wiederherzustellen. Wenn du sie verlierst, sind auch deine Gradidos verloren.
-
+
<%= mSession->getPassphrase() %>
+
+

Was ist eine Passphrase?

+

Die Passphrase kommt aus dem Crypto-Bereich und ist ein Weg einen komplizierte kryptografischen Schlüssel in einer lesbaren Form darzustellen.

+

Der neue Gradido basiert technisch auf einer Kryptowährung (wie z.B. Bitcoin) um maximale Sicherheit zu erreichen.

+
Weiter
diff --git a/src/cpsp/register.cpsp b/src/cpsp/register.cpsp index a62651182..47f890bbb 100644 --- a/src/cpsp/register.cpsp +++ b/src/cpsp/register.cpsp @@ -39,7 +39,7 @@ // remove old cookies if exist sm->deleteLoginCookies(request, response); } -%><%@ include file="header.cpsp" %> +%><%@ include file="header_old.cpsp" %>

Einen neuen Account anlegen

<%= getErrorsHtml() %>