voku / swiftmailer

lib/classes/Swift/EmailValidatorBridge.php

Spacing +1 added lines, -1 removed lines

@@ -30,6 +30,6 @@
      */
     public function isValidSimpleWrapper($email)
     {
-        return (boolean)preg_match('/^(.*<?)(.*)@(.*)(>?)$/', $email);
+        return (boolean) preg_match('/^(.*<?)(.*)@(.*)(>?)$/', $email);
     }
 }

lib/classes/Swift/Mime/SimpleMimeEntity.php

Indentation +1 added lines, -1 removed lines

@@ -702,7 +702,7 @@
     {
         if (count($this->_immediateChildren)) {
             $this->_setHeaderParameter('Content-Type', 'boundary',
-                                       $this->getBoundary()
+                                        $this->getBoundary()
             );
             $this->_headers->remove('Content-Transfer-Encoding');
         } else {

Spacing +13 added lines, -13 removed lines

@@ -465,7 +465,7 @@ 
     public function getBoundary()
     {
         if (!isset($this->_boundary)) {
-            $this->_boundary = '_=_swift_v5_' . time() . '_' . md5(getmypid() . mt_rand() . uniqid('', true)) . '_=_';
+            $this->_boundary = '_=_swift_v5_'.time().'_'.md5(getmypid().mt_rand().uniqid('', true)).'_=_';
         }
 
         return $this->_boundary;
@@ -536,7 +536,7 @@ 
             if ($this->_cache->hasKey($this->_cacheKey, 'body')) {
                 $body = $this->_cache->getString($this->_cacheKey, 'body');
             } else {
-                $body = "\r\n" . $this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength());
+                $body = "\r\n".$this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength());
                 $this->_cache->setString($this->_cacheKey, 'body', $body, Swift_KeyCache::MODE_WRITE);
             }
             $string .= $body;
@@ -544,10 +544,10 @@ 
 
         if (!empty($this->_immediateChildren)) {
             foreach ($this->_immediateChildren as $child) {
-                $string .= "\r\n\r\n--" . $this->getBoundary() . "\r\n";
+                $string .= "\r\n\r\n--".$this->getBoundary()."\r\n";
                 $string .= $child->toString();
             }
-            $string .= "\r\n\r\n--" . $this->getBoundary() . "--\r\n";
+            $string .= "\r\n\r\n--".$this->getBoundary()."--\r\n";
         }
 
         return $string;
@@ -614,10 +614,10 @@ 
 
         if (!empty($this->_immediateChildren)) {
             foreach ($this->_immediateChildren as $child) {
-                $is->write("\r\n\r\n--" . $this->getBoundary() . "\r\n");
+                $is->write("\r\n\r\n--".$this->getBoundary()."\r\n");
                 $child->toByteStream($is);
             }
-            $is->write("\r\n\r\n--" . $this->getBoundary() . "--\r\n");
+            $is->write("\r\n\r\n--".$this->getBoundary()."--\r\n");
         }
     }
 
@@ -746,14 +746,14 @@ 
      */
     protected function getRandomId()
     {
-        $idLeft = md5(getmypid() . '.' . time() . '.' . uniqid(mt_rand(), true));
+        $idLeft = md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
         $idRight = !empty($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated';
-        $id = $idLeft . '@' . $idRight;
+        $id = $idLeft.'@'.$idRight;
 
         try {
             $this->_assertValidId($id);
         } catch (Swift_RfcComplianceException $e) {
-            $id = $idLeft . '@swift.generated';
+            $id = $idLeft.'@swift.generated';
         }
 
         return $id;
@@ -766,7 +766,7 @@ 
      */
     private function _generateNewCacheKey()
     {
-        return md5(uniqid(getmypid() . mt_rand(), true));
+        return md5(uniqid(getmypid().mt_rand(), true));
     }
 
     private function _readStream(Swift_OutputByteStream $os)
@@ -849,10 +849,10 @@ 
         $lowercaseType = Swift::strtolowerWithStaticCache($child->getContentType());
 
         if (isset($filter[$realLevel]) && isset($filter[$realLevel][$lowercaseType])) {
-            return (int)$filter[$realLevel][$lowercaseType];
+            return (int) $filter[$realLevel][$lowercaseType];
         }
 
-        return (int)$realLevel;
+        return (int) $realLevel;
     }
 
     /**
@@ -948,7 +948,7 @@ 
     private function _assertValidId($id)
     {
         if ($this->_emailValidator->isValidWrapper($id) === false) {
-            throw new Swift_RfcComplianceException('Invalid ID given <' . $id . '>');
+            throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
         }
     }
 

lib/classes/Swift/Transport/NullTransport.php

Spacing +3 added lines, -3 removed lines

@@ -77,9 +77,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())
         );
 
         return $count;

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

Indentation +31 added lines, -31 removed lines

@@ -226,8 +226,8 @@ 
     protected function createMessage1()
     {
         return self::NTLMSIG
-               . $this->createByte('01') // Message 1
-               . $this->createByte('0702'); // Flags
+                . $this->createByte('01') // Message 1
+                . $this->createByte('0702'); // Flags
     }
 
     /**
@@ -255,19 +255,19 @@ 
         $ntlmSec = $this->createSecurityBuffer($ntlmResponse, ($lmInfo[0] + $lmInfo[1]) / 2, true);
 
         return self::NTLMSIG
-               . $this->createByte('03') // TYPE 3 message
-               . $lmSec // LM response header
-               . $ntlmSec // NTLM response header
-               . $domainSec // Domain header
-               . $userSec // User header
-               . $workSec // Workstation header
-               . $this->createByte('000000009a', 8) // session key header (empty)
-               . $this->createByte('01020000') // FLAGS
-               . $this->convertTo16bit($domain) // domain name
-               . $this->convertTo16bit($username) // username
-               . $this->convertTo16bit($workstation) // workstation
-               . $lmResponse
-               . $ntlmResponse;
+                . $this->createByte('03') // TYPE 3 message
+                . $lmSec // LM response header
+                . $ntlmSec // NTLM response header
+                . $domainSec // Domain header
+                . $userSec // User header
+                . $workSec // Workstation header
+                . $this->createByte('000000009a', 8) // session key header (empty)
+                . $this->createByte('01020000') // FLAGS
+                . $this->convertTo16bit($domain) // domain name
+                . $this->convertTo16bit($username) // username
+                . $this->convertTo16bit($workstation) // workstation
+                . $lmResponse
+                . $ntlmResponse;
     }
 
     /**
@@ -280,12 +280,12 @@ 
     protected function createBlob($timestamp, $client, $targetInfo)
     {
         return $this->createByte('0101')
-               . $this->createByte('00')
-               . $timestamp
-               . $client
-               . $this->createByte('00')
-               . $targetInfo
-               . $this->createByte('00');
+                . $this->createByte('00')
+                . $timestamp
+                . $client
+                . $this->createByte('00')
+                . $targetInfo
+                . $this->createByte('00');
     }
 
     /**
@@ -451,16 +451,16 @@ 
         foreach ($material as $k => $v) {
             $b = $this->castToByte(hexdec($v));
             $needsParity = (
-                               (
-                                   $this->uRShift($b, 7)
-                                   ^ $this->uRShift($b, 6)
-                                   ^ $this->uRShift($b, 5)
-                                   ^ $this->uRShift($b, 4)
-                                   ^ $this->uRShift($b, 3)
-                                   ^ $this->uRShift($b, 2)
-                                   ^ $this->uRShift($b, 1)
-                               ) & 0x01
-                           ) == 0;
+                                (
+                                    $this->uRShift($b, 7)
+                                    ^ $this->uRShift($b, 6)
+                                    ^ $this->uRShift($b, 5)
+                                    ^ $this->uRShift($b, 4)
+                                    ^ $this->uRShift($b, 3)
+                                    ^ $this->uRShift($b, 2)
+                                    ^ $this->uRShift($b, 1)
+                                ) & 0x01
+                            ) == 0;
 
             list($high, $low) = str_split($v);
 

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/StreamFilters/ByteArrayReplacementFilter.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
         if ($i !== null) {
             $tree[-1] = min(count($replace) - 1, $i);
             $tree[-2] = $last_size;
-            $this->_treeMaxLen = (int)$size;
+            $this->_treeMaxLen = (int) $size;
         }
         foreach ($replace as $rep) {
             if (!is_array($rep)) {

lib/swift_required.php

Spacing +7 added lines, -7 removed lines

@@ -8,17 +8,17 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__ . '/classes/Swift.php';
+require __DIR__.'/classes/Swift.php';
 
 Swift::registerAutoload(
-    function () {
+    function() {
         // Load in dependency maps
-        require __DIR__ . '/dependency_maps/cache_deps.php';
-        require __DIR__ . '/dependency_maps/mime_deps.php';
-        require __DIR__ . '/dependency_maps/message_deps.php';
-        require __DIR__ . '/dependency_maps/transport_deps.php';
+        require __DIR__.'/dependency_maps/cache_deps.php';
+        require __DIR__.'/dependency_maps/mime_deps.php';
+        require __DIR__.'/dependency_maps/message_deps.php';
+        require __DIR__.'/dependency_maps/transport_deps.php';
 
         // Load in global library preferences
-        require __DIR__ . '/preferences.php';
+        require __DIR__.'/preferences.php';
     }
 );

lib/dependency_maps/mime_deps.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . '/../mime_types.php';
+require __DIR__.'/../mime_types.php';
 
 Swift_DependencyContainer::getInstance()
     ->register('properties.charset')

lib/classes/Swift/Mime/Headers/ParameterizedHeader.php

Spacing +12 added lines, -12 removed lines

@@ -132,7 +132,7 @@ 
         foreach ($this->_params as $name => $value) {
             if (null !== $value) {
                 // Add the parameter
-                $body .= '; ' . $this->_createParameter($name, $value);
+                $body .= '; '.$this->_createParameter($name, $value);
             }
         }
 
@@ -160,7 +160,7 @@ 
                 $tokens[count($tokens) - 1] .= ';';
                 $tokens = array_merge(
                     $tokens,
-                    $this->generateTokenLines(' ' . $this->_createParameter($name, $value))
+                    $this->generateTokenLines(' '.$this->_createParameter($name, $value))
                 );
             }
         }
@@ -182,18 +182,18 @@ 
 
         $encoded = false;
         // Allow room for parameter name, indices, "=" and DQUOTEs
-        $maxValueLength = $this->getMaxLineLength() - strlen($name . '=*N"";') - 1;
+        $maxValueLength = $this->getMaxLineLength() - strlen($name.'=*N"";') - 1;
         $firstLineOffset = 0;
 
         // If it's not already a valid parameter value...
-        if (!preg_match('/^' . self::TOKEN_REGEX . '$/D', $value)) {
+        if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
             // TODO: text, or something else??
             // ... and it's not ascii
             if (!preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $value)) {
                 $encoded = true;
                 // Allow space for the indices, charset and language
-                $maxValueLength = $this->getMaxLineLength() - strlen($name . '*N*="";') - 1;
-                $firstLineOffset = strlen($this->getCharset() . "'" . $this->getLanguage() . "'");
+                $maxValueLength = $this->getMaxLineLength() - strlen($name.'*N*="";') - 1;
+                $firstLineOffset = strlen($this->getCharset()."'".$this->getLanguage()."'");
             }
         }
 
@@ -219,12 +219,12 @@ 
         if (count($valueLines) > 1) {
             $paramLines = array();
             foreach ($valueLines as $i => $line) {
-                $paramLines[] = $name . '*' . $i . $this->_getEndOfParameterValue($line, true, $i === 0);
+                $paramLines[] = $name.'*'.$i.$this->_getEndOfParameterValue($line, true, $i === 0);
             }
 
             return implode(";\r\n ", $paramLines);
         } else {
-            return $name . $this->_getEndOfParameterValue(
+            return $name.$this->_getEndOfParameterValue(
                 $valueLines[0],
                 $encoded,
                 true
@@ -243,18 +243,18 @@ 
      */
     private function _getEndOfParameterValue($value, $encoded = false, $firstLine = false)
     {
-        if (!preg_match('/^' . self::TOKEN_REGEX . '$/D', $value)) {
-            $value = '"' . $value . '"';
+        if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
+            $value = '"'.$value.'"';
         }
 
         $prepend = '=';
         if ($encoded) {
             $prepend = '*=';
             if ($firstLine) {
-                $prepend = '*=' . $this->getCharset() . "'" . $this->getLanguage() . "'";
+                $prepend = '*='.$this->getCharset()."'".$this->getLanguage()."'";
             }
         }
 
-        return $prepend . $value;
+        return $prepend.$value;
     }
 }

lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
      */
     public function toString()
     {
-        return $this->_fieldName . ': ' . $this->_value;
+        return $this->_fieldName.': '.$this->_value;
     }
 
     /**