Merge branch 'master' of github.com:gogits/gogs

1 files changed, 24 insertions, 4 deletions

diff --git a/routers/install.go b/routers/install.go
index d7d5159e..b5c3a936 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -4,10 +4,30 @@
 
 package routers
 
-import "github.com/gogits/gogs/modules/middleware"
+import (
+	"errors"
+
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/auth"
+	"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/modules/middleware"
+)
+
+func Install(ctx *middleware.Context, form auth.InstallForm) {
+	if base.InstallLock {
+		ctx.Handle(404, "install.Install", errors.New("Installation is prohibited"))
+		return
+	}
 
-func Install(ctx *middleware.Context){
-	ctx.Data["PageIsInstall"] = true
 	ctx.Data["Title"] = "Install"
-	ctx.HTML(200,"install")
+	ctx.Data["DbCfg"] = models.DbCfg
+	ctx.Data["RepoRootPath"] = base.RepoRootPath
+	ctx.Data["RunUser"] = base.RunUser
+	ctx.Data["AppUrl"] = base.AppUrl
+	ctx.Data["PageIsInstall"] = true
+
+	if ctx.Req.Method == "GET" {
+		ctx.HTML(200, "install")
+		return
+	}
 }