2 files changed, 11 insertions, 16 deletions
diff --git a/internal/route/admin/admin.go b/internal/route/admin/admin.go
index f11f0d10..1722c373 100644
--- a/internal/route/admin/admin.go
+++ b/internal/route/admin/admin.go
@@ -17,7 +17,7 @@ import (
 	"gogs.io/gogs/internal/context"
 	"gogs.io/gogs/internal/cron"
 	"gogs.io/gogs/internal/db"
-	"gogs.io/gogs/internal/mailer"
+	"gogs.io/gogs/internal/email"
 	"gogs.io/gogs/internal/process"
 	"gogs.io/gogs/internal/tool"
 )
@@ -180,12 +180,12 @@ func Dashboard(c *context.Context) {
 }
 
 func SendTestMail(c *context.Context) {
-	email := c.Query("email")
+	emailAddr := c.Query("email")
 	// Send a test email to the user's email address and redirect back to Config
-	if err := mailer.SendTestMail(email); err != nil {
-		c.Flash.Error(c.Tr("admin.config.test_mail_failed", email, err))
+	if err := email.SendTestMail(emailAddr); err != nil {
+		c.Flash.Error(c.Tr("admin.config.email.test_mail_failed", emailAddr, err))
 	} else {
-		c.Flash.Info(c.Tr("admin.config.test_mail_sent", email))
+		c.Flash.Info(c.Tr("admin.config.email.test_mail_sent", emailAddr))
 	}
 
 	c.Redirect(conf.Server.Subpath + "/admin/config")
@@ -202,6 +202,7 @@ func Config(c *context.Context) {
 	c.Data["Repository"] = conf.Repository
 	c.Data["Database"] = conf.Database
 	c.Data["Security"] = conf.Security
+	c.Data["Email"] = conf.Email
 
 	c.Data["LogRootPath"] = conf.LogRootPath
 
@@ -210,12 +211,6 @@ func Config(c *context.Context) {
 	c.Data["Service"] = conf.Service
 	c.Data["Webhook"] = conf.Webhook
 
-	c.Data["MailerEnabled"] = false
-	if conf.MailService != nil {
-		c.Data["MailerEnabled"] = true
-		c.Data["Mailer"] = conf.MailService
-	}
-
 	c.Data["CacheAdapter"] = conf.CacheAdapter
 	c.Data["CacheInterval"] = conf.CacheInterval
 	c.Data["CacheConn"] = conf.CacheConn
diff --git a/internal/route/admin/users.go b/internal/route/admin/users.go
index 8c4e7ab2..8d503573 100644
--- a/internal/route/admin/users.go
+++ b/internal/route/admin/users.go
@@ -13,8 +13,8 @@ import (
 	"gogs.io/gogs/internal/conf"
 	"gogs.io/gogs/internal/context"
 	"gogs.io/gogs/internal/db"
+	"gogs.io/gogs/internal/email"
 	"gogs.io/gogs/internal/form"
-	"gogs.io/gogs/internal/mailer"
 	"gogs.io/gogs/internal/route"
 )
 
@@ -53,7 +53,7 @@ func NewUser(c *context.Context) {
 	}
 	c.Data["Sources"] = sources
 
-	c.Data["CanSendEmail"] = conf.MailService != nil
+	c.Data["CanSendEmail"] = conf.Email.Enabled
 	c.HTML(200, USER_NEW)
 }
 
@@ -69,7 +69,7 @@ func NewUserPost(c *context.Context, f form.AdminCrateUser) {
 	}
 	c.Data["Sources"] = sources
 
-	c.Data["CanSendEmail"] = conf.MailService != nil
+	c.Data["CanSendEmail"] = conf.Email.Enabled
 
 	if c.HasError() {
 		c.HTML(200, USER_NEW)
@@ -115,8 +115,8 @@ func NewUserPost(c *context.Context, f form.AdminCrateUser) {
 	log.Trace("Account created by admin (%s): %s", c.User.Name, u.Name)
 
 	// Send email notification.
-	if f.SendNotify && conf.MailService != nil {
-		mailer.SendRegisterNotifyMail(c.Context, db.NewMailerUser(u))
+	if f.SendNotify && conf.Email.Enabled {
+		email.SendRegisterNotifyMail(c.Context, db.NewMailerUser(u))
 	}
 
 	c.Flash.Success(c.Tr("admin.users.new_success", u.Name))