From d7871477d21568fce650e8745e1920273f12ac5e Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Tue, 18 Jul 2017 14:49:55 -0400
Subject: [PATCH] fixing the from name, the previous function was sending
 emails to spam for some reason

---
 models/admin/events/list.php     |  2 +-
 models/front/events/frontAdd.php | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/models/admin/events/list.php b/models/admin/events/list.php
index 8f1f4f8..b1e9b51 100644
--- a/models/admin/events/list.php
+++ b/models/admin/events/list.php
@@ -926,7 +926,7 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
             $current_status = $event['fieldData']['status']['value'];
 
             if($to_email){
-                $message  = $siteName = get_bloginfo( 'name' ) . " Events<br><br>";
+                $message  = get_bloginfo( 'name' ) . " Events<br><br>";
                 $message .= "Event Name: " . $event_title . "<br>";
                 $message .= "Event Description: $event_intro<br>";
                 $message .= "Contact Name: $admin_name<br><br>";
diff --git a/models/front/events/frontAdd.php b/models/front/events/frontAdd.php
index 5a2730e..35a6183 100644
--- a/models/front/events/frontAdd.php
+++ b/models/front/events/frontAdd.php
@@ -273,6 +273,7 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents
         $confirmation_page_id = get_option('glm_members_database_option_event_confirmation_id');
         $redirect_url = get_permalink($confirmation_page_id);
         
+        
         // if form is submitted
         if ( isset( $_REQUEST['newEvent'] ) && $_REQUEST['newEvent'] == "Add Event" ) {
 
@@ -655,27 +656,28 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents
                     }
 
                     // change the default wordpress from name when sending mail
-                    add_filter('wp_mail_from_name','yoursite_wp_mail_from_name');
-                    function yoursite_wp_mail_from_name($name) {
-                        $siteName = get_bloginfo('name');
-                        return $siteName;
-                    }
-                    // Send confirmation email, set the content type to allow html by using this filter
+//                    add_filter('wp_mail_from_name','yoursite_wp_mail_from_name');
+//                    function yoursite_wp_mail_from_name($name) {
+//                        $siteName = get_bloginfo('name');
+//                        return $siteName;
+//                    }
+//                    // Send confirmation email, set the content type to allow html by using this filter
                     add_filter( 'wp_mail_content_type', 'set_content_type' );
-
+                    
+                    $site_name = bloginfo('name');
                     $to      = $to_email;
                     $subject = 'Event Form Submission';
                     
                     $message = $htmlMessage;
                     $userBody = $userMessage;
 
-                    $header[] = 'From:' . $fromEmail;
-                    $header[] = 'Reply-To:' . $contactEmail;    
+                    $header[] = "From: $site_name <$fromEmail>";
+                    $header[] = 'Reply-To:' . $adminEmail;    
                     
                     wp_mail($to, $subject, $message, $header);
                     
                     // send a copy to the user submitting the email, using different headers and email template file
-                    $userHeader[] = 'From: ' . $fromEmail;
+                    $userHeader[] = "From: $site_name <$fromEmail>";
                     $userHeader[] = 'Reply-To: No-Reply@gaslightmedia.com';  
                     
                     if(wp_mail($adminEmail, $subject, $userBody, $userHeader)){
-- 
2.17.1