voku / PHPMailer-BMH

examples/callback_csv.php

Spacing +10 added lines, -10 removed lines

@@ -36,15 +36,15 @@ 
     $remove = $displayData['remove'];
     $removeraw = $displayData['removestat'];
 
-    $msg = $msgnum . ',' . $currentTime . ',' . $ruleNo . ',' . $ruleCat . ',' . $bounceType . ',' . $removeraw . ',' . $email . ',' . $subject;
+    $msg = $msgnum.','.$currentTime.','.$ruleNo.','.$ruleCat.','.$bounceType.','.$removeraw.','.$email.','.$subject;
 
-    $filename = 'logs/bouncelog_' . \date('m') . \date('Y') . '.csv';
+    $filename = 'logs/bouncelog_'.\date('m').\date('Y').'.csv';
     if (!\file_exists($filename)) {
-        $tmsg = 'Msg#,Current Time,Rule Number,Rule Category,Bounce Type,Status,Email,Subject' . "\n" . $msg;
+        $tmsg = 'Msg#,Current Time,Rule Number,Rule Category,Bounce Type,Status,Email,Subject'."\n".$msg;
     } else {
         $fileContents = \file_get_contents($filename);
 
-        if (\stripos($fileContents, "\n" . $msgnum . ',') !== false) {
+        if (\stripos($fileContents, "\n".$msgnum.',') !== false) {
             $doPutFile = false;
         }
 
@@ -53,7 +53,7 @@ 
 
     $handle = \fopen($filename, 'ab');
     if ($handle) {
-        if (\fwrite($handle, $tmsg . "\n") === false) {
+        if (\fwrite($handle, $tmsg."\n") === false) {
             echo 'Cannot write message<br />';
         }
         \fclose($handle);
@@ -61,7 +61,7 @@ 
         echo 'Cannot open file to append<br />';
     }
 
-    echo $msgnum . ': ' . $ruleNo . ' | ' . $ruleCat . ' | ' . $bounceType . ' | ' . $remove . ' | ' . $email . ' | ' . $subject . "<br />\n";
+    echo $msgnum.': '.$ruleNo.' | '.$ruleCat.' | '.$bounceType.' | '.$remove.' | '.$email.' | '.$subject."<br />\n";
 
     return true;
 }
@@ -109,16 +109,16 @@ 
     // change the remove flag from true or 1 to textual representation
     if (\stripos($remove, 'moved') !== false && \stripos($remove, 'hard') !== false) {
         $data['removestat'] = 'moved (hard)';
-        $data['remove'] = '<span style="color:red;">' . 'moved (hard)' . '</span>';
+        $data['remove'] = '<span style="color:red;">'.'moved (hard)'.'</span>';
     } elseif (\stripos($remove, 'moved') !== false && \stripos($remove, 'soft') !== false) {
         $data['removestat'] = 'moved (soft)';
-        $data['remove'] = '<span style="color:gray;">' . 'moved (soft)' . '</span>';
+        $data['remove'] = '<span style="color:gray;">'.'moved (soft)'.'</span>';
     } elseif ($remove == true || $remove == '1') {
         $data['removestat'] = 'deleted';
-        $data['remove'] = '<span style="color:red;">' . 'deleted' . '</span>';
+        $data['remove'] = '<span style="color:red;">'.'deleted'.'</span>';
     } else {
         $data['removestat'] = 'not deleted';
-        $data['remove'] = '<span style="color:gray;">' . 'not deleted' . '</span>';
+        $data['remove'] = '<span style="color:gray;">'.'not deleted'.'</span>';
     }
 
     return $data;

examples/callback_echo.php

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
     $emailName = $displayData['emailName'];
     $emailAddy = $displayData['emailAddy'];
     $remove = $displayData['remove'];
-    echo $msgnum . ': ' . $ruleNo . ' | ' . $ruleCat . ' | ' . $bounceType . ' | ' . $remove . ' | ' . $email . ' | ' . $subject . "<br />\n";
+    echo $msgnum.': '.$ruleNo.' | '.$ruleCat.' | '.$bounceType.' | '.$remove.' | '.$email.' | '.$subject."<br />\n";
 
     return true;
 }
@@ -80,16 +80,16 @@ 
     // change the remove flag from true or 1 to textual representation
     if (\stripos($remove, 'moved') !== false && \stripos($remove, 'hard') !== false) {
         $data['removestat'] = 'moved (hard)';
-        $data['remove'] = '<span style="color:red;">' . 'moved (hard)' . '</span>';
+        $data['remove'] = '<span style="color:red;">'.'moved (hard)'.'</span>';
     } elseif (\stripos($remove, 'moved') !== false && \stripos($remove, 'soft') !== false) {
         $data['removestat'] = 'moved (soft)';
-        $data['remove'] = '<span style="color:gray;">' . 'moved (soft)' . '</span>';
+        $data['remove'] = '<span style="color:gray;">'.'moved (soft)'.'</span>';
     } elseif ($remove == true || $remove == '1') {
         $data['removestat'] = 'deleted';
-        $data['remove'] = '<span style="color:red;">' . 'deleted' . '</span>';
+        $data['remove'] = '<span style="color:red;">'.'deleted'.'</span>';
     } else {
         $data['removestat'] = 'not deleted';
-        $data['remove'] = '<span style="color:gray;">' . 'not deleted' . '</span>';
+        $data['remove'] = '<span style="color:gray;">'.'not deleted'.'</span>';
     }
 
     return $data;

examples/index.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 echo '<hr style="width:200px;" />';
 $time_end = microtime_float();
 $time = $time_end - $time_start;
-echo 'Seconds to process: ' . $time . '<br />';
+echo 'Seconds to process: '.$time.'<br />';
 
 /**
  * @return float
@@ -94,5 +94,5 @@ 
 {
     list($usec, $sec) = \explode(' ', \microtime());
 
-    return (float) $usec + (float) $sec;
+    return (float)$usec + (float)$sec;
 }

examples/callback_database.php

Spacing +5 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
     $emailAddy = $displayData['emailAddy'];
     $remove = $displayData['remove'];
 
-    echo $msgnum . ': ' . $ruleNo . ' | ' . $ruleCat . ' | ' . $bounceType . ' | ' . $remove . ' | ' . $email . ' | ' . $subject . "<br />\n";
+    echo $msgnum.': '.$ruleNo.' | '.$ruleCat.' | '.$bounceType.' | '.$remove.' | '.$email.' | '.$subject."<br />\n";
 
     return true;
 }
@@ -97,16 +97,16 @@ 
     // change the remove flag from true or 1 to textual representation
     if (\stripos($remove, 'moved') !== false && \stripos($remove, 'hard') !== false) {
         $data['removestat'] = 'moved (hard)';
-        $data['remove'] = '<span style="color:red;">' . 'moved (hard)' . '</span>';
+        $data['remove'] = '<span style="color:red;">'.'moved (hard)'.'</span>';
     } elseif (\stripos($remove, 'moved') !== false && \stripos($remove, 'soft') !== false) {
         $data['removestat'] = 'moved (soft)';
-        $data['remove'] = '<span style="color:gray;">' . 'moved (soft)' . '</span>';
+        $data['remove'] = '<span style="color:gray;">'.'moved (soft)'.'</span>';
     } elseif ($remove == true || $remove == '1') {
         $data['removestat'] = 'deleted';
-        $data['remove'] = '<span style="color:red;">' . 'deleted' . '</span>';
+        $data['remove'] = '<span style="color:red;">'.'deleted'.'</span>';
     } else {
         $data['removestat'] = 'not deleted';
-        $data['remove'] = '<span style="color:gray;">' . 'not deleted' . '</span>';
+        $data['remove'] = '<span style="color:gray;">'.'not deleted'.'</span>';
     }
 
     return $data;

src/BounceMailHandler/BounceMailHandler.php

Spacing +38 added lines, -38 removed lines

@@ -12,7 +12,7 @@ 
  */
 namespace BounceMailHandler;
 
-require_once __DIR__ . '/phpmailer-bmh_rules.php';
+require_once __DIR__.'/phpmailer-bmh_rules.php';
 
 /**
  * BounceMailHandler class
@@ -312,7 +312,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();
         }
 
@@ -322,24 +322,24 @@ 
             $this->moveHard = false;
         }
 
-        $port = $this->port . '/' . $this->service . '/' . $this->serviceOption;
+        $port = $this->port.'/'.$this->service.'/'.$this->serviceOption;
 
         \set_time_limit(self::SECONDS_TIMEOUT);
 
         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;
         }
 
-        $this->output('Connected to: ' . $this->mailhost . ' (' . $this->mailboxUserName . ')');
+        $this->output('Connected to: '.$this->mailhost.' ('.$this->mailboxUserName.')');
 
         return true;
     }
@@ -354,14 +354,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) {
@@ -370,7 +370,7 @@ 
                 $nameRaw = $nameArr[\count($nameArr) - 1];
 
                 if (\stripos($nameRaw, 'sent') === false) {
-                    $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;
 
@@ -409,9 +409,9 @@ 
     {
         if ($this->verbose >= $verboseLevel) {
             if ($msg) {
-                echo $msg . $this->bmhNewLine;
+                echo $msg.$this->bmhNewLine;
             } else {
-                echo $this->errorMessage . $this->bmhNewLine;
+                echo $this->errorMessage.$this->bmhNewLine;
             }
         }
     }
@@ -434,13 +434,13 @@ 
         }
 
         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;
         }
 
-        $this->output('Opened ' . $filePath);
+        $this->output('Opened '.$filePath);
 
         return true;
     }
@@ -481,12 +481,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) {
@@ -528,7 +528,7 @@ 
                     $processedResult = $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) {
@@ -554,7 +554,7 @@ 
                         $processedResult = $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);
@@ -564,10 +564,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);
                     }
 
                     $processedResult = $this->processBounce($x, 'BODY', $totalCount);
@@ -598,7 +598,7 @@ 
                     // move the message
                     if (!$this->testMode) {
                         /** @noinspection PhpUsageOfSilenceOperatorInspection */
-                        @\imap_mail_move($this->mailboxLink, (string) $x, $this->hardMailbox);
+                        @\imap_mail_move($this->mailboxLink, (string)$x, $this->hardMailbox);
                     }
 
                     $moveFlag[$x] = true;
@@ -612,7 +612,7 @@ 
                     // move the message
                     if (!$this->testMode) {
                         /** @noinspection PhpUsageOfSilenceOperatorInspection */
-                        @\imap_mail_move($this->mailboxLink, (string) $x, $this->softMailbox);
+                        @\imap_mail_move($this->mailboxLink, (string)$x, $this->softMailbox);
                     }
 
                     $moveFlag[$x] = true;
@@ -636,24 +636,24 @@ 
                 $this->mailboxExist($this->unprocessedBox);
                 // move the message
                 /** @noinspection PhpUsageOfSilenceOperatorInspection */
-                @\imap_mail_move($this->mailboxLink, (string) $x, $this->unprocessedBox);
+                @\imap_mail_move($this->mailboxLink, (string)$x, $this->unprocessedBox);
                 $moveFlag[$x] = true;
             }
 
             \flush();
         }
 
-        $this->output($this->bmhNewLine . 'Closing mailbox, and purging messages');
+        $this->output($this->bmhNewLine.'Closing mailbox, and purging messages');
 
         /** @noinspection PhpUsageOfSilenceOperatorInspection */
         @\imap_expunge($this->mailboxLink);
         \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;
     }
@@ -763,7 +763,7 @@ 
           break;
 
         default: // un-support 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;
       }
@@ -810,7 +810,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 = [
@@ -835,7 +835,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;
             }
@@ -878,19 +878,19 @@ 
         if (\trim($mailbox) == '') {
             // this is a critical error with either the mailbox name blank or an invalid mailbox name
             // need to stop processing and exit at this point
-            echo 'Invalid mailbox name for move operation. Cannot continue: ' . $mailbox . "<br />\n";
+            echo 'Invalid mailbox name for move operation. Cannot continue: '.$mailbox."<br />\n";
             exit();
         }
 
-        $port = $this->port . '/' . $this->service . '/' . $this->serviceOption;
+        $port = $this->port.'/'.$this->service.'/'.$this->serviceOption;
         /** @noinspection PhpUsageOfSilenceOperatorInspection */
-        $mbox = @\imap_open('{' . $this->mailhost . ':' . $port . '}', $this->mailboxUserName, $this->mailboxPassword, \OP_HALFOPEN);
+        $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)) {
@@ -905,7 +905,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

@@ -522,7 +522,7 @@ 
 
     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 {
@@ -572,14 +572,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;
         }
     }
 
@@ -1549,7 +1549,7 @@ 
          *   Delivery to the following recipients failed.
          *   xxxxx@yourdomain.com
          */
-        elseif (\preg_match("/Delivery to the following recipients failed.*\n.*\n.*" . \preg_quote($result['email'], '/') . '/i', $dsn_msg)) {
+        elseif (\preg_match("/Delivery to the following recipients failed.*\n.*\n.*".\preg_quote($result['email'], '/').'/i', $dsn_msg)) {
             $result['rule_cat'] = 'other';
             $result['rule_no'] = '0176';
         }
@@ -1598,11 +1598,11 @@ 
 
     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 {