diff options
| author | horus_arch | 2015-03-20 23:16:27 +0100 |
|---|---|---|
| committer | horus_arch | 2015-03-20 23:16:27 +0100 |
| commit | 491462e033ae78a5b5c4f93ed8d5663e4da0a9e3 (patch) | |
| tree | cdc82ee4c600a86ba6bc7b92a589b129a01c7429 /server.go | |
| parent | 17bea88eb3f6e2bc5f63641437a997cc8bd32881 (diff) | |
| download | freemail-491462e033ae78a5b5c4f93ed8d5663e4da0a9e3.tar.gz | |
Fix bug which prevented creating a new entry.
Diffstat (limited to 'server.go')
| -rw-r--r-- | server.go | 18 |
1 files changed, 16 insertions, 2 deletions
@@ -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 +} |
