voku / swiftmailer

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/XOAuth2Authenticator.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     {
         try {
             $param = $this->constructXOAuth2Params($email, $token);
-            $agent->executeCommand('AUTH XOAUTH2 ' . $param . "\r\n", array(235));
+            $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", array(235));
 
             return true;
         } catch (Swift_TransportException $e) {

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

Spacing +20 added lines, -20 removed lines

@@ -86,7 +86,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
@@ -94,7 +94,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;
                 }
             }
         }
@@ -199,7 +199,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
@@ -325,7 +325,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);
@@ -334,7 +334,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);
     }
 
     /**
@@ -355,7 +355,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);
     }
 
     /**
@@ -400,9 +400,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);
@@ -426,14 +426,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)
@@ -442,7 +442,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');
@@ -465,9 +465,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);
             }
         }
 
@@ -490,7 +490,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);
     }
 
     /**
@@ -612,7 +612,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))));
     }
 
     /**
@@ -666,8 +666,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(
@@ -686,7 +686,7 @@ 
             $data = $this->parseMessage2($this->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;
@@ -729,7 +729,7 @@ 
             );
 
             foreach ($map as $key => $value) {
-                echo $data[$key] . ' - ' . $this->hex2bin($data[$key]) . ' ||| ' . $value . "<br />\n";
+                echo $data[$key].' - '.$this->hex2bin($data[$key]).' ||| '.$value."<br />\n";
             }
         }
 

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

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $message = base64_encode($username . chr(0) . $username . chr(0) . $password);
+            $message = base64_encode($username.chr(0).$username.chr(0).$password);
             $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), array(235));
 
             return true;

lib/classes/Swift/Transport/SendmailTransport.php

Spacing +6 added lines, -6 removed lines

@@ -99,7 +99,7 @@ 
      */
     public function send(Swift_Mime_Message $message, &$failedRecipients = null)
     {
-        $failedRecipients = (array)$failedRecipients;
+        $failedRecipients = (array) $failedRecipients;
         $command = $this->getCommand();
         $buffer = $this->getBuffer();
         $count = 0;
@@ -116,7 +116,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)));
@@ -127,9 +127,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();
@@ -152,7 +152,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/StreamBuffer.php

Spacing +11 added lines, -11 removed lines

@@ -183,7 +183,7 @@ 
             if (!$line) {
                 $metas = stream_get_meta_data($this->_out);
                 if ($metas['timed_out']) {
-                    throw new Swift_IoException('Connection to ' . $this->_getReadConnectionDescription() . ' Timed Out');
+                    throw new Swift_IoException('Connection to '.$this->_getReadConnectionDescription().' Timed Out');
                 }
             }
 
@@ -212,7 +212,7 @@ 
                 $metas = stream_get_meta_data($this->_out);
                 if ($metas['timed_out']) {
                     throw new Swift_IoException(
-                        'Connection to ' . $this->_getReadConnectionDescription() . ' Timed Out'
+                        'Connection to '.$this->_getReadConnectionDescription().' Timed Out'
                     );
                 }
             }
@@ -253,7 +253,7 @@ 
                 $bytesWritten = fwrite($this->_in, substr($bytes, $totalBytesWritten));
                 if (false === $bytesWritten || 0 === $bytesWritten) {
                     throw new Swift_IoException(
-                        'Connection to ' . $this->_getReadConnectionDescription() . ' has gone away'
+                        'Connection to '.$this->_getReadConnectionDescription().' has gone away'
                     );
                 }
 
@@ -277,7 +277,7 @@ 
 
         $host = $this->_params['host'];
         if (!empty($this->_params['protocol'])) {
-            $host = $this->_params['protocol'] . '://' . $host;
+            $host = $this->_params['protocol'].'://'.$host;
         }
 
         $timeout = 15;
@@ -286,7 +286,7 @@ 
         }
 
         if (!empty($this->_params['sourceIp'])) {
-            $options['socket']['bindto'] = $this->_params['sourceIp'] . ':0';
+            $options['socket']['bindto'] = $this->_params['sourceIp'].':0';
         }
 
         if (isset($this->_params['stream_context_options'])) {
@@ -294,10 +294,10 @@ 
         }
 
         $streamContext = stream_context_create($options);
-        $this->_stream = @stream_socket_client($host . ':' . $this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext);
+        $this->_stream = @stream_socket_client($host.':'.$this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext);
 
         if (false === $this->_stream) {
-            throw new Swift_TransportException('Connection could not be established with host ' . $this->_params['host'] . ' [' . $errstr . ' #' . $errno . ']');
+            throw new Swift_TransportException('Connection could not be established with host '.$this->_params['host'].' ['.$errstr.' #'.$errno.']');
         }
 
         if (!empty($this->_params['blocking'])) {
@@ -328,7 +328,7 @@ 
 
         $err = stream_get_contents($pipes[2]);
         if ($err) {
-            throw new Swift_TransportException('Process could not be started [' . $err . ']');
+            throw new Swift_TransportException('Process could not be started ['.$err.']');
         }
 
         $this->_in = &$pipes[0];
@@ -339,16 +339,16 @@ 
     {
         switch ($this->_params['type']) {
             case self::TYPE_PROCESS:
-                return 'Process ' . $this->_params['command'];
+                return 'Process '.$this->_params['command'];
                 break;
 
             case self::TYPE_SOCKET:
             default:
                 $host = $this->_params['host'];
                 if (!empty($this->_params['protocol'])) {
-                    $host = $this->_params['protocol'] . '://' . $host;
+                    $host = $this->_params['protocol'].'://'.$host;
                 }
-                $host .= ':' . $this->_params['port'];
+                $host .= ':'.$this->_params['port'];
 
                 return $host;
                 break;

lib/classes/Swift/Signers/SMimeSigner.php

Spacing +6 added lines, -6 removed lines

@@ -95,14 +95,14 @@ 
      */
     public function setSignCertificate($certificate, $privateKey = null, $signOptions = PKCS7_DETACHED, $extraCerts = null)
     {
-        $this->signCertificate = 'file://' . str_replace('\\', '/', realpath($certificate));
+        $this->signCertificate = 'file://'.str_replace('\\', '/', realpath($certificate));
 
         if (null !== $privateKey) {
             if (is_array($privateKey)) {
                 $this->signPrivateKey = $privateKey;
-                $this->signPrivateKey[0] = 'file://' . str_replace('\\', '/', realpath($privateKey[0]));
+                $this->signPrivateKey[0] = 'file://'.str_replace('\\', '/', realpath($privateKey[0]));
             } else {
-                $this->signPrivateKey = 'file://' . str_replace('\\', '/', realpath($privateKey));
+                $this->signPrivateKey = 'file://'.str_replace('\\', '/', realpath($privateKey));
             }
         }
 
@@ -131,10 +131,10 @@ 
             $this->encryptCert = array();
 
             foreach ($recipientCerts as $cert) {
-                $this->encryptCert[] = 'file://' . str_replace('\\', '/', realpath($cert));
+                $this->encryptCert[] = 'file://'.str_replace('\\', '/', realpath($cert));
             }
         } else {
-            $this->encryptCert = 'file://' . str_replace('\\', '/', realpath($recipientCerts));
+            $this->encryptCert = 'file://'.str_replace('\\', '/', realpath($recipientCerts));
         }
 
         if (null !== $cipher) {
@@ -380,7 +380,7 @@ 
         foreach ($headerLines as $headerLine) {
             // Line separated
             if (ctype_space($headerLines[0]) || false === strpos($headerLine, ':')) {
-                $headers[$currentHeaderName] .= ' ' . trim($headerLine);
+                $headers[$currentHeaderName] .= ' '.trim($headerLine);
                 continue;
             }
 

lib/classes/Swift/Signers/DKIMSigner.php

Spacing +8 added lines, -8 removed lines

@@ -201,7 +201,7 @@ 
     {
         $this->_privateKey = $privateKey;
         $this->_domainName = $domainName;
-        $this->_signerIdentity = '@' . $domainName;
+        $this->_signerIdentity = '@'.$domainName;
         $this->_selector = $selector;
     }
 
@@ -549,7 +549,7 @@ 
         // Prepare the DKIM-Signature
         $params = array('v' => '1', 'a' => $this->_hashAlgorithm, 'bh' => base64_encode($this->_bodyHash), 'd' => $this->_domainName, 'h' => implode(': ', $this->_signedHeaders), 'i' => $this->_signerIdentity, 's' => $this->_selector);
         if ($this->_bodyCanon != 'simple') {
-            $params['c'] = $this->_headerCanon . '/' . $this->_bodyCanon;
+            $params['c'] = $this->_headerCanon.'/'.$this->_bodyCanon;
         } elseif ($this->_headerCanon != 'simple') {
             $params['c'] = $this->_headerCanon;
         }
@@ -574,19 +574,19 @@ 
         }
         $string = '';
         foreach ($params as $k => $v) {
-            $string .= $k . '=' . $v . '; ';
+            $string .= $k.'='.$v.'; ';
         }
         $string = trim($string);
         $headers->addTextHeader('DKIM-Signature', $string);
         // 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;
     }
@@ -602,7 +602,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
         }
@@ -723,11 +723,11 @@ 
         }
         $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;
     }
 
@@ -425,7 +425,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);
@@ -444,7 +444,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
         }
@@ -544,11 +544,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().']');
     }
 }