IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

s

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2019-10-10 04:32:42 +00:00
parent 8fcd28d189
commit 33c20699cf
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependencies/iroha-ed25519 vendored

@ -1 +1 @@
Subproject commit 7307ffb8a89d2459f0c07ea5cab27c0d3496df00
Subproject commit a0977c22d23f7e8cb596f1d9d812de74115f407b

1
src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp
View File

@ -38,6 +38,7 @@ Poco::Net::HTTPRequestHandler* PageRequestHandlerFactory::createRequestHandler(c
}
if (url_first_part == "/elopage_webhook_261") {
printf("choose elopage\n");
return new ElopageWebhook;
}

2
src/cpp/ServerConfig.cpp
View File

@ -125,7 +125,7 @@ namespace ServerConfig {
}
}
void writeToFile(std::istream& datas, std::string& fileName)
void writeToFile(std::istream& datas, std::string fileName)
{
static Poco::Mutex mutex;

2
src/cpp/ServerConfig.h
View File

@ -35,7 +35,7 @@ namespace ServerConfig {
bool initEMailAccount(const Poco::Util::LayeredConfiguration& cfg);
bool initSSLClientContext();
void writeToFile(std::istream& datas, std::string& fileName);
void writeToFile(std::istream& datas, std::string fileName);
void unload();
};

8
src/cpp/model/Session.cpp
View File

@ -297,11 +297,15 @@ bool Session::isPwdValid(const std::string& pwd)
bool Session::loadUser(const std::string& email, const std::string& password)
{
Profiler usedTime;
//Profiler usedTime;
if (email == "" || password == "") {
addError(new Error("Login", "Benutzernamen und Passwort müssen angegeben werden!"));
return false;
}
if (mSessionUser) mSessionUser = nullptr;
mSessionUser = new User(email.data());
if (!mSessionUser->validatePwd(password)) {
addError(new Error("Login", "E-Mail oder Passwort nicht korrekt, bitte versuche es erneut"));
addError(new Error("Login", "E-Mail oder Passwort nicht korrekt, bitte versuche es erneut!"));
return false;
}
detectSessionState();