Skip to content

The Unified and Autonomous Development Platform

Fix issue #1335 - Use brand name in From header of sent emails

Robin Shen1ac69578c204
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
index db6c9e6e7b..c032a0911e 100644
--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
@@ -291,10 +291,15 @@ public class DefaultMailManager implements MailManager, Serializable {
message.addHeader(entry.getKey(), createFoldedHeaderValue(entry.getKey(), entry.getValue()));
}
- if (senderName == null)
- senderName = QUOTE_MARK;
- else
+ var brandName = settingManager.getBrandingSetting().getName();
+ if (senderName == null || senderName.equalsIgnoreCase(User.SYSTEM_NAME)) {
+ if (brandName.equalsIgnoreCase(User.SYSTEM_NAME))
+ senderName = QUOTE_MARK;
+ else
+ senderName = brandName + " " + QUOTE_MARK;
+ } else {
senderName += " " + QUOTE_MARK;
+ }
message.setFrom(createInetAddress(sendSetting.getSenderAddress(), senderName));
if (toList.isEmpty() && ccList.isEmpty() && bccList.isEmpty())