summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2014-08-09 21:02:00 -0700
committerUnknwon <joe2010xtmf@163.com>2014-08-09 21:02:00 -0700
commit7af7584d25f48309a70083c30805ebb8454611f0 (patch)
treef1f20d5fafe8f023392ce35931221ba2cee2fe35 /modules
parent5605af973b440add79b1c32c911bee03fa821a4e (diff)
downloadgitea-7af7584d25f48309a70083c30805ebb8454611f0.tar.gz
gitea-7af7584d25f48309a70083c30805ebb8454611f0.zip
Finish new reset password, etc.
Diffstat (limited to 'modules')
-rw-r--r--modules/middleware/auth.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index 29a2d68110..5862787b34 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -5,6 +5,7 @@
package middleware
import (
+ "fmt"
"net/url"
"strings"
@@ -43,6 +44,7 @@ func Toggle(options *ToggleOptions) macaron.Handler {
}
if options.SignInRequire {
+ fmt.Println(ctx.User.IsActive, setting.Service.RegisterEmailConfirm)
if !ctx.IsSigned {
// Ignore watch repository operation.
if strings.HasSuffix(ctx.Req.RequestURI, "watch") {
@@ -52,7 +54,7 @@ func Toggle(options *ToggleOptions) macaron.Handler {
ctx.Redirect("/user/login")
return
} else if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm {
- // ctx.Data["Title"] = "Activate Your Account"
+ ctx.Data["Title"] = ctx.Tr("auth.active_your_account")
ctx.HTML(200, "user/activate")
return
}