4 files changed, 60 insertions, 79 deletions
diff --git a/modules/auth/mail.go b/modules/auth/mail.go
deleted file mode 100644
index 3de18b67..00000000
--- a/modules/auth/mail.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// 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 auth
-
-import (
-	"encoding/hex"
-	"fmt"
-
-	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/mailer"
-)
-
-// create a time limit code for user active
-func CreateUserActiveCode(user *models.User, startInf interface{}) string {
-	hours := base.Service.ActiveCodeLives / 60
-	data := base.ToStr(user.Id) + user.Email + user.LowerName + user.Passwd + user.Rands
-	code := base.CreateTimeLimitCode(data, hours, startInf)
-
-	// add tail hex username
-	code += hex.EncodeToString([]byte(user.LowerName))
-	return code
-}
-
-// Send user register mail with active code
-func SendRegisterMail(user *models.User) {
-	code := CreateUserActiveCode(user, nil)
-	subject := "Register success, Welcome"
-
-	data := mailer.GetMailTmplData(user)
-	data["Code"] = code
-	body := base.RenderTemplate("mail/auth/register_success.html", data)
-
-	msg := mailer.NewMailMessage([]string{user.Email}, subject, body)
-	msg.Info = fmt.Sprintf("UID: %d, send register mail", user.Id)
-
-	// async send mail
-	mailer.SendAsync(msg)
-}
-
-// Send email verify active email.
-func SendActiveMail(user *models.User) {
-	code := CreateUserActiveCode(user, nil)
-
-	subject := "Verify your email address"
-
-	data := mailer.GetMailTmplData(user)
-	data["Code"] = code
-	body := base.RenderTemplate("mail/auth/active_email.html", data)
-
-	msg := mailer.NewMailMessage([]string{user.Email}, subject, body)
-	msg.Info = fmt.Sprintf("UID: %d, send email verify mail", user.Id)
-
-	// async send mail
-	mailer.SendAsync(msg)
-}
diff --git a/modules/base/conf.go b/modules/base/conf.go
index 24ee1d7f..64c97028 100644
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -174,6 +174,7 @@ func init() {
 	SecretKey = Cfg.MustValue("security", "SECRET_KEY")
 
 	// Extensions.
+	newService()
 	newLogService()
 	newMailService()
 	newRegisterService()
diff --git a/modules/base/tool.go b/modules/base/tool.go
index fc3b4c45..d0b6bfbf 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -67,25 +67,6 @@ func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string
 	return code
 }
 
-// TODO:
-func RenderTemplate(TplNames string, Data map[interface{}]interface{}) string {
-	// if beego.RunMode == "dev" {
-	// 	beego.BuildTemplate(beego.ViewsPath)
-	// }
-
-	// ibytes := bytes.NewBufferString("")
-	// if _, ok := beego.BeeTemplates[TplNames]; !ok {
-	// 	panic("can't find templatefile in the path:" + TplNames)
-	// }
-	// err := beego.BeeTemplates[TplNames].ExecuteTemplate(ibytes, TplNames, Data)
-	// if err != nil {
-	// 	beego.Trace("template Execute err:", err)
-	// }
-	// icontent, _ := ioutil.ReadAll(ibytes)
-	// return string(icontent)
-	return "not implement yet"
-}
-
 // AvatarLink returns avatar link by given e-mail.
 func AvatarLink(email string) string {
 	return "http://1.gravatar.com/avatar/" + EncodeMd5(email)
diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go
index cc4fd6d0..de4f24a4 100644
--- a/modules/mailer/mail.go
+++ b/modules/mailer/mail.go
@@ -5,8 +5,13 @@
 package mailer
 
 import (
+	"encoding/hex"
+	"fmt"
+
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/modules/log"
+	"github.com/gogits/gogs/modules/middleware"
 )
 
 // Create New mail message use MailFrom and MailUser
@@ -22,10 +27,62 @@ func GetMailTmplData(user *models.User) map[interface{}]interface{} {
 	data["AppVer"] = base.AppVer
 	data["AppUrl"] = base.AppUrl
 	data["AppLogo"] = base.AppLogo
-	data["ActiveCodeLives"] = base.Service.ActiveCodeLives
-	data["ResetPwdCodeLives"] = base.Service.ResetPwdCodeLives
+	data["ActiveCodeLives"] = base.Service.ActiveCodeLives / 60
+	data["ResetPwdCodeLives"] = base.Service.ResetPwdCodeLives / 60
 	if user != nil {
 		data["User"] = user
 	}
 	return data
 }
+
+// create a time limit code for user active
+func CreateUserActiveCode(user *models.User, startInf interface{}) string {
+	hours := base.Service.ActiveCodeLives / 60
+	data := base.ToStr(user.Id) + user.Email + user.LowerName + user.Passwd + user.Rands
+	code := base.CreateTimeLimitCode(data, hours, startInf)
+
+	// add tail hex username
+	code += hex.EncodeToString([]byte(user.LowerName))
+	return code
+}
+
+// Send user register mail with active code
+func SendRegisterMail(r *middleware.Render, user *models.User) {
+	code := CreateUserActiveCode(user, nil)
+	subject := "Register success, Welcome"
+
+	data := GetMailTmplData(user)
+	data["Code"] = code
+	body, err := r.HTMLString("mail/auth/register_success", data)
+	if err != nil {
+		log.Error("mail.SendRegisterMail(fail to render): %v", err)
+		return
+	}
+
+	msg := NewMailMessage([]string{user.Email}, subject, body)
+	msg.Info = fmt.Sprintf("UID: %d, send register mail", user.Id)
+
+	// async send mail
+	SendAsync(msg)
+}
+
+// Send email verify active email.
+func SendActiveMail(r *middleware.Render, user *models.User) {
+	code := CreateUserActiveCode(user, nil)
+
+	subject := "Verify your email address"
+
+	data := GetMailTmplData(user)
+	data["Code"] = code
+	body, err := r.HTMLString("mail/auth/active_email.html", data)
+	if err != nil {
+		log.Error("mail.SendActiveMail(fail to render): %v", err)
+		return
+	}
+
+	msg := NewMailMessage([]string{user.Email}, subject, body)
+	msg.Info = fmt.Sprintf("UID: %d, send email verify mail", user.Id)
+
+	// async send mail
+	SendAsync(msg)
+}