@@ -7,6 +7,7 @@ package routers | |||
import ( | |||
"errors" | |||
"os" | |||
"os/exec" | |||
"strings" | |||
"github.com/Unknwon/goconfig" | |||
@@ -103,6 +104,11 @@ func Install(ctx *middleware.Context, form auth.InstallForm) { | |||
return | |||
} | |||
if _, err := exec.LookPath("git"); err != nil { | |||
ctx.RenderWithErr("Fail to test 'git' command: "+err.Error(), "install", &form) | |||
return | |||
} | |||
// Pass basic check, now test configuration. | |||
// Test database setting. | |||
dbTypes := map[string]string{"mysql": "mysql", "pgsql": "postgres", "sqlite": "sqlite3"} |
@@ -110,7 +110,7 @@ func SocialSignIn(ctx *middleware.Context, tokens oauth2.Tokens) { | |||
case models.ErrOauth2NotAssociatedWithUser: | |||
// pass | |||
default: | |||
log.Error(err) // FIXME: handle error page | |||
log.Error(err.Error()) // FIXME: handle error page | |||
return | |||
} | |||
ctx.Session.Set("socialId", oa.Id) |
@@ -156,11 +156,11 @@ | |||
<label class="col-md-3 control-label">SMTP Host: </label> | |||
<div class="col-md-8"> | |||
<input name="smtp_host" type="text" class="form-control" placeholder="Type SMTP host address" value="{{.smtp_host}}"> | |||
<input name="smtp_host" type="text" class="form-control" placeholder="Type SMTP host address and port" value="{{.smtp_host}}"> | |||
</div> | |||
</div> | |||
<div class="form-group"> | |||
<label class="col-md-3 control-label">Email: </label> | |||
<label class="col-md-3 control-label">Username: </label> | |||
<div class="col-md-8"> | |||
<input name="mailer_user" type="text" class="form-control" placeholder="Type SMTP user e-mail address" value="{{.mailer_user}}"> |