diff options
Diffstat (limited to 'routers/user')
| -rw-r--r-- | routers/user/auth.go | 7 | ||||
| -rw-r--r-- | routers/user/setting.go | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/routers/user/auth.go b/routers/user/auth.go index cd929fa7..fe1c22fe 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -15,6 +15,7 @@ import ( "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" "github.com/gogits/gogs/modules/log" + "github.com/gogits/gogs/modules/mailer" "github.com/gogits/gogs/modules/setting" ) @@ -228,7 +229,7 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterFo // Send confirmation email, no need for social account. if setting.Service.RegisterEmailConfirm && u.ID > 1 { - models.SendActivateAccountMail(ctx.Context, u) + mailer.SendActivateAccountMail(ctx.Context, models.NewMailerUser(u)) ctx.Data["IsSendRegisterMail"] = true ctx.Data["Email"] = u.Email ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 @@ -257,7 +258,7 @@ func Activate(ctx *context.Context) { ctx.Data["ResendLimited"] = true } else { ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 - models.SendActivateAccountMail(ctx.Context, ctx.User) + mailer.SendActivateAccountMail(ctx.Context, models.NewMailerUser(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) @@ -367,7 +368,7 @@ func ForgotPasswdPost(ctx *context.Context) { return } - models.SendResetPasswordMail(ctx.Context, u) + mailer.SendResetPasswordMail(ctx.Context, models.NewMailerUser(u)) if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil { log.Error(4, "Set cache(MailResendLimit) fail: %v", err) } diff --git a/routers/user/setting.go b/routers/user/setting.go index ade5967c..96e7a09c 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -17,6 +17,7 @@ import ( "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" "github.com/gogits/gogs/modules/log" + "github.com/gogits/gogs/modules/mailer" "github.com/gogits/gogs/modules/setting" ) @@ -266,7 +267,7 @@ func SettingsEmailPost(ctx *context.Context, form auth.AddEmailForm) { // Send confirmation email if setting.Service.RegisterEmailConfirm { - models.SendActivateEmailMail(ctx.Context, ctx.User, email) + mailer.SendActivateEmailMail(ctx.Context, models.NewMailerUser(ctx.User), email.Email) if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil { log.Error(4, "Set cache(MailResendLimit) fail: %v", err) |