diff options
author | =Corey Hulen <corey@hulen.com> | 2015-10-19 10:25:51 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-10-19 10:25:51 -0700 |
commit | 468f01dc895000211e62eb8a16feaa84ceb354ed (patch) | |
tree | 4868b46316bb79cf5c127f5b0638f3383a7c971c /utils | |
parent | a8f3f76c592928a0907fbaddd71ab6b8f68d28d6 (diff) | |
parent | ea1b3129688dd76c80c7d41eec4f2eb60f9f0639 (diff) | |
download | chat-468f01dc895000211e62eb8a16feaa84ceb354ed.tar.gz chat-468f01dc895000211e62eb8a16feaa84ceb354ed.tar.bz2 chat-468f01dc895000211e62eb8a16feaa84ceb354ed.zip |
Merging from master
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 := "" |