cristiancmoises
/
gophish
mirror of https://github.com/gophish/gophish
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed formatting from Custom Envelope PR #2334

pull/2507/head
Glenn Wilkinson 2022-06-05 21:18:32 +01:00
parent d0ff3829e5
commit 6fb77bf3ce
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mailer/mailer.go
View File

@ -223,9 +223,9 @@ func sendMail(ctx context.Context, dialer Dialer, ms []Mail) {
} }
} }
log.WithFields(logrus.Fields{ log.WithFields(logrus.Fields{
"smtp_from": smtp_from, "smtp_from": smtp_from,
"envelope_from": message.GetHeader("From")[0], "envelope_from": message.GetHeader("From")[0],
"email": message.GetHeader("To")[0], "email": message.GetHeader("To")[0],
}).Info("Email sent") }).Info("Email sent")
m.Success() m.Success()
} }

16
models/template.go
View File

@ -11,15 +11,15 @@ import (
// Template models hold the attributes for an email template to be sent to targets // Template models hold the attributes for an email template to be sent to targets
type Template struct { type Template struct {
Id int64 `json:"id" gorm:"column:id; primary_key:yes"` Id int64 `json:"id" gorm:"column:id; primary_key:yes"`
UserId int64 `json:"-" gorm:"column:user_id"` UserId int64 `json:"-" gorm:"column:user_id"`
Name string `json:"name"` Name string `json:"name"`
EnvelopeSender string `json:"envelope_sender"` EnvelopeSender string `json:"envelope_sender"`
Subject string `json:"subject"` Subject string `json:"subject"`
Text string `json:"text"` Text string `json:"text"`
HTML string `json:"html" gorm:"column:html"` HTML string `json:"html" gorm:"column:html"`
ModifiedDate time.Time `json:"modified_date"` ModifiedDate time.Time `json:"modified_date"`
Attachments []Attachment `json:"attachments"` Attachments []Attachment `json:"attachments"`
} }
// ErrTemplateNameNotSpecified is thrown when a template name is not specified // ErrTemplateNameNotSpecified is thrown when a template name is not specified