tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Factor out function to get the current user

Browse Source 
The same logic was duplicated in three places. Factor it
out so that we can add further fallbacks in a single place.
This commit is contained in:
Paolo Borelli
2015-07-31 08:50:11 +02:00
parent b35d7eee31
commit 0d38794c7f
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
routers/install.go
View File

@@ -26,6 +26,7 @@ import (
"github.com/gogits/gogs/modules/middleware"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/social"
"github.com/gogits/gogs/modules/user"
)
const (
@@ -111,10 +112,7 @@ func Install(ctx *middleware.Context) {
// Note(unknwon): it's hard for Windows users change a running user,
// so just use current one if config says default.
if setting.IsWindows && setting.RunUser == "git" {
form.RunUser = os.Getenv("USER")
if len(form.RunUser) == 0 {
form.RunUser = os.Getenv("USERNAME")
}
form.RunUser = user.CurrentUsername()
} else {
form.RunUser = setting.RunUser
}
@@ -201,10 +199,7 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
}
// Check run user.
curUser := os.Getenv("USER")
if len(curUser) == 0 {
curUser = os.Getenv("USERNAME")
}
curUser := user.CurrentUsername()
if form.RunUser != curUser {
ctx.Data["Err_RunUser"] = true
ctx.RenderWithErr(ctx.Tr("install.run_user_not_match", form.RunUser, curUser), INSTALL, &form)