From 3698431fc11f740ecc043822fba8af895fc12423 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sun, 30 Mar 2014 11:58:21 -0400
Subject: [PATCH] Fix install bugs

---
 modules/middleware/auth.go |  5 +++++
 routers/install.go         | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index 64f75d75c..f50fde99e 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -21,6 +21,11 @@ type ToggleOptions struct {
 
 func Toggle(options *ToggleOptions) martini.Handler {
 	return func(ctx *Context) {
+		if !base.InstallLock {
+			ctx.Redirect("/install")
+			return
+		}
+
 		if options.SignOutRequire && ctx.IsSigned && ctx.Req.RequestURI != "/" {
 			ctx.Redirect("/")
 			return
diff --git a/routers/install.go b/routers/install.go
index 6f29badcf..cca652f9c 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -131,6 +131,17 @@ func Install(ctx *middleware.Context, form auth.InstallForm) {
 		return
 	}
 
+	// Check run user.
+	curUser := os.Getenv("USERNAME")
+	if len(curUser) == 0 {
+		curUser = os.Getenv("USER")
+	}
+	// Does not check run user when the install lock is off.
+	if form.RunUser != curUser {
+		ctx.RenderWithErr("Run user isn't the current user: "+form.RunUser+" -> "+curUser, "install", &form)
+		return
+	}
+
 	// Save settings.
 	base.Cfg.SetValue("database", "DB_TYPE", models.DbCfg.Type)
 	base.Cfg.SetValue("database", "HOST", models.DbCfg.Host)
@@ -155,8 +166,11 @@ func Install(ctx *middleware.Context, form auth.InstallForm) {
 		base.Cfg.SetValue("service", "ENABLE_NOTIFY_MAIL", base.ToStr(form.MailNotify == "on"))
 	}
 
+	base.Cfg.SetValue("", "RUN_MODE", "prod")
+
 	base.Cfg.SetValue("security", "INSTALL_LOCK", "true")
 
+	os.MkdirAll("custom/conf", os.ModePerm)
 	if err := goconfig.SaveConfigFile(base.Cfg, "custom/conf/app.ini"); err != nil {
 		ctx.RenderWithErr("Fail to save configuration: "+err.Error(), "install", &form)
 		return