- <%= langCatalog->gettext("Funktioniert dein E-Mail Verification Code nicht?")%>
- <%= langCatalog->gettext("Schicke uns eine E-Mail und wir kümmern uns darum: ")%>
- <%= langCatalog->gettext("E-Mail an Support schicken")%>
-
+ <%= langCatalog->gettext("Funktioniert dein E-Mail Verification Code nicht?")%>
+ <%= langCatalog->gettext("Schicke uns eine E-Mail und wir kümmern uns darum: ")%>
+ <%= langCatalog->gettext("E-Mail an Support schicken")%>
+
+
+ <% } %>
+
+
<%@ include file="footer.cpsp" %>
diff --git a/src/cpsp/header.cpsp b/src/cpsp/header.cpsp
index 6e93f4b93..c4a2c35d6 100644
--- a/src/cpsp/header.cpsp
+++ b/src/cpsp/header.cpsp
@@ -25,5 +25,4 @@
-
- <%= getErrorsHtml() %>
+
\ No newline at end of file
diff --git a/src/cpsp/login.cpsp b/src/cpsp/login.cpsp
index 273501653..70018bc79 100644
--- a/src/cpsp/login.cpsp
+++ b/src/cpsp/login.cpsp
@@ -4,7 +4,7 @@
<%@ page ctorArg="Session*" %>
<%@ header include="SessionHTTPRequestHandler.h" %>
<%@ page compressed="true" %>
-<%!
+<%!
#include "../gettext.h"
#include "Poco/Net/HTTPCookie.h"
@@ -13,25 +13,25 @@
#include "../SingletonManager/SessionManager.h"
#include "../SingletonManager/LanguageManager.h"
#include "../SingletonManager/ErrorManager.h"
-
+
%>
-<%%
+<%%
const char* pageName = "Login";
auto sm = SessionManager::getInstance();
auto lm = LanguageManager::getInstance();
auto em = ErrorManager::getInstance();
-
+
auto lang = chooseLanguage(request);
//printf("choose language return: %d\n", lang);
auto langCatalog = lm->getFreeCatalog(lang);
-
+
std::string presetEmail("");
if(mSession && mSession->getUser()) {
presetEmail = mSession->getUser()->getEmail();
}
-
+
if(!form.empty()) {
-
+
bool langUpdatedByBtn = false;
auto langBtn = form.get("lang", "");
if(langBtn != "") {
@@ -46,7 +46,7 @@
} else if(langInput != "") {
updatedLang = chooseLanguage(request, langInput);
}
-
+
if(updatedLang != LANG_NULL && updatedLang != lang) {
lang = updatedLang;
langCatalog = lm->getFreeCatalog(lang);
@@ -54,12 +54,12 @@
*/
auto email = form.get("login-email", "");
auto password = form.get("login-password", "");
-
+
if(email != "" && password != "") {
//auto session = sm->getSession(request);
//if(!mSession) mSession = sm->findByEmail(email);
if(!mSession) {
- mSession = sm->getNewSession();
+ mSession = sm->getNewSession();
mSession->setLanguageCatalog(langCatalog);
// get language
// first check url, second check language header
@@ -77,7 +77,7 @@
}
auto userState = mSession->loadUser(email, password);
auto user = mSession->getNewUser();
-
+
if(userState >= USER_LOADED_FROM_DB && !user->getModel()->getPublicKey()) {
if(mSession->generateKeys(true, true)) {
userState = USER_COMPLETE;
@@ -86,24 +86,24 @@
}
}
} else {
- //printf("pubkey exist: %p\n",user->getModel()->getPublicKey());
+ //printf("pubkey exist: %p\n",user->getModel()->getPublicKey());
}
getErrors(mSession);
-
+
auto uri_start = request.serverParams().getServerName();
auto lastExternReferer = mSession->getLastReferer();
-
+
//printf("userState: %d\n", userState);
-
+
switch(userState) {
- case USER_EMPTY:
+ case USER_EMPTY:
case USER_PASSWORD_INCORRECT:
addError(new Error(langCatalog->gettext("Login"), langCatalog->gettext("E-Mail or password isn't right, please try again!")), false);
break;
- case USER_PASSWORD_ENCRYPTION_IN_PROCESS:
+ case USER_PASSWORD_ENCRYPTION_IN_PROCESS:
addError(new Error(langCatalog->gettext("Passwort"), langCatalog->gettext("Passwort wird noch berechnet, bitte versuche es in etwa 1 Minute erneut.")), false);
break;
- case USER_KEYS_DONT_MATCH:
+ case USER_KEYS_DONT_MATCH:
addError(new Error(langCatalog->gettext("User"), langCatalog->gettext("Error in saved data, the server admin will look at it.")));
break;
case USER_DISABLED:
@@ -125,8 +125,8 @@
if(lastExternReferer != "") {
//printf("redirect to: %s\n", lastExternReferer.data());
response.redirect(lastExternReferer);
- } else if(refererString != "" &&
- refererString.find("login") == std::string::npos &&
+ } else if(refererString != "" &&
+ refererString.find("login") == std::string::npos &&
refererString.find("logout") == std::string::npos &&
refererString.find("user_delete") == std::string::npos &&
refererString != ServerConfig::g_serverPath + request.getURI()) {
@@ -139,13 +139,13 @@
}
return;
}
-
+
} else if(!langUpdatedByBtn) {
addError(new Error(langCatalog->gettext("Login"), langCatalog->gettext("Username and password are needed!")), false);
}
-
+
} else {
-
+
// on enter login page with empty form
//auto session = sm->getSession(request);
// remove old cookies and session if exist
@@ -154,69 +154,30 @@
sm->releaseSession(mSession);
}
sm->deleteLoginCookies(request, response);
- }
-
+ }
+
%><%@ include file="header.cpsp" %>
-
-
-