merged

1 files changed, 14 insertions, 2 deletions

diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index d45a21e9..f211de32 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -15,12 +15,12 @@ func SignInRequire(redirect bool) martini.Handler {
 	return func(ctx *Context) {
 		if !ctx.IsSigned {
 			if redirect {
-				ctx.Redirect("/")
+				ctx.Redirect("/user/login")
 			}
 			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
 	}
 }