user gomail and new activate account email tpl

- #1496: fallback plain text
- #1002: add date header
- #913: fix encoding of header

routers/dev/template.go

@@ -20,5 +20,6 @@ func TemplatePreview(ctx *middleware.Context) {
 	ctx.Data["ActiveCodeLives"] = setting.Service.ActiveCodeLives / 60
 	ctx.Data["ResetPwdCodeLives"] = setting.Service.ResetPwdCodeLives / 60
 	ctx.Data["CurDbValue"] = ""
+
 	ctx.HTML(200, base.TplName(ctx.Params("*")))
 }

routers/install.go

@@ -45,6 +45,7 @@ func checkRunMode() {
 
 func NewServices() {
 	setting.NewServices()
+	mailer.NewContext()
 	social.NewOauthService()
 }
 
@@ -53,7 +54,6 @@ func GlobalInit() {
 	setting.NewContext()
 	log.Trace("Custom path: %s", setting.CustomPath)
 	log.Trace("Log path: %s", setting.LogRootPath)
-	mailer.NewContext()
 	models.LoadConfigs()
 	NewServices()
 

routers/user/auth.go

@@ -249,7 +249,7 @@ func SignUpPost(ctx *middleware.Context, cpt *captcha.Captcha, form auth.Registe
 
 	// Send confirmation e-mail, no need for social account.
 	if !isOauth && setting.Service.RegisterEmailConfirm && u.Id > 1 {
-		mailer.SendRegisterMail(ctx.Render, u)
+		mailer.SendActivateAccountMail(ctx.Context, u)
 		ctx.Data["IsSendRegisterMail"] = true
 		ctx.Data["Email"] = u.Email
 		ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60
@@ -278,7 +278,7 @@ func Activate(ctx *middleware.Context) {
 				ctx.Data["ResendLimited"] = true
 			} else {
 				ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60
-				mailer.SendActiveMail(ctx.Render, ctx.User)
+				mailer.SendActivateAccountMail(ctx.Context, ctx.User)
 
 				if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil {
 					log.Error(4, "Set cache(MailResendLimit) fail: %v", err)

routers/user/setting.go

@@ -225,7 +225,7 @@ func SettingsEmailPost(ctx *middleware.Context, form auth.AddEmailForm) {
 
 	// Send confirmation e-mail
 	if setting.Service.RegisterEmailConfirm {
-		mailer.SendActivateEmail(ctx.Render, ctx.User, e)
+		mailer.SendActivateEmailMail(ctx.Context, ctx.User, e)
 
 		if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil {
 			log.Error(4, "Set cache(MailResendLimit) fail: %v", err)