voku / PHPMailer-BMH

src/BounceMailHandler/BounceMailHandler.php

Spacing +34 added lines, -34 removed lines

@@ -16,7 +16,7 @@ 
  */
 namespace BounceMailHandler;
 
-require_once __DIR__ . '/phpmailer-bmh_rules.php';
+require_once __DIR__.'/phpmailer-bmh_rules.php';
 
 /**
  * BounceMailHandler class
@@ -277,7 +277,7 @@ 
   {
     // before starting the processing, let's check the delete flag and do global deletes if true
     if (trim($this->deleteMsgDate) != '') {
-      echo 'processing global delete based on date of ' . $this->deleteMsgDate . '<br />';
+      echo 'processing global delete based on date of '.$this->deleteMsgDate.'<br />';
       $this->globalDelete();
     }
 
@@ -287,23 +287,23 @@ 
       $this->moveHard = false;
     }
 
-    $port = $this->port . '/' . $this->service . '/' . $this->serviceOption;
+    $port = $this->port.'/'.$this->service.'/'.$this->serviceOption;
 
     set_time_limit(6000);
 
     if (!$this->testMode) {
-      $this->mailboxLink = imap_open('{' . $this->mailhost . ':' . $port . '}' . $this->boxname, $this->mailboxUserName, $this->mailboxPassword, CL_EXPUNGE | ($this->testMode ? OP_READONLY : 0));
+      $this->mailboxLink = imap_open('{'.$this->mailhost.':'.$port.'}'.$this->boxname, $this->mailboxUserName, $this->mailboxPassword, CL_EXPUNGE | ($this->testMode ? OP_READONLY : 0));
     } else {
-      $this->mailboxLink = imap_open('{' . $this->mailhost . ':' . $port . '}' . $this->boxname, $this->mailboxUserName, $this->mailboxPassword, ($this->testMode ? OP_READONLY : 0));
+      $this->mailboxLink = imap_open('{'.$this->mailhost.':'.$port.'}'.$this->boxname, $this->mailboxUserName, $this->mailboxPassword, ($this->testMode ? OP_READONLY : 0));
     }
 
     if (!$this->mailboxLink) {
-      $this->errorMessage = 'Cannot create ' . $this->service . ' connection to ' . $this->mailhost . $this->bmhNewLine . 'Error MSG: ' . imap_last_error();
+      $this->errorMessage = 'Cannot create '.$this->service.' connection to '.$this->mailhost.$this->bmhNewLine.'Error MSG: '.imap_last_error();
       $this->output();
 
       return false;
     } else {
-      $this->output('Connected to: ' . $this->mailhost . ' (' . $this->mailboxUserName . ')');
+      $this->output('Connected to: '.$this->mailhost.' ('.$this->mailboxUserName.')');
 
       return true;
     }
@@ -319,14 +319,14 @@ 
     $dateArr = explode('-', $this->deleteMsgDate); // date format is yyyy-mm-dd
     $delDate = mktime(0, 0, 0, $dateArr[1], $dateArr[2], $dateArr[0]);
 
-    $port = $this->port . '/' . $this->service . '/' . $this->serviceOption;
-    $mboxt = imap_open('{' . $this->mailhost . ':' . $port . '}', $this->mailboxUserName, $this->mailboxPassword, OP_HALFOPEN);
+    $port = $this->port.'/'.$this->service.'/'.$this->serviceOption;
+    $mboxt = imap_open('{'.$this->mailhost.':'.$port.'}', $this->mailboxUserName, $this->mailboxPassword, OP_HALFOPEN);
 
     if ($mboxt === false) {
       return false;
     }
 
-    $list = imap_getmailboxes($mboxt, '{' . $this->mailhost . ':' . $port . '}', '*');
+    $list = imap_getmailboxes($mboxt, '{'.$this->mailhost.':'.$port.'}', '*');
 
     if (is_array($list)) {
       foreach ($list as $key => $val) {
@@ -335,7 +335,7 @@ 
         $nameRaw = $nameArr[count($nameArr) - 1];
 
         if (!stristr($nameRaw, 'sent')) {
-          $mboxd = imap_open('{' . $this->mailhost . ':' . $port . '}' . $nameRaw, $this->mailboxUserName, $this->mailboxPassword, CL_EXPUNGE);
+          $mboxd = imap_open('{'.$this->mailhost.':'.$port.'}'.$nameRaw, $this->mailboxUserName, $this->mailboxPassword, CL_EXPUNGE);
           $messages = imap_sort($mboxd, SORTDATE, 0);
           $i = 0;
 
@@ -375,9 +375,9 @@ 
   {
     if ($this->verbose >= $verboseLevel) {
       if (empty($msg)) {
-        echo $this->errorMessage . $this->bmhNewLine;
+        echo $this->errorMessage.$this->bmhNewLine;
       } else {
-        echo $msg . $this->bmhNewLine;
+        echo $msg.$this->bmhNewLine;
       }
     }
   }
@@ -400,12 +400,12 @@ 
     }
 
     if (!$this->mailboxLink) {
-      $this->errorMessage = 'Cannot open the mailbox file to ' . $filePath . $this->bmhNewLine . 'Error MSG: ' . imap_last_error();
+      $this->errorMessage = 'Cannot open the mailbox file to '.$filePath.$this->bmhNewLine.'Error MSG: '.imap_last_error();
       $this->output();
 
       return false;
     } else {
-      $this->output('Opened ' . $filePath);
+      $this->output('Opened '.$filePath);
 
       return true;
     }
@@ -443,12 +443,12 @@ 
     $unprocessedCount = 0;
     $deletedCount = 0;
     $movedCount = 0;
-    $this->output('Total: ' . $totalCount . ' messages ');
+    $this->output('Total: '.$totalCount.' messages ');
 
     // process maximum number of messages
     if ($fetchedCount > $this->maxMessages) {
       $fetchedCount = $this->maxMessages;
-      $this->output('Processing first ' . $fetchedCount . ' messages ');
+      $this->output('Processing first '.$fetchedCount.' messages ');
     }
 
     if ($this->testMode) {
@@ -485,7 +485,7 @@ 
           $processed = $this->processBounce($x, 'DSN', $totalCount);
         } else {
           // not standard DSN msg
-          $this->output('Msg #' . $x . ' is not a standard DSN message', self::VERBOSE_REPORT);
+          $this->output('Msg #'.$x.' is not a standard DSN message', self::VERBOSE_REPORT);
 
           if ($this->debugBodyRule) {
             if ($structure->ifdescription) {
@@ -507,7 +507,7 @@ 
             $processed = $this->processBounce($x, 'DSN', $totalCount);
           } else {
             // not standard DSN msg
-            $this->output('Msg #' . $x . ' is not a standard DSN message', self::VERBOSE_REPORT);
+            $this->output('Msg #'.$x.' is not a standard DSN message', self::VERBOSE_REPORT);
 
             if ($this->debugBodyRule) {
               $this->output("  Content-Type : {$match[1]}", self::VERBOSE_DEBUG);
@@ -517,10 +517,10 @@ 
           }
         } else {
           // didn't get content-type header
-          $this->output('Msg #' . $x . ' is not a well-formatted MIME mail, missing Content-Type', self::VERBOSE_REPORT);
+          $this->output('Msg #'.$x.' is not a well-formatted MIME mail, missing Content-Type', self::VERBOSE_REPORT);
 
           if ($this->debugBodyRule) {
-            $this->output('  Headers: ' . $this->bmhNewLine . $header . $this->bmhNewLine, self::VERBOSE_DEBUG);
+            $this->output('  Headers: '.$this->bmhNewLine.$header.$this->bmhNewLine, self::VERBOSE_DEBUG);
           }
 
           $processed = $this->processBounce($x, 'BODY', $totalCount);
@@ -589,15 +589,15 @@ 
       flush();
     }
 
-    $this->output($this->bmhNewLine . 'Closing mailbox, and purging messages');
+    $this->output($this->bmhNewLine.'Closing mailbox, and purging messages');
 
     imap_close($this->mailboxLink);
 
-    $this->output('Read: ' . $fetchedCount . ' messages');
-    $this->output($processedCount . ' action taken');
-    $this->output($unprocessedCount . ' no action taken');
-    $this->output($deletedCount . ' messages deleted');
-    $this->output($movedCount . ' messages moved');
+    $this->output('Read: '.$fetchedCount.' messages');
+    $this->output($processedCount.' action taken');
+    $this->output($unprocessedCount.' no action taken');
+    $this->output($deletedCount.' messages deleted');
+    $this->output($movedCount.' messages moved');
 
     return true;
   }
@@ -695,7 +695,7 @@ 
           break;
 
         default: // unsupport Content-type
-          $this->output('Msg #' . $pos . ' is unsupported Content-Type:' . $structure->type, self::VERBOSE_REPORT);
+          $this->output('Msg #'.$pos.' is unsupported Content-Type:'.$structure->type, self::VERBOSE_REPORT);
 
           return false;
       }
@@ -742,7 +742,7 @@ 
       }
 
       if ($this->testMode) {
-        $this->output('Match: ' . $ruleNumber . ':' . $ruleCategory . '; ' . $bounceType . '; ' . $email);
+        $this->output('Match: '.$ruleNumber.':'.$ruleCategory.'; '.$bounceType.'; '.$email);
       } else {
         // code below will use the Callback function, but return no value
         $params = array(
@@ -767,7 +767,7 @@ 
     } else {
       // match rule, do bounce action
       if ($this->testMode) {
-        $this->output('Match: ' . $ruleNumber . ':' . $ruleCategory . '; ' . $bounceType . '; ' . $email);
+        $this->output('Match: '.$ruleNumber.':'.$ruleCategory.'; '.$bounceType.'; '.$email);
 
         return true;
       } else {
@@ -814,14 +814,14 @@ 
       exit();
     }
 
-    $port = $this->port . '/' . $this->service . '/' . $this->serviceOption;
-    $mbox = imap_open('{' . $this->mailhost . ':' . $port . '}', $this->mailboxUserName, $this->mailboxPassword, OP_HALFOPEN);
+    $port = $this->port.'/'.$this->service.'/'.$this->serviceOption;
+    $mbox = imap_open('{'.$this->mailhost.':'.$port.'}', $this->mailboxUserName, $this->mailboxPassword, OP_HALFOPEN);
 
     if ($mbox === false) {
       return false;
     }
 
-    $list = imap_getmailboxes($mbox, '{' . $this->mailhost . ':' . $port . '}', '*');
+    $list = imap_getmailboxes($mbox, '{'.$this->mailhost.':'.$port.'}', '*');
     $mailboxFound = false;
 
     if (is_array($list)) {
@@ -836,7 +836,7 @@ 
 
       if (($mailboxFound === false) && $create) {
         /** @noinspection PhpUsageOfSilenceOperatorInspection */
-        @imap_createmailbox($mbox, imap_utf7_encode('{' . $this->mailhost . ':' . $port . '}' . $mailbox));
+        @imap_createmailbox($mbox, imap_utf7_encode('{'.$this->mailhost.':'.$port.'}'.$mailbox));
         imap_close($mbox);
 
         return true;

src/BounceMailHandler/phpmailer-bmh_rules.php

Spacing +9 added lines, -9 removed lines

@@ -493,7 +493,7 @@ 
   global $rule_categories, $bmh_newline;
   if ($result['rule_no'] == '0000') {
     if ($debug_mode) {
-      echo 'Body:' . $bmh_newline . $body . $bmh_newline;
+      echo 'Body:'.$bmh_newline.$body.$bmh_newline;
       echo $bmh_newline;
     }
   } else {
@@ -541,14 +541,14 @@ 
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
     $email_arr = @imap_rfc822_parse_adrlist($email, 'default.domain.name');
     if (isset($email_arr[0]->host) && $email_arr[0]->host != '.SYNTAX-ERROR.' && $email_arr[0]->host != 'default.domain.name') {
-      $result['email'] = $email_arr[0]->mailbox . '@' . $email_arr[0]->host;
+      $result['email'] = $email_arr[0]->mailbox.'@'.$email_arr[0]->host;
     }
   } elseif (preg_match('/Final-Recipient: rfc822;(.*)/i', $dsn_report, $match)) {
     $email = trim($match[1], "<> \t\r\n\0\x0B");
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
     $email_arr = @imap_rfc822_parse_adrlist($email, 'default.domain.name');
     if (isset($email_arr[0]->host) && $email_arr[0]->host != '.SYNTAX-ERROR.' && $email_arr[0]->host != 'default.domain.name') {
-      $result['email'] = $email_arr[0]->mailbox . '@' . $email_arr[0]->host;
+      $result['email'] = $email_arr[0]->mailbox.'@'.$email_arr[0]->host;
     }
   }
 
@@ -1517,7 +1517,7 @@ 
          *   Delivery to the following recipients failed.
          *   xxxxx@yourdomain.com
          */
-        elseif (preg_match("/Delivery to the following recipients failed.*\n.*\n.*" . $result['email'] . '/i', $dsn_msg)) {
+        elseif (preg_match("/Delivery to the following recipients failed.*\n.*\n.*".$result['email'].'/i', $dsn_msg)) {
           $result['rule_cat'] = 'other';
           $result['rule_no'] = '0176';
         }
@@ -1565,11 +1565,11 @@ 
   global $rule_categories, $bmh_newline;
   if ($result['rule_no'] == '0000') {
     if ($debug_mode) {
-      echo 'email: ' . $result['email'] . $bmh_newline;
-      echo 'Action: ' . $action . $bmh_newline;
-      echo 'Status: ' . $status_code . $bmh_newline;
-      echo 'Diagnostic-Code: ' . $diag_code . $bmh_newline;
-      echo "DSN Message:<br />\n" . $dsn_msg . $bmh_newline;
+      echo 'email: '.$result['email'].$bmh_newline;
+      echo 'Action: '.$action.$bmh_newline;
+      echo 'Status: '.$status_code.$bmh_newline;
+      echo 'Diagnostic-Code: '.$diag_code.$bmh_newline;
+      echo "DSN Message:<br />\n".$dsn_msg.$bmh_newline;
       echo $bmh_newline;
     }
   } else {