summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/setting/setting.go9
1 files changed, 9 insertions, 0 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index b3a932e91c..7696c09127 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -6,6 +6,7 @@ package setting
import (
"fmt"
+ "net/mail"
"net/url"
"os"
"os/exec"
@@ -714,6 +715,7 @@ type Mailer struct {
Name string
Host string
From string
+ FromEmail string
User, Passwd string
DisableHelo bool
HeloHostname string
@@ -749,6 +751,13 @@ func newMailService() {
EnableHTMLAlternative: sec.Key("ENABLE_HTML_ALTERNATIVE").MustBool(),
}
MailService.From = sec.Key("FROM").MustString(MailService.User)
+
+ parsed, err := mail.ParseAddress(MailService.From)
+ if err != nil {
+ log.Fatal(4, "Invalid mailer.FROM (%s): %v", MailService.From, err)
+ }
+ MailService.FromEmail = parsed.Address
+
log.Info("Mail Service Enabled")
}