aboutsummaryrefslogtreecommitdiffstats
path: root/routers/admin
diff options
context:
space:
mode:
Diffstat (limited to 'routers/admin')
-rw-r--r--routers/admin/admin.go10
-rw-r--r--routers/admin/auths.go8
2 files changed, 12 insertions, 6 deletions
diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index dbd5e94594..f9c11f8378 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -211,8 +211,14 @@ func Config(ctx *middleware.Context) {
ctx.Data["PictureService"] = base.PictureService
ctx.Data["DisableGravatar"] = base.DisableGravatar
- ctx.Data["LogMode"] = base.LogMode
- ctx.Data["LogConfig"] = base.LogConfig
+ type logger struct {
+ Mode, Config string
+ }
+ loggers := make([]*logger, len(base.LogModes))
+ for i := range base.LogModes {
+ loggers[i] = &logger{base.LogModes[i], base.LogConfigs[i]}
+ }
+ ctx.Data["Loggers"] = loggers
ctx.HTML(200, "admin/config")
}
diff --git a/routers/admin/auths.go b/routers/admin/auths.go
index 70a23baad7..b7b382cd94 100644
--- a/routers/admin/auths.go
+++ b/routers/admin/auths.go
@@ -56,8 +56,8 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
case models.LT_SMTP:
u = &models.SMTPConfig{
Auth: form.SmtpAuth,
- Host: form.Host,
- Port: form.Port,
+ Host: form.SmtpHost,
+ Port: form.SmtpPort,
TLS: form.Tls,
}
default:
@@ -134,8 +134,8 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
case models.LT_SMTP:
config = &models.SMTPConfig{
Auth: form.SmtpAuth,
- Host: form.Host,
- Port: form.Port,
+ Host: form.SmtpHost,
+ Port: form.SmtpPort,
TLS: form.Tls,
}
default: