adding preprozessor definition for disable email send, include languageManager in user

This commit is contained in:
Dario 2019-11-25 11:51:50 +01:00
parent 34d13de9ad
commit 0fcce7c99f
5 changed files with 15 additions and 6 deletions

View File

@ -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();

View File

@ -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
{

View File

@ -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);

View File

@ -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);

View File

@ -12,7 +12,7 @@
<body>
<div class="versionstring dev-info">
<p class="grd_small">Login Server in Entwicklung</p>
<p class="grd_small">Alpha 0.8.0</p>
<p class="grd_small">Alpha 0.8.1</p>
</div>
<!--<nav class="grd-left-bar expanded" data-topbar role="navigation">
<div class="grd-left-bar-section">