Finish verify email

2 files changed, 39 insertions, 0 deletions

diff --git a/routers/dev/template.go b/routers/dev/template.go
new file mode 100644
index 0000000000..7d5225ece7
--- /dev/null
+++ b/routers/dev/template.go
@@ -0,0 +1,25 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package dev
+
+import (
+	"github.com/codegangsta/martini"
+
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/modules/middleware"
+)
+
+func TemplatePreview(ctx *middleware.Context, params martini.Params) {
+	ctx.Data["User"] = models.User{Name: "Unknown"}
+	ctx.Data["AppName"] = base.AppName
+	ctx.Data["AppVer"] = base.AppVer
+	ctx.Data["AppUrl"] = base.AppUrl
+	ctx.Data["AppLogo"] = base.AppLogo
+	ctx.Data["Code"] = "2014031910370000009fff6782aadb2162b4a997acb69d4400888e0b9274657374"
+	ctx.Data["ActiveCodeLives"] = base.Service.ActiveCodeLives / 60
+	ctx.Data["ResetPwdCodeLives"] = base.Service.ResetPwdCodeLives / 60
+	ctx.HTML(200, params["_1"], ctx.Data)
+}
diff --git a/routers/user/user.go b/routers/user/user.go
index da70ced9f5..32f458f835 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -243,4 +243,18 @@ func Activate(ctx *middleware.Context) {
 		ctx.Render.HTML(200, "user/active", ctx.Data)
 		return
 	}
+
+	// Verify code.
+	if user := models.VerifyUserActiveCode(code); user != nil {
+		user.IsActive = true
+		user.Rands = models.GetUserSalt()
+		models.UpdateUser(user)
+		ctx.Session.Set("userId", user.Id)
+		ctx.Session.Set("userName", user.Name)
+		ctx.Redirect("/", 302)
+		return
+	}
+
+	ctx.Data["IsActivateFailed"] = true
+	ctx.Render.HTML(200, "user/active", ctx.Data)
 }