diff options
author | Corey Hulen <corey@hulen.com> | 2015-10-19 09:37:01 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-10-19 09:37:01 -0700 |
commit | d776d1aa0c7416a2c96da17e9cc2b7ad7f6a7fca (patch) | |
tree | f7057aa2275957c6d9bd6265aba93c323f13636d /utils | |
parent | 00c06fac43ff85c64f7c8eaf109aa66e479ea7c1 (diff) | |
parent | 830c6b3f1ebdfc38ca8ee0e6c672301fbe884e21 (diff) | |
download | chat-d776d1aa0c7416a2c96da17e9cc2b7ad7f6a7fca.tar.gz chat-d776d1aa0c7416a2c96da17e9cc2b7ad7f6a7fca.tar.bz2 chat-d776d1aa0c7416a2c96da17e9cc2b7ad7f6a7fca.zip |
Merge pull request #1067 from layzerar/fix_email_encoding
Fix email encoding issue
Diffstat (limited to 'utils')
-rw-r--r-- | utils/mail.go | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/utils/mail.go b/utils/mail.go index c91c15a6a..07a79eeb2 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -6,15 +6,22 @@ package utils import ( l4g "code.google.com/p/log4go" "crypto/tls" + "encoding/base64" "fmt" "github.com/mattermost/platform/model" - "html" "net" "net/mail" "net/smtp" "time" ) +func encodeRFC2047Word(s string) string { + // TODO: use `mime.BEncoding.Encode` instead when `go` >= 1.5 + // return mime.BEncoding.Encode("utf-8", s) + dst := base64.StdEncoding.EncodeToString([]byte(s)) + return "=?utf-8?b?" + dst + "?=" +} + func connectToSMTPServer(config *model.Config) (net.Conn, *model.AppError) { var conn net.Conn var err error @@ -102,9 +109,10 @@ func SendMailUsingConfig(to, subject, body string, config *model.Config) *model. headers := make(map[string]string) headers["From"] = fromMail.String() headers["To"] = toMail.String() - headers["Subject"] = html.UnescapeString(subject) + headers["Subject"] = encodeRFC2047Word(subject) headers["MIME-version"] = "1.0" - headers["Content-Type"] = "text/html" + headers["Content-Type"] = "text/html; charset=\"utf-8\"" + headers["Content-Transfer-Encoding"] = "8bit" headers["Date"] = time.Now().Format(time.RFC1123Z) message := "" |