Work on admin

diff --git a/conf/app.ini b/conf/app.ini
index 21090ceba5f01292a01b3a5cc5ce788a10a2c6c7..658f7c01512e37fafe6ccb75caf76edc00f974e2 100644 (file)
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -27,10 +27,6 @@ PASSWD =
 ; For "postgres" only, either "disable", "require" or "verify-full"
 SSL_MODE = disable
 
-[admin]
-; Administor's name, which should be same as the user name you want to authorize
-NAME = admin
-
 [security]
 ; !!CHANGE THIS TO KEEP YOUR USER DATA SAFE!!
 SECRET_KEY = !#@FDEWREWR&*(

diff --git a/models/user.go b/models/user.go
index 8f74fd53fb04c8056395fd3edec333b969fd132d..fd89af6b3f490fa6aa4540d6872fb6194d10ce78 100644 (file)
--- a/models/user.go
+++ b/models/user.go
@@ -137,7 +137,13 @@ func RegisterUser(user *User) (*User, error) {
                }
                return nil, err
        }
-       return user, nil
+
+       if user.Id == 1 {
+               user.IsAdmin = true
+               user.IsActive = true
+               _, err = orm.Id(user.Id).UseBool().Update(user)
+       }
+       return user, err
 }
 
 // get user by erify code

diff --git a/modules/base/conf.go b/modules/base/conf.go
index c904c5b39c0cf9f0e8bd9ab8eaa3b2882ae07ecd..fdbf3ad38549ec010eb47b21f3fb3c40a9ae0e01 100644 (file)
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -32,7 +32,6 @@ var (
        AppUrl      string
        Domain      string
        SecretKey   string
-       AdminName   string
        Cfg         *goconfig.ConfigFile
        MailService *Mailer
 )
@@ -174,7 +173,6 @@ func init() {
        AppUrl = Cfg.MustValue("server", "ROOT_URL")
        Domain = Cfg.MustValue("server", "DOMAIN")
        SecretKey = Cfg.MustValue("security", "SECRET_KEY")
-       AdminName = strings.ToLower(Cfg.MustValue("admin", "NAME"))
 }
 
 func NewServices() {

diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index b67f766bd7ef260789f8287cd19de79d2ca5118b..44033abb8f4d835b27217e6078876dba3989f891 100644 (file)
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -39,7 +39,7 @@ func SignOutRequire() martini.Handler {
 // AdminRequire requires user signed in as administor.
 func AdminRequire() martini.Handler {
        return func(ctx *Context) {
-               if ctx.User.LowerName != base.AdminName && !ctx.User.IsAdmin {
+               if !ctx.User.IsAdmin {
                        ctx.Error(403)
                        return
                }

diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index 744cdfc10c9f06505e282cddbf0839c8b78f7e2a..cb3cbabca62872044a40f870c2e0d6de1edcb968 100644 (file)
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -14,7 +14,6 @@ import (
 
        "github.com/gogits/gogs/models"
        "github.com/gogits/gogs/modules/auth"
-       "github.com/gogits/gogs/modules/base"
        "github.com/gogits/gogs/modules/log"
 )
 
@@ -112,10 +111,7 @@ func InitContext() martini.Handler {
                        ctx.Data["SignedUser"] = user
                        ctx.Data["SignedUserId"] = user.Id
                        ctx.Data["SignedUserName"] = user.LowerName
-
-                       if ctx.User.IsAdmin || ctx.User.LowerName == base.AdminName {
-                               ctx.Data["IsAdmin"] = true
-                       }
+                       ctx.Data["IsAdmin"] = ctx.User.IsAdmin
                }
 
                ctx.Data["PageStartTime"] = time.Now()

diff --git a/routers/user/user.go b/routers/user/user.go
index 2b759e4192a1e5233282f55c2083602dcde901ea..be2c4d38390e58d19fb2e2e752a07e46596592ac 100644 (file)
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -153,7 +153,7 @@ func SignUp(ctx *middleware.Context, form auth.RegisterForm) {
        log.Trace("%s User created: %s", ctx.Req.RequestURI, strings.ToLower(form.UserName))
 
        // Send confirmation e-mail.
-       if base.Service.RegisterEmailConfirm {
+       if base.Service.RegisterEmailConfirm && u.Id > 1 {
                mailer.SendRegisterMail(ctx.Render, u)
                ctx.Data["IsSendRegisterMail"] = true
                ctx.Data["Email"] = u.Email