add setting PHPMAILERSUBSCRIBEHOST to be used for subscribe page mails

Author: michield

public_html/lists/admin/class.phplistmailer.php

@@ -80,6 +80,13 @@ public function __construct($messageid, $email, $inBlast = true, $exceptions = f
 
         if ($GLOBALS['emailsenderplugin']) {
             $this->Mailer = 'plugin';
+        } elseif (!$this->inBlast && empty($_SESSION['adminloggedin']) && 
+            defined('PHPMAILERSUBSCRIBEHOST') && 
+            defined('PHPMAILERSUBSCRIBEHOST') && PHPMAILERSUBSCRIBEHOST != '') {
+#            logEvent('Sending email via PHPMAILERSUBSCRIBEHOST '.PHPMAILERSUBSCRIBEHOST);
+            $this->Host = PHPMAILERSUBSCRIBERHOST;
+            $this->Port = PHPMAILERSUBSCRIBERHOST;
+            $this->Mailer = 'smtp';
         } elseif ($this->inBlast && defined('PHPMAILERBLASTHOST') && defined('PHPMAILERBLASTPORT') && PHPMAILERBLASTHOST != '') {
             $this->Host = PHPMAILERBLASTHOST;
             $this->Port = PHPMAILERBLASTPORT;
@@ -95,7 +102,7 @@ public function __construct($messageid, $email, $inBlast = true, $exceptions = f
             if (defined('PHPMAILERPORT')) {
                 $this->Port = PHPMAILERPORT;
             }
-            //logEvent('Sending email via '.PHPMAILERHOST);
+#            logEvent('Sending email via PHPMAILERTESTHOST '.PHPMAILERTESTHOST);
             $this->Host = PHPMAILERTESTHOST;
             if (isset($GLOBALS['phpmailer_smtpuser']) && $GLOBALS['phpmailer_smtpuser'] != ''
                 && isset($GLOBALS['phpmailer_smtppassword']) && $GLOBALS['phpmailer_smtppassword']
@@ -111,6 +118,7 @@ public function __construct($messageid, $email, $inBlast = true, $exceptions = f
             }
             //logEvent('Sending email via '.PHPMAILERHOST);
             $this->Host = PHPMAILERHOST;
+#            logEvent('Sending email via PHPMAILERHOST '.PHPMAILERHOST);
             if (POP_BEFORE_SMTP) {
                 // authenticate using the smtp user and password
                 $pop = new POP3();

public_html/lists/admin/init.php

@@ -343,6 +343,24 @@
 if (!defined('PHPMAILERHOST')) {
     define('PHPMAILERHOST', '');
 }
+if (!defined('PHPMAILERSUBSCRIBEHOST') && defined('PHPMAILERHOST')) {
+    define('PHPMAILERSUBSCRIBEHOST', PHPMAILERHOST);
+}
+if (!defined('PHPMAILERBLASTHOST') && defined('PHPMAILERHOST')) {
+    define('PHPMAILERBLASTHOST', PHPMAILERHOST);
+}
+if (!defined('PHPMAILERBLASTPORT') && defined('PHPMAILERPORT')) {
+    define('PHPMAILERBLASTPORT', PHPMAILERPORT);
+}
+if (!defined('PHPMAILERTESTHOST') && defined('PHPMAILERHOST')) {
+    define('PHPMAILERTESTHOST', PHPMAILERHOST);
+}
+if (!defined('PHPMAILER_SECURE')) {
+    define('PHPMAILER_SECURE', 'auto');
+}
+if (!defined('PHPMAILER_SMTP_DEBUG')) {
+    define('PHPMAILER_SMTP_DEBUG', 0);
+}
 if (!defined('MANUALLY_PROCESS_QUEUE')) {
     define('MANUALLY_PROCESS_QUEUE', 1);
 }
@@ -599,21 +617,6 @@
 if (!defined('INTERFACELIB')) {
     define('INTERFACELIB', 1);
 }
-if (!defined('PHPMAILERBLASTHOST') && defined('PHPMAILERHOST')) {
-    define('PHPMAILERBLASTHOST', PHPMAILERHOST);
-}
-if (!defined('PHPMAILERBLASTPORT') && defined('PHPMAILERPORT')) {
-    define('PHPMAILERBLASTPORT', PHPMAILERPORT);
-}
-if (!defined('PHPMAILERTESTHOST') && defined('PHPMAILERHOST')) {
-    define('PHPMAILERTESTHOST', PHPMAILERHOST);
-}
-if (!defined('PHPMAILER_SECURE')) {
-    define('PHPMAILER_SECURE', 'auto');
-}
-if (!defined('PHPMAILER_SMTP_DEBUG')) {
-    define('PHPMAILER_SMTP_DEBUG', 0);
-}
 if (!defined('POP_BEFORE_SMTP')) {
     define('POP_BEFORE_SMTP', '');
 }