From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 3 Sep 2019 15:21:45 +0000 (-0400)
Subject: Update for errors
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=93b42ed4eea8b349b418cb03cb87b587a1f900ae;p=WP-Plugins%2Fglm-member-db-messages.git

Update for errors

Deal with the new refracted code.
---

diff --git a/classes/mailer.php b/classes/mailer.php
index bc9ce51..7aaaa34 100644
--- a/classes/mailer.php
+++ b/classes/mailer.php
@@ -8,6 +8,37 @@ namespace GlmMessages;
  */
 class mailer
 {
+
+    /**
+     * WordPress Database Object
+     *
+     * @var $wpdb
+     * @access public
+     */
+    public $wpdb;
+    /**
+     * Plugin Configuration Data
+     *
+     * @var $config
+     * @access public
+     */
+    public $config;
+
+    /**
+     * Constructor
+     *
+     * This contructor sets up this model. At this time that only includes
+     * storing away the WordPress data object.
+     *
+     * @return object Class object
+     *
+     */
+    public function __construct( $wpdb, $config )
+    {
+        $this->wpdb   = $wpdb;
+        $this->config = $config;
+    }
+
     /**
      * sendHtmlEmail
      *
@@ -42,9 +73,6 @@ class mailer
         }
 
         wp_mail( $to, $subject, $message, $header );
-
-        remove_filter( 'wp_mail_from_name' );
-        remove_filter( 'wp_mail_content_type' );
     }
 
     /**
diff --git a/models/admin/ajax/newsletter.php b/models/admin/ajax/newsletter.php
index 6ec8d8d..4a01926 100644
--- a/models/admin/ajax/newsletter.php
+++ b/models/admin/ajax/newsletter.php
@@ -8,6 +8,9 @@
 
 require_once GLM_MEMBERS_MESSAGES_PLUGIN_CLASS_PATH.'/data/dataEmailMessages.php';
 require_once GLM_MEMBERS_MESSAGES_PLUGIN_CLASS_PATH.'/data/dataEmailTemplates.php';
+require_once GLM_MEMBERS_MESSAGES_PLUGIN_CLASS_PATH.'/mailer.php';
+
+use GlmMessages\mailer as glmMailer;
 
 /**
  * GLmMembersFront_event_detail
@@ -36,7 +39,7 @@ class GlmMembersAdmin_ajax_newsletter extends GlmDataEmailMessages
      */
     public $config;
 
-    /*
+    /**
      * Constructor
      *
      * This contructor sets up this model. At this time that only includes
@@ -69,6 +72,7 @@ class GlmMembersAdmin_ajax_newsletter extends GlmDataEmailMessages
      */
     public function modelAction($actionData = false)
     {
+        $glmMailer    = new glmMailer( $this->wpdb, $this->config );
         $view         = 'newsletter';
         $emailContent = '';
         $Templates    = new GlmDataEmailTemplates( $this->wpdb, $this->config );
@@ -95,7 +99,7 @@ class GlmMembersAdmin_ajax_newsletter extends GlmDataEmailMessages
                     $smarty->templateAssign( $k, $d );
                 }
             }
-            $message['message_body'] = $this->fixImages( $message['message_body'] );
+            $message['message_body'] = $glmMailer->fixImages( $message['message_body'] );
             $htmlMessage = wpautop( $message['message_body'] );
             $emailContent = $smarty->template->fetch( 'eval:' . $htmlMessage );
         } else {
diff --git a/models/admin/messages/index.php b/models/admin/messages/index.php
index 804caa9..e6164a2 100644
--- a/models/admin/messages/index.php
+++ b/models/admin/messages/index.php
@@ -661,7 +661,7 @@ class GlmMembersAdmin_messages_index extends GlmDataEmailMessages
      */
     public function queueHtmlMessages( $data, $messageId, $sendNow = false )
     {
-        $glmMailer    = new glmMailer();
+        $glmMailer    = new glmMailer( $this->wpdb, $this->config );
         $message      = $this->getEntry( $messageId );
         $fromEmail    = $message['from_email'];
         $fromName     = $message['from_name'];