github-mirror/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-26 10:14:08 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Parse the from string to extract the email address

Browse Source
This commit is contained in:
Peter 2014-12-19 23:06:03 +02:00
parent edbe1de026
commit c884ecfea1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/app.ini
View File

@ -98,7 +98,7 @@ SUBJECT = %(APP_NAME)s
HOST =
; Do not verify the certificate of the server. Only use this for self-signed certificates
SKIP_VERIFY =
; Mail from address. This can be just an email address, or the "Name" <email@example.com> format (including the quotes and brackets)
; Mail from address, RFC 5322. This can be just an email address, or the "Name" <email@example.com> format
FROM =
; Mailer user name and password
USER =

7
modules/mailer/mailer.go
View File

@ -8,6 +8,7 @@ import (
"crypto/tls"
"fmt"
"net"
"net/mail"
"net/smtp"
"strings"
@ -124,8 +125,12 @@ func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte)
}
}
if err = client.Mail(settings.From); err != nil {
if fromAddress, err := mail.ParseAddress(settings.From); err != nil {
return err
} else {
if err = client.Mail(fromAddress.Address); err != nil {
return err
}
}
for _, rec := range recipients {