From 8719c1b8c50cc68d734053d26d7b819e92783025 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Fri, 18 Apr 2014 12:12:10 -0400
Subject: Mirror bug fix

---
 routers/user/user.go         |  4 ++--
 templates/user/activate.tmpl | 36 ++++++++++++++++++++++++++++++++++++
 templates/user/active.tmpl   | 36 ------------------------------------
 web.go                       |  2 +-
 4 files changed, 39 insertions(+), 39 deletions(-)
 create mode 100644 templates/user/activate.tmpl
 delete mode 100644 templates/user/active.tmpl

diff --git a/routers/user/user.go b/routers/user/user.go
index 56b9dc205c..ce4d0cc3d0 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -341,7 +341,7 @@ func Activate(ctx *middleware.Context) {
 		} else {
 			ctx.Data["ServiceNotEnabled"] = true
 		}
-		ctx.HTML(200, "user/active")
+		ctx.HTML(200, "user/activate")
 		return
 	}
 
@@ -363,7 +363,7 @@ func Activate(ctx *middleware.Context) {
 	}
 
 	ctx.Data["IsActivateFailed"] = true
-	ctx.HTML(200, "user/active")
+	ctx.HTML(200, "user/activate")
 }
 
 func ForgotPasswd(ctx *middleware.Context) {
diff --git a/templates/user/activate.tmpl b/templates/user/activate.tmpl
new file mode 100644
index 0000000000..9cac069dce
--- /dev/null
+++ b/templates/user/activate.tmpl
@@ -0,0 +1,36 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="body" class="container">
+    <form action="/user/activate" method="post" class="form-horizontal card" id="login-card">
+        {{.CsrfTokenHtml}}
+        <h3>Activate Your Account</h3>
+        {{if .IsActivatePage}}
+            {{if .ServiceNotEnabled}}
+            <p>Sorry, Register Mail Confirmation has been disabled.</p>
+            {{else if .ResendLimited}}
+            <p>Sorry, you are sending activation e-mail too frequently, please wait 3 minutes.</p>
+            {{else}}
+            <p>New confirmation e-mail has been sent to <b>{{.SignedUser.Email}}</b>, please check your inbox within {{.Hours}} hours to complete your registeration.</p>
+            <hr/>
+            <a href="http://{{Mail2Domain .SignedUser.Email}}" class="btn btn-lg btn-success">Sign in to your e-mail</a>
+            {{end}}
+        {{else}}
+            {{if .IsSendRegisterMail}}
+            <p>A confirmation e-mail has been sent to <b>{{.Email}}</b>, please check your inbox within {{.Hours}} hours to complete your registeration.</p>
+            <hr/>
+            <a href="http://{{Mail2Domain .Email}}" class="btn btn-lg btn-success">Sign in to your e-mail</a>
+            {{else if .IsActivateFailed}}
+            <p>Sorry, your confirmation code has been exipired or not valid.</p>
+            {{else}}
+    		<p>Hi, {{.SignedUser.Name}}, you have an unconfirmed email address(<b>{{.SignedUser.Email}}</b>). If you haven't received a confirmation e-mail or need to resend a new one, please click botton below.</p>
+    		<hr/>
+            <div class="form-group">
+                <div class="col-md-offset-4 col-md-6">
+                    <button type="submit" class="btn btn-lg btn-primary">Click here to resend your active e-mail</button>
+                </div>
+            </div>
+            {{end}}
+        {{end}}
+    </form>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/user/active.tmpl b/templates/user/active.tmpl
deleted file mode 100644
index 9cac069dce..0000000000
--- a/templates/user/active.tmpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-<div id="body" class="container">
-    <form action="/user/activate" method="post" class="form-horizontal card" id="login-card">
-        {{.CsrfTokenHtml}}
-        <h3>Activate Your Account</h3>
-        {{if .IsActivatePage}}
-            {{if .ServiceNotEnabled}}
-            <p>Sorry, Register Mail Confirmation has been disabled.</p>
-            {{else if .ResendLimited}}
-            <p>Sorry, you are sending activation e-mail too frequently, please wait 3 minutes.</p>
-            {{else}}
-            <p>New confirmation e-mail has been sent to <b>{{.SignedUser.Email}}</b>, please check your inbox within {{.Hours}} hours to complete your registeration.</p>
-            <hr/>
-            <a href="http://{{Mail2Domain .SignedUser.Email}}" class="btn btn-lg btn-success">Sign in to your e-mail</a>
-            {{end}}
-        {{else}}
-            {{if .IsSendRegisterMail}}
-            <p>A confirmation e-mail has been sent to <b>{{.Email}}</b>, please check your inbox within {{.Hours}} hours to complete your registeration.</p>
-            <hr/>
-            <a href="http://{{Mail2Domain .Email}}" class="btn btn-lg btn-success">Sign in to your e-mail</a>
-            {{else if .IsActivateFailed}}
-            <p>Sorry, your confirmation code has been exipired or not valid.</p>
-            {{else}}
-    		<p>Hi, {{.SignedUser.Name}}, you have an unconfirmed email address(<b>{{.SignedUser.Email}}</b>). If you haven't received a confirmation e-mail or need to resend a new one, please click botton below.</p>
-    		<hr/>
-            <div class="form-group">
-                <div class="col-md-offset-4 col-md-6">
-                    <button type="submit" class="btn btn-lg btn-primary">Click here to resend your active e-mail</button>
-                </div>
-            </div>
-            {{end}}
-        {{end}}
-    </form>
-</div>
-{{template "base/footer" .}}
\ No newline at end of file
diff --git a/web.go b/web.go
index 0be2a05a04..58d0bc04cb 100644
--- a/web.go
+++ b/web.go
@@ -100,7 +100,7 @@ func runWeb(*cli.Context) {
 	}, reqSignIn)
 	m.Group("/user", func(r martini.Router) {
 		r.Get("/feeds", middleware.Bind(auth.FeedsForm{}), user.Feeds)
-		r.Get("/activate", user.Activate)
+		r.Any("/activate", user.Activate)
 		r.Get("/email2user", user.Email2User)
 		r.Get("/forget_password", user.ForgotPasswd)
 		r.Post("/forget_password", user.ForgotPasswdPost)
-- 
cgit v1.2.3