mailparse: Misc. Fixes

osTicket · Nov 8, 2022 · f85f903 · f85f903
1 parent 46b7899
commit f85f903
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/include/class.mailparse.php b/include/class.mailparse.php
@@ -36,16 +36,12 @@ class Mail_Parse {
     function __construct(&$mimeMessage, $charset=null){
 
         $this->mime_message = &$mimeMessage;
-
-        if($charset)
-            $this->charset = $charset;
-
         $this->include_bodies = true;
         $this->decode_headers = false;
         $this->decode_bodies = true;
 
         //Desired charset
-        if($charset)
+        if ($charset)
             $this->charset = $charset;
 
         $this->splitBodyHeader();
@@ -213,7 +209,7 @@ static function findHeaderEntry($headers, $name, $allEntries=false) {
 
     function getHeaderEntry($name) {
         return $this->hasHeaders()
-            ? self::findHeaderEntry($this->headers, $name)
+            ? self::findHeaderEntry($this->getHeaders(), $name)
             : false;
     }
 
@@ -763,7 +759,7 @@ class EmailDataParser {
         'attachOnParseError' => true
     ];
     private $stream;
-    private $errors;
+    private $errors = [];
 
     function __construct($stream=null, array $options = []) {
         $this->stream = $stream;
@@ -783,7 +779,7 @@ function parse($stream) {
         }
 
         $parser= new Mail_Parse($contents);
-        if (1 ||  !$parser->decode())
+        if (!$parser->decode())
             return $this->onParseError($parser);
 
         if (!($data = $parser->getHeaderInfo()))
@@ -830,14 +826,18 @@ private function onParseError($parser) {
     }
 
     private function err($error) {
-        $this->errors [] = $error;
-        return false;
+        // add error and return false
+        return ($this->addError($error) && false);
     }
 
     function getErrors() {
         return $this->errors;
     }
 
+    function addError($error) {
+        $this->errors [] = $error;
+    }
+
     function getError() {
         return $this->lastError();
     }