luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-05-21 01:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #1414 from nice-software/wip/currentUser

Browse source 
Factor out function to get the current user
This commit is contained in:
无闻 2015-08-19 18:29:04 +08:00
commit a5e1ada474
3 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/setting/setting.go
View file

@ -24,6 +24,7 @@ import (
"github.com/gogits/gogs/modules/bindata"
"github.com/gogits/gogs/modules/log"
// "github.com/gogits/gogs/modules/ssh"
"github.com/gogits/gogs/modules/user"
)
type Scheme string
@ -324,10 +325,7 @@ func NewConfigContext() {
}[Cfg.Section("time").Key("FORMAT").MustString("RFC1123")]
RunUser = Cfg.Section("").Key("RUN_USER").String()
curUser := os.Getenv("USER")
if len(curUser) == 0 {
curUser = os.Getenv("USERNAME")
}
curUser := user.CurrentUsername()
// Does not check run user when the install lock is off.
if InstallLock && RunUser != curUser {
log.Fatal(4, "Expect user(%s) but current user is: %s", RunUser, curUser)