diff options
| author | Simon Rettberg | 2017-03-01 12:35:33 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-03-01 12:35:33 +0100 |
| commit | 2c95472fc14f97898b5dd74987674a4f92a5d75f (patch) | |
| tree | 415ee396b0573caa12e967c4a1b3ab60ab757c10 /dozentenmodulserver/src/main/java/org/openslx | |
| parent | [server] Support rejecting users by defaulf if they don't have a DB entry yet (diff) | |
| download | tutor-module-2c95472fc14f97898b5dd74987674a4f92a5d75f.tar.gz tutor-module-2c95472fc14f97898b5dd74987674a4f92a5d75f.tar.xz tutor-module-2c95472fc14f97898b5dd74987674a4f92a5d75f.zip | |
[server] Add headers to outgoing mails that prevent auto-responders from triggering
Solves #3078
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx')
3 files changed, 9 insertions, 3 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailQueue.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailQueue.java index 37871049..9869ecb8 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailQueue.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailQueue.java @@ -206,7 +206,8 @@ public class MailQueue { if (fullMessage.contains("\n")) { fullMessage = fullMessage.replace("\n", "\r\n"); } - return smtpc.send(user.eMail, "[bwLehrpool] Hinweise zu Ihren VMs/Veranstaltungen", fullMessage); + return smtpc.send(user.eMail, "[bwLehrpool] Hinweise zu Ihren VMs/Veranstaltungen", fullMessage, + "<sat.bwlehrpool.de>"); } } diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/SmtpMailer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/SmtpMailer.java index e225e0a8..9b0d38bd 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/SmtpMailer.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/SmtpMailer.java @@ -115,7 +115,7 @@ public class SmtpMailer { throw new IOException("Cannot abort current mail transaction"); } - public boolean send(String recipient, String subject, String message) { + public boolean send(String recipient, String subject, String message, String listId) { Writer writer; SimpleSMTPHeader header; @@ -124,6 +124,11 @@ public class SmtpMailer { if (!Util.isEmptyString(replyTo)) { header.addHeaderField("Reply-To", replyTo); } + if (!Util.isEmptyString(listId)) { + header.addHeaderField("List-Id", listId); + header.addHeaderField("Precedence", "bulk"); + header.addHeaderField("Auto-Submitted", "auto-generated"); + } header.addHeaderField("Content-Type", "text/plain; charset=utf-8"); header.addHeaderField("Content-Transfer-Encoding", "8bit"); diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebRpc.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebRpc.java index e6cc0d73..5fecf748 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebRpc.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebRpc.java @@ -123,7 +123,7 @@ public class WebRpc { String msg = template.format(templateArgs); - ret = smtpc.send(recipient, "bwLehrpool Mail Test", msg); + ret = smtpc.send(recipient, "bwLehrpool Mail Test", msg, "<sat.bwlehrpool.de>"); } try { baos.write(("\n\n-----------------------------------------\nTestergebnis: " + (ret ? "" : "nicht ") |