voku / swiftmailer

lib/classes/Swift/FileSpool.php

Spacing +6 added lines, -6 removed lines

@@ -97,11 +97,11 @@ 
     public function queueMessage(Swift_Mime_Message $message)
     {
         $ser = serialize($message);
-        $fileName = $this->_path . '/' . $this->getRandomString();
+        $fileName = $this->_path.'/'.$this->getRandomString();
         for ($i = 0; $i < $this->_retryLimit; ++$i) {
             /* We try an exclusive creation of the file. This is an atomic operation, it avoid locking mechanism */
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
-            $fp = @fopen($fileName . '.message', 'xb');
+            $fp = @fopen($fileName.'.message', 'xb');
                 if (false !== $fp) {
                     if (false === fwrite($fp, $ser)) {
                         return false;
@@ -157,7 +157,7 @@ 
             }
         }
 
-        $failedRecipients = (array)$failedRecipients;
+        $failedRecipients = (array) $failedRecipients;
         $count = 0;
         $time = time();
         foreach ($directoryIterator as $file) {
@@ -168,13 +168,13 @@ 
             }
 
             /* We try a rename, it's an atomic operation, and avoid locking the file */
-            if (rename($file, $file . '.sending')) {
+            if (rename($file, $file.'.sending')) {
                 // TODO: -> SECURITY | Perhaps it's possible to exploit the unserialize via: file_get_contents(...)
-                $message = unserialize(file_get_contents($file . '.sending'));
+                $message = unserialize(file_get_contents($file.'.sending'));
 
                 $count += $transport->send($message, $failedRecipients);
 
-                unlink($file . '.sending');
+                unlink($file.'.sending');
             } else {
                 /* This message has just been catched by another process */
                 continue;

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

Spacing +12 added lines, -12 removed lines

@@ -136,7 +136,7 @@ 
         foreach ($this->_params as $name => $value) {
             if (null !== $value) {
                 // Add the parameter
-                $body .= '; ' . $this->_createParameter($name, $value);
+                $body .= '; '.$this->_createParameter($name, $value);
             }
         }
 
@@ -164,7 +164,7 @@ 
                 $tokens[count($tokens) - 1] .= ';';
                 $tokens = array_merge(
                     $tokens,
-                    $this->generateTokenLines(' ' . $this->_createParameter($name, $value))
+                    $this->generateTokenLines(' '.$this->_createParameter($name, $value))
                 );
             }
         }
@@ -186,13 +186,13 @@ 
 
         $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 (
             // If it's not already a valid parameter value ...
-            !preg_match('/^' . self::TOKEN_REGEX . '$/D', $value)
+            !preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)
             &&
             // ... and it's not ascii
             !UTF8::is_ascii($value)
@@ -200,8 +200,8 @@ 
             $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()."'");
         }
 
         // Encode if we need to ...
@@ -230,13 +230,13 @@ 
         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);
         }
 
-        return $name . $this->_getEndOfParameterValue(
+        return $name.$this->_getEndOfParameterValue(
             $valueLines[0],
             $encoded,
             true
@@ -254,18 +254,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/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";
             }
         }