From 491462e033ae78a5b5c4f93ed8d5663e4da0a9e3 Mon Sep 17 00:00:00 2001
From: horus_arch
Date: Fri, 20 Mar 2015 23:16:27 +0100
Subject: Fix bug which prevented creating a new entry.

---
 server.go | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'server.go')

diff --git a/server.go b/server.go
index 66e3a94..746ac92 100644
--- a/server.go
+++ b/server.go
@@ -2,10 +2,13 @@ package main
 
 import (
 	"errors"
+	"log"
+	"net/http"
 	"os"
 )
 
 func CreateNewEntry(email, password string) error {
+	serverIP := os.Getenv("FREEMAIL_SMTP_MAILER_MX")
 	if !ValidateEmail(email) {
 		return errors.New("This doesn't look like a mail adress.")
 	}
@@ -19,10 +22,10 @@ func CreateNewEntry(email, password string) error {
 	vD := VirtualDomain{}
 	vD.Name = GetDomain(vU.Email)
 
-	if !vD.ValidateDomainMX(os.Getenv("FREEMAIL_SMTP_MAILER_MX")) {
+	if !vD.ValidateDomainMX(serverIP) {
 		return errors.New("The MX record doesn't point to this server.")
 	}
-	if !vD.ValidateDomain(os.Getenv("FREEMAIL_SMTP_MAILER_MX")) {
+	if !vD.ValidateDomain(serverIP) {
 		return errors.New("This doesn't look like a good domain. Host not found.")
 	}
 
@@ -39,3 +42,14 @@ func CreateNewEntry(email, password string) error {
 	}
 	return nil
 }
+
+func ExecTemplate(template string, w http.ResponseWriter, flash Flash) error {
+	index := mainTempl.Lookup(template)
+
+	err := index.ExecuteTemplate(w, template, flash)
+	if err != nil {
+		log.Println(err)
+		return err
+	}
+	return nil
+}
-- 
cgit v1.2.3