Merge pull request #105 from gophish/99-add-email-error-event - Commit a8f722b8 - STRLCPY/gophish

Merge pull request #105 from gophish/99-add-email-error-event
```
Added event on sending email error. Fixes #99
```
Jordan Wright committed 8 years ago

a8f722b8

2 parents
e4be072d
17e81e6c

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

Total 3 files Show one by one

■ ■ ■ ■ ■ ■

models/models.go

		skipped 29 lines
30	30		CAMPAIGN_EMAILS_SENT string = "Emails Sent"
31	31		CAMPAIGN_COMPLETE string = "Completed"
32	32		EVENT_SENT string = "Email Sent"
	33	+	EVENT_SENDING_ERROR string = "Error Sending Email"
33	34		EVENT_OPENED string = "Email Opened"
34	35		EVENT_CLICKED string = "Clicked Link"
35	36		STATUS_SUCCESS string = "Success"
		skipped 79 lines

■ ■ ■ ■ ■ ■

static/js/app/campaign_results.js

		skipped 31 lines
32	32		label: "label-default",
33	33		icon: "fa-times"
34	34		},
	35	+	"Error Sending Email": {
	36	+	slice: "ct-slice-donut-error",
	37	+	legend: "ct-legend-error",
	38	+	label: "label-default",
	39	+	icon: "fa-times"
	40	+	},
35	41		"Unknown": {
36	42		slice: "ct-slice-donut-error",
37	43		legend: "ct-legend-error",
		skipped 322 lines

■ ■ ■ ■ ■ ■

worker/worker.go

		skipped 114 lines
115	115		if err != nil {
116	116		Logger.Println(err)
117	117		}
	118	+	err = c.AddEvent(models.Event{Email: t.Email, Message: models.EVENT_SENDING_ERROR})
	119	+	if err != nil {
	120	+	Logger.Println(err)
	121	+	}
118	122		} else {
119	123		err = t.UpdateStatus(models.EVENT_SENT)
120	124		if err != nil {
		skipped 77 lines

Please wait...

Page is in error, reload to recover