Browse Source

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

Unknwon 8 years ago
parent
commit
d02e7d9e6a
3 changed files with 10 additions and 8 deletions
  1. 1 1
      gogs.go
  2. 8 6
      routers/install.go
  3. 1 1
      templates/.VERSION

+ 1 - 1
gogs.go

@@ -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

+ 8 - 6
routers/install.go

@@ -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.

+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.9.145.0212
+0.9.145.0213