voku / swiftmailer

lib/classes/Swift/Signers/DKIMSigner.php

Spacing +8 added lines, -8 removed lines

@@ -209,7 +209,7 @@ 
     {
         $this->_privateKey = $privateKey;
         $this->_domainName = $domainName;
-        $this->_signerIdentity = '@' . $domainName;
+        $this->_signerIdentity = '@'.$domainName;
         $this->_selector = $selector;
         $this->_passphrase = $passphrase;
 
@@ -580,7 +580,7 @@ 
         );
 
         if ($this->_bodyCanon != 'simple') {
-            $params['c'] = $this->_headerCanon . '/' . $this->_bodyCanon;
+            $params['c'] = $this->_headerCanon.'/'.$this->_bodyCanon;
         } elseif ($this->_headerCanon != 'simple') {
             $params['c'] = $this->_headerCanon;
         }
@@ -614,7 +614,7 @@ 
 
         $string = '';
         foreach ($params as $k => $v) {
-            $string .= $k . '=' . $v . '; ';
+            $string .= $k.'='.$v.'; ';
         }
 
         $string = trim($string);
@@ -623,14 +623,14 @@ 
         // Add the last DKIM-Signature
         $tmp = $headers->getAll('DKIM-Signature');
         $this->_dkimHeader = end($tmp);
-        $this->_addHeader(trim($this->_dkimHeader->toString()) . "\r\n b=", true);
+        $this->_addHeader(trim($this->_dkimHeader->toString())."\r\n b=", true);
         $this->_endOfHeaders();
 
         if ($this->_debugHeaders) {
             $headers->addTextHeader('X-DebugHash', base64_encode($this->_headerHash));
         }
 
-        $this->_dkimHeader->setValue($string . ' b=' . trim(chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' ')));
+        $this->_dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' ')));
 
         return $this;
     }
@@ -648,7 +648,7 @@ 
                 $name = Swift::strtolowerWithStaticCache(trim($exploded[0]));
                 $value = \str_replace("\r\n", '', $exploded[1]);
                 $value = \preg_replace("/[ \t][ \t]+/", ' ', $value);
-                $header = $name . ':' . trim($value) . ($is_sig ? '' : "\r\n");
+                $header = $name.':'.trim($value).($is_sig ? '' : "\r\n");
             case 'simple':
                 // Nothing to do
         }
@@ -784,13 +784,13 @@ 
           $pkeyId = openssl_get_privatekey($this->_privateKey);
         }
         if (!$pkeyId) {
-            throw new Swift_SwiftException('Unable to load DKIM Private Key [' . openssl_error_string() . ']');
+            throw new Swift_SwiftException('Unable to load DKIM Private Key ['.openssl_error_string().']');
         }
 
         if (openssl_sign($this->_headerCanonData, $signature, $pkeyId, $algorithm)) {
             return $signature;
         }
 
-        throw new Swift_SwiftException('Unable to sign DKIM Hash [' . openssl_error_string() . ']');
+        throw new Swift_SwiftException('Unable to sign DKIM Hash ['.openssl_error_string().']');
     }
 }

lib/classes/Swift/Signers/DomainKeySigner.php

Spacing +5 added lines, -5 removed lines

@@ -145,7 +145,7 @@ 
     {
         $this->_privateKey = $privateKey;
         $this->_domainName = $domainName;
-        $this->_signerIdentity = '@' . $domainName;
+        $this->_signerIdentity = '@'.$domainName;
         $this->_selector = $selector;
     }
 
@@ -424,7 +424,7 @@ 
         $params = array('a' => $this->_hashAlgorithm, 'b' => chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' '), 'c' => $this->_canon, 'd' => $this->_domainName, 'h' => implode(': ', $this->_signedHeaders), 'q' => 'dns', 's' => $this->_selector);
         $string = '';
         foreach ($params as $k => $v) {
-            $string .= $k . '=' . $v . '; ';
+            $string .= $k.'='.$v.'; ';
         }
         $string = trim($string);
         $headers->addTextHeader('DomainKey-Signature', $string);
@@ -446,7 +446,7 @@ 
                 $name = Swift::strtolowerWithStaticCache(trim($exploded[0]));
                 $value = \str_replace("\r\n", '', $exploded[1]);
                 $value = \preg_replace("/[ \t][ \t]+/", ' ', $value);
-                $header = $name . ':' . trim($value) . "\r\n";
+                $header = $name.':'.trim($value)."\r\n";
             case 'simple':
                 // Nothing to do
         }
@@ -546,11 +546,11 @@ 
         $signature = '';
         $pkeyId = openssl_get_privatekey($this->_privateKey);
         if (!$pkeyId) {
-            throw new Swift_SwiftException('Unable to load DomainKey Private Key [' . openssl_error_string() . ']');
+            throw new Swift_SwiftException('Unable to load DomainKey Private Key ['.openssl_error_string().']');
         }
         if (openssl_sign($this->_canonData, $signature, $pkeyId, OPENSSL_ALGO_SHA1)) {
             return $signature;
         }
-        throw new Swift_SwiftException('Unable to sign DomainKey Hash  [' . openssl_error_string() . ']');
+        throw new Swift_SwiftException('Unable to sign DomainKey Hash  ['.openssl_error_string().']');
     }
 }

lib/classes/Swift/ByteStream/FileByteStream.php

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
         if (strpos($path, '?') !== false) {
             $parameter = parse_url($path, PHP_URL_QUERY);
 
-            $this->_path = \str_replace('?' . $parameter, '', $path);
+            $this->_path = \str_replace('?'.$parameter, '', $path);
         } else {
             $this->_path = $path;
         }
@@ -210,7 +210,7 @@ 
             $pointer = @fopen($this->_path, 'rb', false, stream_context_create($opts));
 
             if (!$pointer) {
-                throw new Swift_IoException('Unable to open file for reading [' . $this->_path . ']');
+                throw new Swift_IoException('Unable to open file for reading ['.$this->_path.']');
             }
 
             $this->_reader = $pointer;
@@ -232,7 +232,7 @@ 
             $pointer = @fopen($this->_path, $this->_mode);
 
             if (!$pointer) {
-                throw new Swift_IoException('Unable to open file for writing [' . $this->_path . ']');
+                throw new Swift_IoException('Unable to open file for writing ['.$this->_path.']');
             }
 
             $this->_writer = $pointer;
@@ -303,7 +303,7 @@ 
         $source = @fopen($this->_path, 'rb');
 
         if (!$source) {
-            throw new Swift_IoException('Unable to open file for copying [' . $this->_path . ']');
+            throw new Swift_IoException('Unable to open file for copying ['.$this->_path.']');
         }
 
         fseek($tmpFile, 0, SEEK_SET);

lib/classes/Swift/Encoder/Rfc2231Encoder.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
             if (
                 $currentLine !== ''
                 &&
-                \strlen($currentLine . $encodedChar) > $thisLineLength
+                \strlen($currentLine.$encodedChar) > $thisLineLength
             ) {
                 $lines[] = '';
                 $currentLine = &$lines[$lineCount++];

lib/classes/Swift/Transport/MailTransport.php

Spacing +10 added lines, -10 removed lines

@@ -112,7 +112,7 @@ 
      */
     public function send(Swift_Mime_Message $message, &$failedRecipients = null)
     {
-        $failedRecipients = (array)$failedRecipients;
+        $failedRecipients = (array) $failedRecipients;
 
         $evt = $this->_eventDispatcher->createSendEvent($this, $message);
         if ($evt) {
@@ -124,9 +124,9 @@ 
         }
 
         $count = (
-            \count((array)$message->getTo())
-            + \count((array)$message->getCc())
-            + \count((array)$message->getBcc())
+            \count((array) $message->getTo())
+            + \count((array) $message->getCc())
+            + \count((array) $message->getBcc())
         );
 
         /*
@@ -161,10 +161,10 @@ 
 
         // Separate headers from body
         if (false !== $endHeaders = \strpos($messageStr, "\r\n\r\n")) {
-            $headers = \substr($messageStr, 0, $endHeaders) . "\r\n"; // Keep last EOL
+            $headers = \substr($messageStr, 0, $endHeaders)."\r\n"; // Keep last EOL
             $body = \substr($messageStr, $endHeaders + 4);
         } else {
-            $headers = $messageStr . "\r\n";
+            $headers = $messageStr."\r\n";
             $body = '';
         }
 
@@ -193,9 +193,9 @@ 
         } else {
             $failedRecipients = \array_merge(
                 $failedRecipients,
-                \array_keys((array)$message->getTo()),
-                \array_keys((array)$message->getCc()),
-                \array_keys((array)$message->getBcc())
+                \array_keys((array) $message->getTo()),
+                \array_keys((array) $message->getCc()),
+                \array_keys((array) $message->getBcc())
             );
 
             if ($evt) {
@@ -207,7 +207,7 @@ 
             $count = 0;
         }
 
-        $message->generateId();  // Make sure a new Message ID is used
+        $message->generateId(); // Make sure a new Message ID is used
 
         return $count;
     }

lib/classes/Swift/Transport/SendmailTransport.php

Spacing +6 added lines, -6 removed lines

@@ -111,7 +111,7 @@ 
      */
     public function send(Swift_Mime_Message $message, &$failedRecipients = null)
     {
-        $failedRecipients = (array)$failedRecipients;
+        $failedRecipients = (array) $failedRecipients;
         $command = $this->getCommand();
         $buffer = $this->getBuffer();
         $count = 0;
@@ -128,7 +128,7 @@ 
             }
 
             if (false === strpos($command, ' -f')) {
-                $command .= ' -f' . escapeshellarg($this->_getReversePath($message));
+                $command .= ' -f'.escapeshellarg($this->_getReversePath($message));
             }
 
             $buffer->initialize(array_merge($this->_params, array('command' => $command)));
@@ -139,9 +139,9 @@ 
                 $buffer->setWriteTranslations(array("\r\n" => "\n"));
             }
 
-            $count = \count((array)$message->getTo())
-                     + count((array)$message->getCc())
-                     + count((array)$message->getBcc());
+            $count = \count((array) $message->getTo())
+                     + count((array) $message->getCc())
+                     + count((array) $message->getBcc());
 
             $message->toByteStream($buffer);
             $buffer->flushBuffers();
@@ -159,7 +159,7 @@ 
         } else {
             $this->_throwException(
                 new Swift_TransportException(
-                    'Unsupported sendmail command flags [' . $command . ']. ' .
+                    'Unsupported sendmail command flags ['.$command.']. '.
                     'Must be one of "-bs" or "-t" but can include additional flags.'
                 )
             );

lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
             $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", array(334));
             $challenge = base64_decode(substr($challenge, 4));
             $message = base64_encode(
-                $username . ' ' . $this->_getResponse($password, $challenge)
+                $username.' '.$this->_getResponse($password, $challenge)
                 );
             $agent->executeCommand(sprintf("%s\r\n", $message), array(235));
 
@@ -73,8 +73,8 @@ 
         $k_ipad = \substr($secret, 0, 64) ^ str_repeat(chr(0x36), 64);
         $k_opad = \substr($secret, 0, 64) ^ str_repeat(chr(0x5C), 64);
 
-        $inner = pack('H32', md5($k_ipad . $challenge));
-        $digest = md5($k_opad . $inner);
+        $inner = pack('H32', md5($k_ipad.$challenge));
+        $digest = md5($k_opad.$inner);
 
         return $digest;
     }

lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php

Spacing +20 added lines, -20 removed lines

@@ -85,7 +85,7 @@ 
                 // pad to $bits bit
                 $bin_length = \strlen($bin);
                 if ($bin_length < $bits) {
-                    $bin = str_repeat('0', $bits - $bin_length) . $bin;
+                    $bin = str_repeat('0', $bits - $bin_length).$bin;
                 }
             } else {
                 // negative
@@ -93,7 +93,7 @@ 
                 $bin = base_convert($si, 10, 2);
                 $bin_length = \strlen($bin);
                 if ($bin_length > $bits) {
-                    $bin = str_repeat('1', $bits - $bin_length) . $bin;
+                    $bin = str_repeat('1', $bits - $bin_length).$bin;
                 }
             }
         }
@@ -198,7 +198,7 @@ 
     {
         list($domain, $username) = $this->getDomainAndUsername($username);
         //$challenge, $context, $targetInfoH, $targetName, $domainName, $workstation, $DNSDomainName, $DNSServerName, $blob, $ter
-        list($challenge, , , , , $workstation, , , $blob) = $this->parseMessage2($response);
+        list($challenge,,,,, $workstation,,, $blob) = $this->parseMessage2($response);
 
         if (!$v2) {
             // LMv1
@@ -329,7 +329,7 @@ 
         $desKey1 = $this->createDesKey($key1);
         $desKey2 = $this->createDesKey($key2);
 
-        $constantDecrypt = $this->createByte($this->desEncrypt(self::DESCONST, $desKey1) . $this->desEncrypt(self::DESCONST, $desKey2), 21, false);
+        $constantDecrypt = $this->createByte($this->desEncrypt(self::DESCONST, $desKey1).$this->desEncrypt(self::DESCONST, $desKey2), 21, false);
 
         // SECOND PART
         list($key1, $key2, $key3) = \str_split($constantDecrypt, 7);
@@ -338,7 +338,7 @@ 
         $desKey2 = $this->createDesKey($key2);
         $desKey3 = $this->createDesKey($key3);
 
-        return $this->desEncrypt($challenge, $desKey1) . $this->desEncrypt($challenge, $desKey2) . $this->desEncrypt($challenge, $desKey3);
+        return $this->desEncrypt($challenge, $desKey1).$this->desEncrypt($challenge, $desKey2).$this->desEncrypt($challenge, $desKey3);
     }
 
     /**
@@ -359,7 +359,7 @@ 
         $desKey2 = $this->createDesKey($key2);
         $desKey3 = $this->createDesKey($key3);
 
-        return $this->desEncrypt($challenge, $desKey1) . $this->desEncrypt($challenge, $desKey2) . $this->desEncrypt($challenge, $desKey3);
+        return $this->desEncrypt($challenge, $desKey1).$this->desEncrypt($challenge, $desKey2).$this->desEncrypt($challenge, $desKey3);
     }
 
     /**
@@ -402,9 +402,9 @@ 
         // if $password > 15 than we can't use this method
         if (strlen($password) <= 15) {
             $ntlmHash = $this->md4Encrypt($password);
-            $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username) . $domain));
+            $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain));
 
-            $lmPass = bin2hex($this->md5Encrypt($ntml2Hash, $challenge . $client) . $client);
+            $lmPass = bin2hex($this->md5Encrypt($ntml2Hash, $challenge.$client).$client);
         }
 
         return $this->createByte($lmPass, 24);
@@ -428,14 +428,14 @@ 
     protected function createNTLMv2Hash($password, $username, $domain, $challenge, $targetInfo, $timestamp, $client)
     {
         $ntlmHash = $this->md4Encrypt($password);
-        $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username) . $domain));
+        $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain));
 
         // create blob
         $blob = $this->createBlob($timestamp, $client, $targetInfo);
 
-        $ntlmv2Response = $this->md5Encrypt($ntml2Hash, $challenge . $blob);
+        $ntlmv2Response = $this->md5Encrypt($ntml2Hash, $challenge.$blob);
 
-        return $ntlmv2Response . $blob;
+        return $ntlmv2Response.$blob;
     }
 
     protected function createDesKey($key)
@@ -444,7 +444,7 @@ 
         $len = \strlen($key);
         for ($i = 1; $i < $len; ++$i) {
             list($high, $low) = \str_split(bin2hex($key[$i]));
-            $v = $this->castToByte(ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf) . dechex(hexdec($low) & 0xf)), $i));
+            $v = $this->castToByte(ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xf)), $i));
             $material[] = str_pad(substr(dechex($v), -2), 2, '0', STR_PAD_LEFT); // cast to byte
         }
         $material[] = str_pad(substr(dechex($this->castToByte(ord($key[6]) << 1)), -2), 2, '0');
@@ -467,9 +467,9 @@ 
             list($high, $low) = \str_split($v);
 
             if ($needsParity) {
-                $material[$k] = dechex(hexdec($high) | 0x0) . dechex(hexdec($low) | 0x1);
+                $material[$k] = dechex(hexdec($high) | 0x0).dechex(hexdec($low) | 0x1);
             } else {
-                $material[$k] = dechex(hexdec($high) & 0xf) . dechex(hexdec($low) & 0xe);
+                $material[$k] = dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xe);
             }
         }
 
@@ -493,7 +493,7 @@ 
         $length = $is16 ? $length / 2 : $length;
         $length = $this->createByte(str_pad(dechex($length), 2, '0', STR_PAD_LEFT), 2);
 
-        return $length . $length . $this->createByte(dechex($offset), 4);
+        return $length.$length.$this->createByte(dechex($offset), 4);
     }
 
     /**
@@ -596,7 +596,7 @@ 
         $ipadk = $key ^ str_repeat("\x36", $blocksize);
         $opadk = $key ^ str_repeat("\x5c", $blocksize);
 
-        return pack('H*', md5($opadk . pack('H*', md5($ipadk . $msg))));
+        return pack('H*', md5($opadk.pack('H*', md5($ipadk.$msg))));
     }
 
     /**
@@ -634,8 +634,8 @@ 
     {
         $message = bin2hex($message);
         $messageId = \substr($message, 16, 8);
-        echo substr($message, 0, 16) . " NTLMSSP Signature<br />\n";
-        echo $messageId . " Type Indicator<br />\n";
+        echo substr($message, 0, 16)." NTLMSSP Signature<br />\n";
+        echo $messageId." Type Indicator<br />\n";
 
         if ($messageId === '02000000') {
             $map = array(
@@ -654,7 +654,7 @@ 
             $data = $this->parseMessage2(\hex2bin($message));
 
             foreach ($map as $key => $value) {
-                echo bin2hex($data[$key]) . ' - ' . $data[$key] . ' ||| ' . $value . "<br />\n";
+                echo bin2hex($data[$key]).' - '.$data[$key].' ||| '.$value."<br />\n";
             }
         } elseif ($messageId === '03000000') {
             $i = 0;
@@ -697,7 +697,7 @@ 
             );
 
             foreach ($map as $key => $value) {
-                echo $data[$key] . ' - ' . \hex2bin($data[$key]) . ' ||| ' . $value . "<br />\n";
+                echo $data[$key].' - '.\hex2bin($data[$key]).' ||| '.$value."<br />\n";
             }
         }