install: no need to check SMTPFrom is not set (#4118)

pull/4121/head
Unknwon 2017-02-13 04:20:03 -05:00
parent 1c87b082c1
commit d02e7d9e6a
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
3 changed files with 10 additions and 8 deletions

View File

@ -16,7 +16,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.9.145.0212"
const APP_VER = "0.9.145.0213"
func init() {
setting.AppVer = APP_VER

View File

@ -249,12 +249,14 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) {
}
// Make sure FROM field is valid
_, err := mail.ParseAddress(form.SMTPFrom)
if err != nil {
ctx.Data["Err_SMTP"] = true
ctx.Data["Err_SMTPFrom"] = true
ctx.RenderWithErr(ctx.Tr("install.invalid_smtp_from", err), INSTALL, &form)
return
if len(form.SMTPFrom) > 0 {
_, err := mail.ParseAddress(form.SMTPFrom)
if err != nil {
ctx.Data["Err_SMTP"] = true
ctx.Data["Err_SMTPFrom"] = true
ctx.RenderWithErr(ctx.Tr("install.invalid_smtp_from", err), INSTALL, &form)
return
}
}
// Check logic loophole between disable self-registration and no admin account.

View File

@ -1 +1 @@
0.9.145.0212
0.9.145.0213