diff --git a/templates/account-own-edit.html b/templates/account-own-edit.html
index 68ae2b6d..b131f715 100644
--- a/templates/account-own-edit.html
+++ b/templates/account-own-edit.html
@@ -1,13 +1,5 @@
{{template "header.html" . }}
-
+{{template "account-menu.html" . }}
diff --git a/user.go b/user.go
index 4df2f3f4..1467f430 100644
--- a/user.go
+++ b/user.go
@@ -28,6 +28,15 @@ type User struct
Tag string
}
+type Email struct
+{
+ UserID int
+ Email string
+ Validated bool
+ Primary bool
+ Token string
+}
+
func SetPassword(uid int, password string) (error) {
salt, err := GenerateSafeString(saltLength)
if err != nil {
@@ -47,6 +56,18 @@ func SetPassword(uid int, password string) (error) {
return nil
}
+func SendValidationEmail(username string, email string, token string) bool {
+ var schema string
+ if enable_ssl {
+ schema = "s"
+ }
+
+ subject := "Validate Your Email @ " + site_name
+ msg := "Dear " + username + ", following your registration on our forums, we ask you to validate your email, so that we can confirm that this email actually belongs to you.\nClick on the following link to do so. http" + schema + "://" + site_url + "/user/edit/token/" + token + "\nIf you haven't created an account here, then please feel free to ignore this email.\nWe're sorry for the inconvenience this may have caused."
+
+ return SendEmail(email, subject, msg)
+}
+
func SessionCheck(w http.ResponseWriter, r *http.Request) (user User, noticeList map[int]string, success bool) {
noticeList = make(map[int]string)
@@ -71,7 +92,7 @@ func SessionCheck(w http.ResponseWriter, r *http.Request) (user User, noticeList
user.Session = cookie.Value
// Is this session valid..?
- err = get_session_stmt.QueryRow(user.ID,user.Session).Scan(&user.ID, &user.Name, &user.Group, &user.Is_Super_Admin, &user.Session, &user.Avatar, &user.Message, &user.URLPrefix, &user.URLName)
+ err = get_session_stmt.QueryRow(user.ID,user.Session).Scan(&user.ID, &user.Name, &user.Group, &user.Is_Super_Admin, &user.Session, &user.Email, &user.Avatar, &user.Message, &user.URLPrefix, &user.URLName)
if err == sql.ErrNoRows {
user.ID = 0
user.Session = ""
diff --git a/utils.go b/utils.go
index 87be9528..08d60947 100644
--- a/utils.go
+++ b/utils.go
@@ -3,6 +3,7 @@ import "fmt"
import "time"
import "encoding/base64"
import "crypto/rand"
+import "net/smtp"
// Generate a cryptographically secure set of random bytes..
func GenerateSafeString(length int) (string, error) {
@@ -44,4 +45,45 @@ func relative_time(in string) (string, error) {
default:
return fmt.Sprintf("%d hours ago", int(seconds / 60 / 60)), err
}
-}
\ No newline at end of file
+}
+
+func SendEmail(email string, subject string, msg string) bool {
+ // This hook is useful for plugin_sendmail or for testing tools. Possibly to hook it into some sort of mail server?
+ if vhooks["email_send_intercept"] != nil {
+ return vhooks["email_send_intercept"](email, subject, msg).(bool)
+ }
+ body := "Subject: " + subject + "\n\n" + msg + "\n"
+
+ con, err := smtp.Dial(smtp_server)
+ if err != nil {
+ return false
+ }
+
+ err = con.Mail(site_email)
+ if err != nil {
+ return false
+ }
+ err = con.Rcpt(email)
+ if err != nil {
+ return false
+ }
+
+ email_data, err := con.Data()
+ if err != nil {
+ return false
+ }
+ _, err = fmt.Fprintf(email_data, body)
+ if err != nil {
+ return false
+ }
+
+ err = email_data.Close()
+ if err != nil {
+ return false
+ }
+ err = con.Quit()
+ if err != nil {
+ return false
+ }
+ return true
+}