diff --git a/src/cpsp/footer.cpsp b/src/cpsp/footer.cpsp index 138607f4d..0117affe0 100644 --- a/src/cpsp/footer.cpsp +++ b/src/cpsp/footer.cpsp @@ -1,5 +1,15 @@ -
- <%= mTimeProfiler.string() %> -
+
+

Copyright © Gradido 2020

+
+ +
+ <%= mTimeProfiler.string() %> +
+
+

Login Server in Entwicklung

+

Alpha <%= ServerConfig::g_versionString %>

+
+ + \ No newline at end of file diff --git a/src/cpsp/header.cpsp b/src/cpsp/header.cpsp index 0a413dd46..6e93f4b93 100644 --- a/src/cpsp/header.cpsp +++ b/src/cpsp/header.cpsp @@ -1,7 +1,7 @@ -<%! -#include "../ServerConfig.h" -%><%% - bool withMaterialIcons = false; +<%! +#include "../ServerConfig.h" +%><%% + bool withMaterialIcons = false; %> @@ -9,21 +9,21 @@ Gradido Login Server: <%= pageName %> - + <% if(withMaterialIcons) { %> <% } %> - -
-

Login Server in Entwicklung

-

Alpha <%= ServerConfig::g_versionString %>

-
- \ No newline at end of file + +
+
+
+ +
+ <%= getErrorsHtml() %> diff --git a/src/cpsp/resetPassword.cpsp b/src/cpsp/resetPassword.cpsp index 1b423ce3c..ebd6abd21 100644 --- a/src/cpsp/resetPassword.cpsp +++ b/src/cpsp/resetPassword.cpsp @@ -3,79 +3,79 @@ <%@ page baseClass="PageRequestMessagedHandler" %> <%@ header include="PageRequestMessagedHandler.h" %> <%@ page compressed="true" %> -<%! +<%! #include "../SingletonManager/LanguageManager.h" #include "../SingletonManager/SessionManager.h" #include "../SingletonManager/EmailManager.h" #include "../controller/User.h" #include "../controller/UserBackups.h" - + enum PageState { PAGE_EMAIL_ASK, PAGE_ASK, PAGE_WAIT_EMAIL, PAGE_WAIT_ADMIN, PAGE_EMAIL_ALREADY_SEND - + }; -%><%% +%><%% PageState state = PAGE_EMAIL_ASK; auto lm = LanguageManager::getInstance(); auto sm = SessionManager::getInstance(); auto adminReceiver = EmailManager::getInstance()->getAdminReceiver(); - + const char* pageName = "Passwort vergessen"; auto lang = chooseLanguage(request); - + // class="btn btn-outline-secondary flag-btn" // class="btn btn-secondary disabled flag-btn" disabled std::string eng_btn_classes = ""; std::string de_btn_classes = ""; - + auto langCatalog = lm->getFreeCatalog(lang); - + std::string emailInputClass = "form-control"; std::string passphraseRadioClass = "group"; - + std::string email = ""; - + if(!form.empty()) { - auto session = sm->getNewSession(); + auto session = sm->getNewSession(); email = form.get("email", ""); auto passphraseMemorized = form.get("passphrase_memorized", ""); auto user = controller::User::create(); auto ask = form.get("ask_passphrase", ""); - - if(email != "") + + if(email != "") { bool user_exist = false; bool sendUserEmail = false; - + if(!sm->isValid(email, VALIDATE_EMAIL)) { addError(new Error(gettext(session, "E-Mail"), gettext(session, "Das ist keine gültige E-Mail Adresse")), false); - emailInputClass += " is-invalid"; + emailInputClass += " is-invalid"; } user_exist = user->load(email) == 1; - - if(ask == "true") + + if(ask == "true") { if(passphraseMemorized == "") { addError(new Error(gettext(session, "Passphrase"), gettext(session, "Bitte wähle eine Option aus.")), false); - passphraseRadioClass += " group-is-invalid"; + passphraseRadioClass += " group-is-invalid"; } else if(passphraseMemorized == "true") { sendUserEmail = true; } - - } + + } else { if(user_exist && (!user->tryLoadPassphraseUserBackup() || !user->hasPublicKey())) { sendUserEmail = true; } } - - if(!errorCount()) + + if(!errorCount()) { // send reset password email int result = 0; @@ -90,56 +90,41 @@ enum PageState { } else { state = PAGE_WAIT_ADMIN; } - } - } - else + } + } + else { addError(new Error(gettext(session, "E-Mail"), gettext(session, "E-Mail Adresse nicht angegeben.")), false); - emailInputClass += " is-invalid"; + emailInputClass += " is-invalid"; } - - } - - -%><%@ include file="login_header.cpsp" %> - + } + + +%><%@ include file="header.cpsp" %> <% if(state == PAGE_EMAIL_ASK) { %> -
-
-
- - -
- -
-
+
+
+

Passwort zurücksetzen

+
+
+
+
+
+ + +
+ +
+
<% } else if(state == PAGE_ASK) { %> <%@ include file="flags.cpsp" %>
- + - +
@@ -166,7 +151,7 @@ enum PageState {

<%= langCatalog->gettext("Du hast wirklich keine E-Mail erhalten und auch schon ein paar Minuten gewartet?") %>

<%= langCatalog->gettext("E-Mail an Support schicken")%>

<% } %> -
+