aboutsummaryrefslogtreecommitdiff
path: root/modules/middleware/auth.go
diff options
context:
space:
mode:
authorslene <vslene@gmail.com>2014-03-20 21:02:52 +0800
committerslene <vslene@gmail.com>2014-03-20 21:02:52 +0800
commitc6bd723ce17ae3c0495f84e46a9296b30db5aee1 (patch)
treea2153db027aa03db50f2e7f841bd2545fa65a2bd /modules/middleware/auth.go
parent21379e30a18fed473ae2bbeb41332919ff80497d (diff)
parentc7b6fbfd46fe465b5103ecc0b743ea009eb1e586 (diff)
Merge branch 'master' of github.com:gogits/gogs
Conflicts: public/js/app.js
Diffstat (limited to 'modules/middleware/auth.go')
-rw-r--r--modules/middleware/auth.go14
1 files changed, 13 insertions, 1 deletions
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index d45a21e9..44033abb 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -20,7 +20,7 @@ func SignInRequire(redirect bool) martini.Handler {
return
} else if !ctx.User.IsActive && base.Service.RegisterEmailConfirm {
ctx.Data["Title"] = "Activate Your Account"
- ctx.Render.HTML(200, "user/active", ctx.Data)
+ ctx.HTML(200, "user/active")
return
}
}
@@ -31,6 +31,18 @@ func SignOutRequire() martini.Handler {
return func(ctx *Context) {
if ctx.IsSigned {
ctx.Redirect("/")
+ return
+ }
+ }
+}
+
+// AdminRequire requires user signed in as administor.
+func AdminRequire() martini.Handler {
+ return func(ctx *Context) {
+ if !ctx.User.IsAdmin {
+ ctx.Error(403)
+ return
}
+ ctx.Data["PageIsAdmin"] = true
}
}