SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'bugfix/mail-constants' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m17s
Details
Build Docker Image / Clean-Registry (push) Successful in 0s
Details

Browse Source
This commit is contained in:
Stephan Richter
2026-01-19 22:49:04 +01:00
parent 5a745659b9 8c351440c8
commit be2235b873
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
messages/src/main/java/de/srsoftware/umbrella/message/Constants.java
View File

@@ -2,7 +2,6 @@
package de.srsoftware.umbrella.message;
public class Constants {
public static final String AUTH = "mail.smtp.auth";
public static final String CONFIG_DB = "umbrella.modules.message.database";
public static final String CONFIG_SMTP_HOST = "umbrella.modules.message.smtp.host";
@@ -11,13 +10,11 @@ public class Constants {
public static final String CONFIG_SMTP_USER = "umbrella.modules.message.smtp.user";
public static final String DEBUG_ADDREESS = "umbrella.modules.message.debug_address";
public static final String ENVELOPE_FROM = "mail.smtp.from";
public static final String FIELD_MESSAGES = "messages";
public static final String FIELD_HOST = "host";
public static final String FIELD_PORT = "port";
public static final String HOST = "mail.smtp.host";
public static final String PORT = "mail.smtp.port";
public static final String SSL = "mail.smtp.ssl.enable";
public static final String SMTP_AUTH = "mail.smtp.auth";
public static final String SMTP_HOST = "mail.smtp.host";
public static final String SMTP_FROM = "mail.smtp.from";
public static final String SMTP_PORT = "mail.smtp.port";
public static final String SMTP_SSL = "mail.smtp.ssl.enable";
public static final String SUBMISSION = "submission";
}

10
messages/src/main/java/de/srsoftware/umbrella/message/MessageSystem.java
View File

@@ -317,11 +317,11 @@ public class MessageSystem extends BaseHandler implements PostBox, EventListener
private Session session() {
if (session == null){
Properties props = new Properties();
props.put(HOST, host);
props.put(PORT, port);
props.put(AUTH, true);
props.put(SSL, true);
props.put(ENVELOPE_FROM,from);
props.put(SMTP_HOST, host);
props.put(SMTP_PORT, port);
props.put(SMTP_AUTH, true);
props.put(SMTP_SSL, true);
props.put(SMTP_FROM,from);
session = Session.getInstance(props);
}
return session;