Remove some redundant methods

Simplify use of addCustomHeader()
Remove unused parameters from compatSend()

Author: bramley

public_html/lists/admin/class.phplistmailer.php

@@ -30,11 +30,11 @@ class phplistMailer extends phplistMailerBase
     public function __construct($messageid, $email, $inBlast = true, $exceptions = false)
     {
         parent::__construct($exceptions);
-        $this->addCustomHeader('X-phpList-version: '.VERSION);
-        $this->addCustomHeader("X-MessageID: $messageid");
-        $this->addCustomHeader("X-ListMember: $email");
+        $this->addCustomHeader('X-phpList-version', VERSION);
+        $this->addCustomHeader('X-MessageID', $messageid);
+        $this->addCustomHeader('X-ListMember', $email);
         if (GOOGLE_SENDERID != '') {
-            $this->addCustomHeader("Feedback-ID: $messageid:".GOOGLE_SENDERID);
+            $this->addCustomHeader('Feedback-ID', "$messageid:".GOOGLE_SENDERID);
         }
 
         //# amazon SES doesn't like this
@@ -56,7 +56,7 @@ public function __construct($messageid, $email, $inBlast = true, $exceptions = f
         */
 
         if (!USE_AMAZONSES && USE_PRECEDENCE_HEADER) {
-            $this->addCustomHeader('Precedence: bulk');
+            $this->addCustomHeader('Precedence', 'bulk');
         }
 
         $newwrap = getConfig('wordwrap');
@@ -233,10 +233,6 @@ public function append_text($text)
         }
     }
 
-    public function build_message()
-    {
-    }
-
     public function CreateHeader()
     {
         $parentheader = parent::CreateHeader();
@@ -249,32 +245,12 @@ public function CreateHeader()
         return $header;
     }
 
-    public function CreateBody()
-    {
-        $body = parent::CreateBody();
-        /*
-              if ($this->ContentType != 'text/plain') {
-                foreach ($GLOBALS['plugins'] as $plugin) {
-                  $plreturn =  $plugin->mimeWrap($this->messageid,$body,$this->header,$this->ContentTypeHeader,$this->destinationemail);
-                  if (is_array($plreturn) && sizeof($plreturn) == 3) {
-                    $this->header = $plreturn[0];
-                    $body = $plreturn[1];
-                    $this->ContentTypeHeader = $plreturn[2];
-                  }
-                }
-              }
-        */
-        return $body;
-    }
-
     public function compatSend(
         $to_name,
         $to_addr,
         $from_name,
         $from_addr,
-        $subject = '',
-        $headers = '',
-        $envelope = ''
+        $subject = ''
     ) {
         if (!empty($from_addr) && method_exists($this, 'SetFrom')) {
             $this->SetFrom($from_addr, $from_name);
@@ -301,7 +277,7 @@ public function compatSend(
                 if ($pluginHeaders && count($pluginHeaders)) {
                     foreach ($pluginHeaders as $headerItem => $headerValue) {
                         //# @@TODO, do we need to sanitise them?
-                        $this->addCustomHeader($headerItem.': '.$headerValue);
+                        $this->addCustomHeader($headerItem, $headerValue);
                     }
                 }
             }
@@ -319,15 +295,6 @@ public function compatSend(
         return 1;
     }
 
-    public function Send()
-    {
-        if (!parent::Send()) {
-            return 0;
-        }
-
-        return 1;
-    }
-
     public function add_attachment($contents, $filename, $mimetype)
     {
         $this->AddStringAttachment($contents, $filename, 'base64', $mimetype);

public_html/lists/admin/sendemaillib.php

@@ -750,11 +750,11 @@ function sendEmail($messageid, $email, $hash, $htmlpref = 0, $rssitems = array()
     if ($forwardedby) {
         $mail->add_timestamp();
     }
-    $mail->addCustomHeader('List-Help: <'.$text['preferences'].'>');
-    $mail->addCustomHeader('List-Unsubscribe: <'.$text['jumpoffurl'].'>');
-    $mail->addCustomHeader('List-Unsubscribe-Post: List-Unsubscribe=One-Click');
-    $mail->addCustomHeader('List-Subscribe: <'.getConfig('subscribeurl').'>');
-    $mail->addCustomHeader('List-Owner: <mailto:'.getConfig('admin_address').'>');
+    $mail->addCustomHeader('List-Help', '<'.$text['preferences'].'>');
+    $mail->addCustomHeader('List-Unsubscribe', '<'.$text['jumpoffurl'].'>');
+    $mail->addCustomHeader('List-Unsubscribe-Post', 'List-Unsubscribe=One-Click');
+    $mail->addCustomHeader('List-Subscribe', '<'.getConfig('subscribeurl').'>');
+    $mail->addCustomHeader('List-Owner', '<mailto:'.getConfig('admin_address').'>');
 
     list($dummy, $domaincheck) = explode('@', $destinationemail);
     $text_domains = explode("\n", trim(getConfig('alwayssendtextto')));