work also without email infos

This commit is contained in:
Dario 2020-05-07 17:12:22 +02:00
parent 5207918a67
commit b1b0c9a234
2 changed files with 15 additions and 11 deletions

View File

@ -116,11 +116,13 @@ namespace ServerConfig {
if (g_disableEmail) {
printf("Email is disabled!\n");
}
g_EmailAccount.sender = cfg.getString("email.sender");
g_EmailAccount.username = cfg.getString("email.username");
g_EmailAccount.password = cfg.getString("email.password");
g_EmailAccount.url = cfg.getString("email.smtp.url");
g_EmailAccount.port = cfg.getInt("email.smtp.port");
else {
g_EmailAccount.sender = cfg.getString("email.sender");
g_EmailAccount.username = cfg.getString("email.username");
g_EmailAccount.password = cfg.getString("email.password");
g_EmailAccount.url = cfg.getString("email.smtp.url");
g_EmailAccount.port = cfg.getInt("email.smtp.port");
}
DISASM_FALSERET;
//g_ServerKeySeed->put(3, DRRandom::r64());
return true;

View File

@ -33,12 +33,14 @@ bool EmailManager::init(const Poco::Util::LayeredConfiguration& cfg)
{
try {
mDisableEmail = cfg.getBool("email.disable", false);
mEmailAccount.sender = cfg.getString("email.sender");
mEmailAccount.admin_receiver = cfg.getString("email.admin_receiver");
mEmailAccount.username = cfg.getString("email.username");
mEmailAccount.password = cfg.getString("email.password");
mEmailAccount.url = cfg.getString("email.smtp.url");
mEmailAccount.port = cfg.getInt("email.smtp.port");
if (!mDisableEmail) {
mEmailAccount.sender = cfg.getString("email.sender");
mEmailAccount.admin_receiver = cfg.getString("email.admin_receiver");
mEmailAccount.username = cfg.getString("email.username");
mEmailAccount.password = cfg.getString("email.password");
mEmailAccount.url = cfg.getString("email.smtp.url");
mEmailAccount.port = cfg.getInt("email.smtp.port");
}
}
catch (Poco::Exception& ex) {
printf("email account not set in config: %s\n", ex.displayText().data());