voku / PHPMailer-BMH

src/BounceMailHandler/BounceMailHandler.php

Spacing +35 added lines, -35 removed lines

@@ -16,7 +16,7 @@ 
  */
 namespace BounceMailHandler;
 
-require_once __DIR__ . '/phpmailer-bmh_rules.php';
+require_once __DIR__.'/phpmailer-bmh_rules.php';
 
 /**
  * BounceMailHandler class
@@ -310,7 +310,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();
     }
 
@@ -320,24 +320,24 @@ 
       $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;
     }
 
-    $this->output('Connected to: ' . $this->mailhost . ' (' . $this->mailboxUserName . ')');
+    $this->output('Connected to: '.$this->mailhost.' ('.$this->mailboxUserName.')');
 
     return true;
   }
@@ -352,14 +352,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) {
@@ -368,7 +368,7 @@ 
         $nameRaw = $nameArr[count($nameArr) - 1];
 
         if (false === stripos($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;
 
@@ -408,9 +408,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;
       }
     }
   }
@@ -433,13 +433,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;
   }
@@ -476,12 +476,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) {
@@ -523,7 +523,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) {
@@ -549,7 +549,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);
@@ -559,10 +559,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);
@@ -638,17 +638,17 @@ 
       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;
   }
@@ -756,7 +756,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;
       }
@@ -803,7 +803,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(
@@ -828,7 +828,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;
       }
@@ -871,19 +871,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)) {
@@ -898,7 +898,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;