diff --git a/src/cpp/lib/ErrorList.cpp b/src/cpp/lib/ErrorList.cpp index 4ba9cdcee..6f2182eb1 100644 --- a/src/cpp/lib/ErrorList.cpp +++ b/src/cpp/lib/ErrorList.cpp @@ -14,7 +14,9 @@ SendErrorMessage::~SendErrorMessage() int SendErrorMessage::run() { - //return 0; +#ifdef DISABLE_EMAIL + return 0; +#endif auto mailClientSession = new Poco::Net::SecureSMTPClientSession(ServerConfig::g_EmailAccount.url, ServerConfig::g_EmailAccount.port); mailClientSession->login(); diff --git a/src/cpp/model/User.h b/src/cpp/model/User.h index 6c56f39ce..99c6a1249 100644 --- a/src/cpp/model/User.h +++ b/src/cpp/model/User.h @@ -12,7 +12,7 @@ #include "../tasks/CPUTask.h" #include "../SingletonManager/MemoryManager.h" - +#include "../SingletonManager/LanguageManager.h" class UserCreateCryptoKey; class UserWriteIntoDB; @@ -20,7 +20,7 @@ class Session; class UserWriteCryptoKeyHashIntoDB; class SigningTransaction; class UserGenerateKeys; -enum Languages; + enum UserStates { diff --git a/src/cpp/tasks/PrepareEmailTask.cpp b/src/cpp/tasks/PrepareEmailTask.cpp index 7e788dad5..4da2147a7 100644 --- a/src/cpp/tasks/PrepareEmailTask.cpp +++ b/src/cpp/tasks/PrepareEmailTask.cpp @@ -20,7 +20,9 @@ PrepareEmailTask::~PrepareEmailTask() int PrepareEmailTask::run() { - //return 0; +#ifdef DISABLE_EMAIL + return 0; +#endif Profiler timeUsed; mMailClientSession = new Poco::Net::SecureSMTPClientSession(ServerConfig::g_EmailAccount.url, ServerConfig::g_EmailAccount.port); mMailClientSession->login(); @@ -49,6 +51,9 @@ int PrepareEmailTask::run() int PrepareEmailTask::send(Poco::Net::MailMessage* message) { +#ifdef DISABLE_EMAIL + return 0; +#endif auto er = ErrorManager::getInstance(); try { mMailClientSession->sendMessage(*message); diff --git a/src/cpp/tasks/SendEmailTask.cpp b/src/cpp/tasks/SendEmailTask.cpp index bef81afdf..027807b13 100644 --- a/src/cpp/tasks/SendEmailTask.cpp +++ b/src/cpp/tasks/SendEmailTask.cpp @@ -21,7 +21,9 @@ SendEmailTask::~SendEmailTask() int SendEmailTask::run() { - //return 0; +#ifdef DISABLE_EMAIL + return 0; +#endif Profiler timeUsed; auto er = ErrorManager::getInstance(); auto parent = getParent(0); diff --git a/src/cpsp/header.cpsp b/src/cpsp/header.cpsp index 3fd21f9e1..b7fb3b47a 100644 --- a/src/cpsp/header.cpsp +++ b/src/cpsp/header.cpsp @@ -12,7 +12,7 @@

Login Server in Entwicklung

-

Alpha 0.8.0

+

Alpha 0.8.1