Merge pull request #165 from gophish/162-from-test-email

Added ability to have "{{.From}}" in sending a test email.

models/campaign.go

@@ -72,6 +72,7 @@ type SendTestEmailRequest struct {
 	URL         string   `json:"url"`
 	Tracker     string   `json:"tracker"`
 	TrackingURL string   `json:"tracking_url"`
+	From        string   `json:"from"`
 	Target
 }
 

worker/worker.go

@@ -178,9 +178,9 @@ func SendTestEmail(s *models.SendTestEmailRequest) error {
 		Logger.Println(err)
 		return err
 	}
-	ft := f.Name
+	s.From = f.Name
-	if ft == "" {
+	if s.From == "" {
-		ft = f.Address
+		s.From = f.Address
 	}
 	Logger.Println("Creating email using template")
 	// Parse the templates