user gomail and new activate account email tpl

- #1496: fallback plain text
- #1002: add date header
- #913: fix encoding of header

1 files changed, 16 insertions, 0 deletions

diff --git a/models/user.go b/models/user.go
index 9450860eb2..f824e2bd59 100644
--- a/models/user.go
+++ b/models/user.go
@@ -133,6 +133,22 @@ func (u *User) HomeLink() string {
 	return setting.AppSubUrl + "/" + u.Name
 }
 
+// GenerateEmailActivateCode generates an activate code based on user information and given e-mail.
+func (u *User) GenerateEmailActivateCode(email string) string {
+	code := base.CreateTimeLimitCode(
+		com.ToStr(u.Id)+email+u.LowerName+u.Passwd+u.Rands,
+		setting.Service.ActiveCodeLives, nil)
+
+	// Add tail hex username
+	code += hex.EncodeToString([]byte(u.LowerName))
+	return code
+}
+
+// GenerateActivateCode generates an activate code based on user information.
+func (u *User) GenerateActivateCode() string {
+	return u.GenerateEmailActivateCode(u.Email)
+}
+
 // CustomAvatarPath returns user custom avatar file path.
 func (u *User) CustomAvatarPath() string {
 	return filepath.Join(setting.AvatarUploadPath, com.ToStr(u.Id))