@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | */ |
| 242 | 242 | public function getId() |
| 243 | 243 | { |
| 244 | - $tmp = (array)$this->_getHeaderFieldModel($this->_getIdField()); |
|
| 244 | + $tmp = (array) $this->_getHeaderFieldModel($this->_getIdField()); |
|
| 245 | 245 | |
| 246 | 246 | return $this->_headers->has($this->_getIdField()) ? current($tmp) : $this->_id; |
| 247 | 247 | } |
@@ -468,7 +468,7 @@ discard block |
||
| 468 | 468 | public function getBoundary() |
| 469 | 469 | { |
| 470 | 470 | if (!isset($this->_boundary)) { |
| 471 | - $this->_boundary = '_=_swift_v5_' . time() . '_' . md5(getmypid() . mt_rand() . uniqid('', true)) . '_=_'; |
|
| 471 | + $this->_boundary = '_=_swift_v5_'.time().'_'.md5(getmypid().mt_rand().uniqid('', true)).'_=_'; |
|
| 472 | 472 | } |
| 473 | 473 | |
| 474 | 474 | return $this->_boundary; |
@@ -543,7 +543,7 @@ discard block |
||
| 543 | 543 | if ($this->_cache->hasKey($this->_cacheKey, 'body')) { |
| 544 | 544 | $body = $this->_cache->getString($this->_cacheKey, 'body'); |
| 545 | 545 | } else { |
| 546 | - $body = "\r\n" . $this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength()); |
|
| 546 | + $body = "\r\n".$this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength()); |
|
| 547 | 547 | $this->_cache->setString($this->_cacheKey, 'body', $body, Swift_KeyCache::MODE_WRITE); |
| 548 | 548 | } |
| 549 | 549 | $string .= $body; |
@@ -551,10 +551,10 @@ discard block |
||
| 551 | 551 | |
| 552 | 552 | if (!empty($this->_immediateChildren)) { |
| 553 | 553 | foreach ($this->_immediateChildren as $child) { |
| 554 | - $string .= "\r\n\r\n--" . $this->getBoundary() . "\r\n"; |
|
| 554 | + $string .= "\r\n\r\n--".$this->getBoundary()."\r\n"; |
|
| 555 | 555 | $string .= $child->toString(); |
| 556 | 556 | } |
| 557 | - $string .= "\r\n\r\n--" . $this->getBoundary() . "--\r\n"; |
|
| 557 | + $string .= "\r\n\r\n--".$this->getBoundary()."--\r\n"; |
|
| 558 | 558 | } |
| 559 | 559 | |
| 560 | 560 | return $string; |
@@ -621,10 +621,10 @@ discard block |
||
| 621 | 621 | |
| 622 | 622 | if (!empty($this->_immediateChildren)) { |
| 623 | 623 | foreach ($this->_immediateChildren as $child) { |
| 624 | - $is->write("\r\n\r\n--" . $this->getBoundary() . "\r\n"); |
|
| 624 | + $is->write("\r\n\r\n--".$this->getBoundary()."\r\n"); |
|
| 625 | 625 | $child->toByteStream($is); |
| 626 | 626 | } |
| 627 | - $is->write("\r\n\r\n--" . $this->getBoundary() . "--\r\n"); |
|
| 627 | + $is->write("\r\n\r\n--".$this->getBoundary()."--\r\n"); |
|
| 628 | 628 | } |
| 629 | 629 | } |
| 630 | 630 | |
@@ -753,7 +753,7 @@ discard block |
||
| 753 | 753 | */ |
| 754 | 754 | private function _generateNewCacheKey() |
| 755 | 755 | { |
| 756 | - return md5(getmypid() . '.' . time() . '.' . uniqid(mt_rand(), true)); |
|
| 756 | + return md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true)); |
|
| 757 | 757 | } |
| 758 | 758 | |
| 759 | 759 | /** |
@@ -849,10 +849,10 @@ discard block |
||
| 849 | 849 | $lowercaseType = Swift::strtolowerWithStaticCache($child->getContentType()); |
| 850 | 850 | |
| 851 | 851 | if (isset($filter[$realLevel], $filter[$realLevel][$lowercaseType])) { |
| 852 | - return (int)$filter[$realLevel][$lowercaseType]; |
|
| 852 | + return (int) $filter[$realLevel][$lowercaseType]; |
|
| 853 | 853 | } |
| 854 | 854 | |
| 855 | - return (int)$realLevel; |
|
| 855 | + return (int) $realLevel; |
|
| 856 | 856 | } |
| 857 | 857 | |
| 858 | 858 | /** |
@@ -903,8 +903,7 @@ discard block |
||
| 903 | 903 | foreach ($this->_immediateChildren as $child) { |
| 904 | 904 | $type = $child->getContentType(); |
| 905 | 905 | $level = array_key_exists($type, $this->_alternativePartOrder) ? |
| 906 | - $this->_alternativePartOrder[$type] : |
|
| 907 | - max($this->_alternativePartOrder) + 1; |
|
| 906 | + $this->_alternativePartOrder[$type] : max($this->_alternativePartOrder) + 1; |
|
| 908 | 907 | |
| 909 | 908 | if (empty($sorted[$level])) { |
| 910 | 909 | $sorted[$level] = array(); |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | { |
| 210 | 210 | $this->_privateKey = $privateKey; |
| 211 | 211 | $this->_domainName = $domainName; |
| 212 | - $this->_signerIdentity = '@' . $domainName; |
|
| 212 | + $this->_signerIdentity = '@'.$domainName; |
|
| 213 | 213 | $this->_selector = $selector; |
| 214 | 214 | $this->_passphrase = $passphrase; |
| 215 | 215 | |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | ); |
| 581 | 581 | |
| 582 | 582 | if ($this->_bodyCanon != 'simple') { |
| 583 | - $params['c'] = $this->_headerCanon . '/' . $this->_bodyCanon; |
|
| 583 | + $params['c'] = $this->_headerCanon.'/'.$this->_bodyCanon; |
|
| 584 | 584 | } elseif ($this->_headerCanon != 'simple') { |
| 585 | 585 | $params['c'] = $this->_headerCanon; |
| 586 | 586 | } |
@@ -614,7 +614,7 @@ discard block |
||
| 614 | 614 | |
| 615 | 615 | $string = ''; |
| 616 | 616 | foreach ($params as $k => $v) { |
| 617 | - $string .= $k . '=' . $v . '; '; |
|
| 617 | + $string .= $k.'='.$v.'; '; |
|
| 618 | 618 | } |
| 619 | 619 | |
| 620 | 620 | $string = trim($string); |
@@ -623,14 +623,14 @@ discard block |
||
| 623 | 623 | // Add the last DKIM-Signature |
| 624 | 624 | $tmp = $headers->getAll('DKIM-Signature'); |
| 625 | 625 | $this->_dkimHeader = end($tmp); |
| 626 | - $this->_addHeader(trim($this->_dkimHeader->toString()) . "\r\n b=", true); |
|
| 626 | + $this->_addHeader(trim($this->_dkimHeader->toString())."\r\n b=", true); |
|
| 627 | 627 | $this->_endOfHeaders(); |
| 628 | 628 | |
| 629 | 629 | if ($this->_debugHeaders) { |
| 630 | 630 | $headers->addTextHeader('X-DebugHash', base64_encode($this->_headerHash)); |
| 631 | 631 | } |
| 632 | 632 | |
| 633 | - $this->_dkimHeader->setValue($string . ' b=' . trim(chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' '))); |
|
| 633 | + $this->_dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' '))); |
|
| 634 | 634 | |
| 635 | 635 | return $this; |
| 636 | 636 | } |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | $name = Swift::strtolowerWithStaticCache(trim($exploded[0])); |
| 649 | 649 | $value = str_replace("\r\n", '', $exploded[1]); |
| 650 | 650 | $value = preg_replace("/[ \t][ \t]+/", ' ', $value); |
| 651 | - $header = $name . ':' . trim($value) . ($is_sig ? '' : "\r\n"); |
|
| 651 | + $header = $name.':'.trim($value).($is_sig ? '' : "\r\n"); |
|
| 652 | 652 | case 'simple': |
| 653 | 653 | // Nothing to do |
| 654 | 654 | } |
@@ -784,13 +784,13 @@ discard block |
||
| 784 | 784 | $pkeyId = openssl_get_privatekey($this->_privateKey); |
| 785 | 785 | } |
| 786 | 786 | if (!$pkeyId) { |
| 787 | - throw new Swift_SwiftException('Unable to load DKIM Private Key [' . openssl_error_string() . ']'); |
|
| 787 | + throw new Swift_SwiftException('Unable to load DKIM Private Key ['.openssl_error_string().']'); |
|
| 788 | 788 | } |
| 789 | 789 | |
| 790 | 790 | if (openssl_sign($this->_headerCanonData, $signature, $pkeyId, $algorithm)) { |
| 791 | 791 | return $signature; |
| 792 | 792 | } |
| 793 | 793 | |
| 794 | - throw new Swift_SwiftException('Unable to sign DKIM Hash [' . openssl_error_string() . ']'); |
|
| 794 | + throw new Swift_SwiftException('Unable to sign DKIM Hash ['.openssl_error_string().']'); |
|
| 795 | 795 | } |
| 796 | 796 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | */ |
| 94 | 94 | public function setPort($port) |
| 95 | 95 | { |
| 96 | - $this->_params['port'] = (int)$port; |
|
| 96 | + $this->_params['port'] = (int) $port; |
|
| 97 | 97 | |
| 98 | 98 | return $this; |
| 99 | 99 | } |
@@ -117,8 +117,8 @@ discard block |
||
| 117 | 117 | */ |
| 118 | 118 | public function setTimeout($timeout) |
| 119 | 119 | { |
| 120 | - $this->_params['timeout'] = (int)$timeout; |
|
| 121 | - $this->_buffer->setParam('timeout', (int)$timeout); |
|
| 120 | + $this->_params['timeout'] = (int) $timeout; |
|
| 121 | + $this->_buffer->setParam('timeout', (int) $timeout); |
|
| 122 | 122 | |
| 123 | 123 | return $this; |
| 124 | 124 | } |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | */ |
| 279 | 279 | public function executeCommand($command, $codes = array(), &$failures = null) |
| 280 | 280 | { |
| 281 | - $failures = (array)$failures; |
|
| 281 | + $failures = (array) $failures; |
|
| 282 | 282 | $stopSignal = false; |
| 283 | 283 | $response = null; |
| 284 | 284 | |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | |
| 310 | 310 | $inArray = in_array( |
| 311 | 311 | Swift::strtolowerWithStaticCache($method), |
| 312 | - array_map(array('Swift', 'strtolowerWithStaticCache'), (array)$handler->exposeMixinMethods()), |
|
| 312 | + array_map(array('Swift', 'strtolowerWithStaticCache'), (array) $handler->exposeMixinMethods()), |
|
| 313 | 313 | true |
| 314 | 314 | ); |
| 315 | 315 | |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | } |
| 330 | 330 | } |
| 331 | 331 | |
| 332 | - trigger_error('Call to undefined method ' . $method, E_USER_ERROR); |
|
| 332 | + trigger_error('Call to undefined method '.$method, E_USER_ERROR); |
|
| 333 | 333 | } |
| 334 | 334 | |
| 335 | 335 | /** Get the params to initialize the buffer */ |
@@ -395,10 +395,10 @@ discard block |
||
| 395 | 395 | |
| 396 | 396 | $params = array(); |
| 397 | 397 | foreach ($handlers as $handler) { |
| 398 | - $params = array_merge($params, (array)$handler->getMailParams()); |
|
| 398 | + $params = array_merge($params, (array) $handler->getMailParams()); |
|
| 399 | 399 | } |
| 400 | 400 | |
| 401 | - $paramStr = !empty($params) ? ' ' . implode(' ', $params) : ''; |
|
| 401 | + $paramStr = !empty($params) ? ' '.implode(' ', $params) : ''; |
|
| 402 | 402 | $this->executeCommand( |
| 403 | 403 | sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), array(250) |
| 404 | 404 | ); |
@@ -415,10 +415,10 @@ discard block |
||
| 415 | 415 | |
| 416 | 416 | $params = array(); |
| 417 | 417 | foreach ($handlers as $handler) { |
| 418 | - $params = array_merge($params, (array)$handler->getRcptParams()); |
|
| 418 | + $params = array_merge($params, (array) $handler->getRcptParams()); |
|
| 419 | 419 | } |
| 420 | 420 | |
| 421 | - $paramStr = !empty($params) ? ' ' . implode(' ', $params) : ''; |
|
| 421 | + $paramStr = !empty($params) ? ' '.implode(' ', $params) : ''; |
|
| 422 | 422 | $this->executeCommand( |
| 423 | 423 | sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), array(250, 251, 252) |
| 424 | 424 | ); |
@@ -97,11 +97,11 @@ discard block |
||
| 97 | 97 | public function queueMessage(Swift_Mime_Message $message) |
| 98 | 98 | { |
| 99 | 99 | $ser = serialize($message); |
| 100 | - $fileName = $this->_path . '/' . $this->getRandomString(); |
|
| 100 | + $fileName = $this->_path.'/'.$this->getRandomString(); |
|
| 101 | 101 | for ($i = 0; $i < $this->_retryLimit; ++$i) { |
| 102 | 102 | /* We try an exclusive creation of the file. This is an atomic operation, it avoid locking mechanism */ |
| 103 | 103 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 104 | - $fp = @fopen($fileName . '.message', 'xb'); |
|
| 104 | + $fp = @fopen($fileName.'.message', 'xb'); |
|
| 105 | 105 | if (false !== $fp) { |
| 106 | 106 | if (false === fwrite($fp, $ser)) { |
| 107 | 107 | return false; |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | - $failedRecipients = (array)$failedRecipients; |
|
| 160 | + $failedRecipients = (array) $failedRecipients; |
|
| 161 | 161 | $count = 0; |
| 162 | 162 | $time = time(); |
| 163 | 163 | foreach ($directoryIterator as $file) { |
@@ -168,13 +168,13 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | /* We try a rename, it's an atomic operation, and avoid locking the file */ |
| 171 | - if (rename($file, $file . '.sending')) { |
|
| 171 | + if (rename($file, $file.'.sending')) { |
|
| 172 | 172 | // TODO: -> SECURITY | Perhaps it's possible to exploit the unserialize via: file_get_contents(...) |
| 173 | - $message = unserialize(file_get_contents($file . '.sending')); |
|
| 173 | + $message = unserialize(file_get_contents($file.'.sending')); |
|
| 174 | 174 | |
| 175 | 175 | $count += $transport->send($message, $failedRecipients); |
| 176 | 176 | |
| 177 | - unlink($file . '.sending'); |
|
| 177 | + unlink($file.'.sending'); |
|
| 178 | 178 | } else { |
| 179 | 179 | /* This message has just been catched by another process */ |
| 180 | 180 | continue; |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | foreach ($this->_params as $name => $value) { |
| 137 | 137 | if (null !== $value) { |
| 138 | 138 | // Add the parameter |
| 139 | - $body .= '; ' . $this->_createParameter($name, $value); |
|
| 139 | + $body .= '; '.$this->_createParameter($name, $value); |
|
| 140 | 140 | } |
| 141 | 141 | } |
| 142 | 142 | |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | $tokens[count($tokens) - 1] .= ';'; |
| 165 | 165 | $tokens = array_merge( |
| 166 | 166 | $tokens, |
| 167 | - $this->generateTokenLines(' ' . $this->_createParameter($name, $value)) |
|
| 167 | + $this->generateTokenLines(' '.$this->_createParameter($name, $value)) |
|
| 168 | 168 | ); |
| 169 | 169 | } |
| 170 | 170 | } |
@@ -186,13 +186,13 @@ discard block |
||
| 186 | 186 | |
| 187 | 187 | $encoded = false; |
| 188 | 188 | // Allow room for parameter name, indices, "=" and DQUOTEs |
| 189 | - $maxValueLength = $this->getMaxLineLength() - strlen($name . '=*N"";') - 1; |
|
| 189 | + $maxValueLength = $this->getMaxLineLength() - strlen($name.'=*N"";') - 1; |
|
| 190 | 190 | $firstLineOffset = 0; |
| 191 | 191 | |
| 192 | 192 | |
| 193 | 193 | if ( |
| 194 | 194 | // If it's not already a valid parameter value ... |
| 195 | - !preg_match('/^' . self::TOKEN_REGEX . '$/D', $value) |
|
| 195 | + !preg_match('/^'.self::TOKEN_REGEX.'$/D', $value) |
|
| 196 | 196 | && |
| 197 | 197 | // ... and it's not ascii |
| 198 | 198 | !UTF8::is_ascii($value) |
@@ -200,8 +200,8 @@ discard block |
||
| 200 | 200 | $encoded = true; |
| 201 | 201 | |
| 202 | 202 | // Allow space for the indices, charset and language. |
| 203 | - $maxValueLength = $this->getMaxLineLength() - strlen($name . '*N*="";') - 1; |
|
| 204 | - $firstLineOffset = strlen($this->getCharset() . "'" . $this->getLanguage() . "'"); |
|
| 203 | + $maxValueLength = $this->getMaxLineLength() - strlen($name.'*N*="";') - 1; |
|
| 204 | + $firstLineOffset = strlen($this->getCharset()."'".$this->getLanguage()."'"); |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | // Encode if we need to ... |
@@ -230,13 +230,13 @@ discard block |
||
| 230 | 230 | if (count($valueLines) > 1) { |
| 231 | 231 | $paramLines = array(); |
| 232 | 232 | foreach ($valueLines as $i => $line) { |
| 233 | - $paramLines[] = $name . '*' . $i . $this->_getEndOfParameterValue($line, true, $i === 0); |
|
| 233 | + $paramLines[] = $name.'*'.$i.$this->_getEndOfParameterValue($line, true, $i === 0); |
|
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | return implode(";\r\n ", $paramLines); |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | - return $name . $this->_getEndOfParameterValue( |
|
| 239 | + return $name.$this->_getEndOfParameterValue( |
|
| 240 | 240 | $valueLines[0], |
| 241 | 241 | $encoded, |
| 242 | 242 | true |
@@ -254,18 +254,18 @@ discard block |
||
| 254 | 254 | */ |
| 255 | 255 | private function _getEndOfParameterValue($value, $encoded = false, $firstLine = false) |
| 256 | 256 | { |
| 257 | - if (!preg_match('/^' . self::TOKEN_REGEX . '$/D', $value)) { |
|
| 258 | - $value = '"' . $value . '"'; |
|
| 257 | + if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) { |
|
| 258 | + $value = '"'.$value.'"'; |
|
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | $prepend = '='; |
| 262 | 262 | if ($encoded) { |
| 263 | 263 | $prepend = '*='; |
| 264 | 264 | if ($firstLine) { |
| 265 | - $prepend = '*=' . $this->getCharset() . "'" . $this->getLanguage() . "'"; |
|
| 265 | + $prepend = '*='.$this->getCharset()."'".$this->getLanguage()."'"; |
|
| 266 | 266 | } |
| 267 | 267 | } |
| 268 | 268 | |
| 269 | - return $prepend . $value; |
|
| 269 | + return $prepend.$value; |
|
| 270 | 270 | } |
| 271 | 271 | } |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | // pad to $bits bit |
| 86 | 86 | $bin_length = strlen($bin); |
| 87 | 87 | if ($bin_length < $bits) { |
| 88 | - $bin = str_repeat('0', $bits - $bin_length) . $bin; |
|
| 88 | + $bin = str_repeat('0', $bits - $bin_length).$bin; |
|
| 89 | 89 | } |
| 90 | 90 | } else { |
| 91 | 91 | // negative |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $bin = base_convert($si, 10, 2); |
| 94 | 94 | $bin_length = strlen($bin); |
| 95 | 95 | if ($bin_length > $bits) { |
| 96 | - $bin = str_repeat('1', $bits - $bin_length) . $bin; |
|
| 96 | + $bin = str_repeat('1', $bits - $bin_length).$bin; |
|
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | 99 | } |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | { |
| 199 | 199 | list($domain, $username) = $this->getDomainAndUsername($username); |
| 200 | 200 | //$challenge, $context, $targetInfoH, $targetName, $domainName, $workstation, $DNSDomainName, $DNSServerName, $blob, $ter |
| 201 | - list($challenge, , , , , $workstation, , , $blob) = $this->parseMessage2($response); |
|
| 201 | + list($challenge,,,,, $workstation,,, $blob) = $this->parseMessage2($response); |
|
| 202 | 202 | |
| 203 | 203 | if (!$v2) { |
| 204 | 204 | // LMv1 |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | $desKey1 = $this->createDesKey($key1); |
| 330 | 330 | $desKey2 = $this->createDesKey($key2); |
| 331 | 331 | |
| 332 | - $constantDecrypt = $this->createByte($this->desEncrypt(self::DESCONST, $desKey1) . $this->desEncrypt(self::DESCONST, $desKey2), 21, false); |
|
| 332 | + $constantDecrypt = $this->createByte($this->desEncrypt(self::DESCONST, $desKey1).$this->desEncrypt(self::DESCONST, $desKey2), 21, false); |
|
| 333 | 333 | |
| 334 | 334 | // SECOND PART |
| 335 | 335 | list($key1, $key2, $key3) = str_split($constantDecrypt, 7); |
@@ -338,7 +338,7 @@ discard block |
||
| 338 | 338 | $desKey2 = $this->createDesKey($key2); |
| 339 | 339 | $desKey3 = $this->createDesKey($key3); |
| 340 | 340 | |
| 341 | - return $this->desEncrypt($challenge, $desKey1) . $this->desEncrypt($challenge, $desKey2) . $this->desEncrypt($challenge, $desKey3); |
|
| 341 | + return $this->desEncrypt($challenge, $desKey1).$this->desEncrypt($challenge, $desKey2).$this->desEncrypt($challenge, $desKey3); |
|
| 342 | 342 | } |
| 343 | 343 | |
| 344 | 344 | /** |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | $desKey2 = $this->createDesKey($key2); |
| 360 | 360 | $desKey3 = $this->createDesKey($key3); |
| 361 | 361 | |
| 362 | - return $this->desEncrypt($challenge, $desKey1) . $this->desEncrypt($challenge, $desKey2) . $this->desEncrypt($challenge, $desKey3); |
|
| 362 | + return $this->desEncrypt($challenge, $desKey1).$this->desEncrypt($challenge, $desKey2).$this->desEncrypt($challenge, $desKey3); |
|
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | /** |
@@ -402,9 +402,9 @@ discard block |
||
| 402 | 402 | // if $password > 15 than we can't use this method |
| 403 | 403 | if (strlen($password) <= 15) { |
| 404 | 404 | $ntlmHash = $this->md4Encrypt($password); |
| 405 | - $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username) . $domain)); |
|
| 405 | + $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain)); |
|
| 406 | 406 | |
| 407 | - $lmPass = bin2hex($this->md5Encrypt($ntml2Hash, $challenge . $client) . $client); |
|
| 407 | + $lmPass = bin2hex($this->md5Encrypt($ntml2Hash, $challenge.$client).$client); |
|
| 408 | 408 | } |
| 409 | 409 | |
| 410 | 410 | return $this->createByte($lmPass, 24); |
@@ -428,14 +428,14 @@ discard block |
||
| 428 | 428 | protected function createNTLMv2Hash($password, $username, $domain, $challenge, $targetInfo, $timestamp, $client) |
| 429 | 429 | { |
| 430 | 430 | $ntlmHash = $this->md4Encrypt($password); |
| 431 | - $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username) . $domain)); |
|
| 431 | + $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain)); |
|
| 432 | 432 | |
| 433 | 433 | // create blob |
| 434 | 434 | $blob = $this->createBlob($timestamp, $client, $targetInfo); |
| 435 | 435 | |
| 436 | - $ntlmv2Response = $this->md5Encrypt($ntml2Hash, $challenge . $blob); |
|
| 436 | + $ntlmv2Response = $this->md5Encrypt($ntml2Hash, $challenge.$blob); |
|
| 437 | 437 | |
| 438 | - return $ntlmv2Response . $blob; |
|
| 438 | + return $ntlmv2Response.$blob; |
|
| 439 | 439 | } |
| 440 | 440 | |
| 441 | 441 | protected function createDesKey($key) |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | $len = strlen($key); |
| 445 | 445 | for ($i = 1; $i < $len; ++$i) { |
| 446 | 446 | list($high, $low) = str_split(bin2hex($key[$i])); |
| 447 | - $v = $this->castToByte(ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf) . dechex(hexdec($low) & 0xf)), $i)); |
|
| 447 | + $v = $this->castToByte(ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xf)), $i)); |
|
| 448 | 448 | $material[] = str_pad(substr(dechex($v), -2), 2, '0', STR_PAD_LEFT); // cast to byte |
| 449 | 449 | } |
| 450 | 450 | $material[] = str_pad(substr(dechex($this->castToByte(ord($key[6]) << 1)), -2), 2, '0'); |
@@ -467,9 +467,9 @@ discard block |
||
| 467 | 467 | list($high, $low) = str_split($v); |
| 468 | 468 | |
| 469 | 469 | if ($needsParity) { |
| 470 | - $material[$k] = dechex(hexdec($high) | 0x0) . dechex(hexdec($low) | 0x1); |
|
| 470 | + $material[$k] = dechex(hexdec($high) | 0x0).dechex(hexdec($low) | 0x1); |
|
| 471 | 471 | } else { |
| 472 | - $material[$k] = dechex(hexdec($high) & 0xf) . dechex(hexdec($low) & 0xe); |
|
| 472 | + $material[$k] = dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xe); |
|
| 473 | 473 | } |
| 474 | 474 | } |
| 475 | 475 | |
@@ -493,7 +493,7 @@ discard block |
||
| 493 | 493 | $length = $is16 ? $length / 2 : $length; |
| 494 | 494 | $length = $this->createByte(str_pad(dechex($length), 2, '0', STR_PAD_LEFT), 2); |
| 495 | 495 | |
| 496 | - return $length . $length . $this->createByte(dechex($offset), 4); |
|
| 496 | + return $length.$length.$this->createByte(dechex($offset), 4); |
|
| 497 | 497 | } |
| 498 | 498 | |
| 499 | 499 | /** |
@@ -596,7 +596,7 @@ discard block |
||
| 596 | 596 | $ipadk = $key ^ str_repeat("\x36", $blocksize); |
| 597 | 597 | $opadk = $key ^ str_repeat("\x5c", $blocksize); |
| 598 | 598 | |
| 599 | - return pack('H*', md5($opadk . pack('H*', md5($ipadk . $msg)))); |
|
| 599 | + return pack('H*', md5($opadk.pack('H*', md5($ipadk.$msg)))); |
|
| 600 | 600 | } |
| 601 | 601 | |
| 602 | 602 | /** |
@@ -634,8 +634,8 @@ discard block |
||
| 634 | 634 | { |
| 635 | 635 | $message = bin2hex($message); |
| 636 | 636 | $messageId = substr($message, 16, 8); |
| 637 | - echo substr($message, 0, 16) . " NTLMSSP Signature<br />\n"; |
|
| 638 | - echo $messageId . " Type Indicator<br />\n"; |
|
| 637 | + echo substr($message, 0, 16)." NTLMSSP Signature<br />\n"; |
|
| 638 | + echo $messageId." Type Indicator<br />\n"; |
|
| 639 | 639 | |
| 640 | 640 | if ($messageId === '02000000') { |
| 641 | 641 | $map = array( |
@@ -654,7 +654,7 @@ discard block |
||
| 654 | 654 | $data = $this->parseMessage2(\hex2bin($message)); |
| 655 | 655 | |
| 656 | 656 | foreach ($map as $key => $value) { |
| 657 | - echo bin2hex($data[$key]) . ' - ' . $data[$key] . ' ||| ' . $value . "<br />\n"; |
|
| 657 | + echo bin2hex($data[$key]).' - '.$data[$key].' ||| '.$value."<br />\n"; |
|
| 658 | 658 | } |
| 659 | 659 | } elseif ($messageId === '03000000') { |
| 660 | 660 | $i = 0; |
@@ -697,7 +697,7 @@ discard block |
||
| 697 | 697 | ); |
| 698 | 698 | |
| 699 | 699 | foreach ($map as $key => $value) { |
| 700 | - echo $data[$key] . ' - ' . \hex2bin($data[$key]) . ' ||| ' . $value . "<br />\n"; |
|
| 700 | + echo $data[$key].' - '.\hex2bin($data[$key]).' ||| '.$value."<br />\n"; |
|
| 701 | 701 | } |
| 702 | 702 | } |
| 703 | 703 | |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | if (!$line) { |
| 195 | 195 | $metas = stream_get_meta_data($this->_out); |
| 196 | 196 | if ($metas['timed_out']) { |
| 197 | - throw new Swift_IoException('Connection to ' . $this->_getReadConnectionDescription() . ' Timed Out'); |
|
| 197 | + throw new Swift_IoException('Connection to '.$this->_getReadConnectionDescription().' Timed Out'); |
|
| 198 | 198 | } |
| 199 | 199 | } |
| 200 | 200 | |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $metas = stream_get_meta_data($this->_out); |
| 231 | 231 | if ($metas['timed_out']) { |
| 232 | 232 | throw new Swift_IoException( |
| 233 | - 'Connection to ' . $this->_getReadConnectionDescription() . ' Timed Out' |
|
| 233 | + 'Connection to '.$this->_getReadConnectionDescription().' Timed Out' |
|
| 234 | 234 | ); |
| 235 | 235 | } |
| 236 | 236 | } |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | $bytesWritten = fwrite($this->_in, substr($bytes, $totalBytesWritten)); |
| 279 | 279 | if (false === $bytesWritten || 0 === $bytesWritten) { |
| 280 | 280 | throw new Swift_IoException( |
| 281 | - 'Connection to ' . $this->_getReadConnectionDescription() . ' has gone away' |
|
| 281 | + 'Connection to '.$this->_getReadConnectionDescription().' has gone away' |
|
| 282 | 282 | ); |
| 283 | 283 | } |
| 284 | 284 | |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | |
| 307 | 307 | $host = $this->_params['host']; |
| 308 | 308 | if (!empty($this->_params['protocol'])) { |
| 309 | - $host = $this->_params['protocol'] . '://' . $host; |
|
| 309 | + $host = $this->_params['protocol'].'://'.$host; |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | $timeout = 15; |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | } |
| 316 | 316 | |
| 317 | 317 | if (!empty($this->_params['sourceIp'])) { |
| 318 | - $options['socket']['bindto'] = $this->_params['sourceIp'] . ':0'; |
|
| 318 | + $options['socket']['bindto'] = $this->_params['sourceIp'].':0'; |
|
| 319 | 319 | } |
| 320 | 320 | |
| 321 | 321 | if (!empty($this->_params['verifySsl'])) { |
@@ -328,10 +328,10 @@ discard block |
||
| 328 | 328 | |
| 329 | 329 | $streamContext = stream_context_create($options); |
| 330 | 330 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 331 | - $this->_stream = @stream_socket_client($host . ':' . $this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext); |
|
| 331 | + $this->_stream = @stream_socket_client($host.':'.$this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext); |
|
| 332 | 332 | |
| 333 | 333 | if (false === $this->_stream) { |
| 334 | - throw new Swift_TransportException('Connection could not be established with host ' . $this->_params['host'] . ' [' . $errstr . ' #' . $errno . ']'); |
|
| 334 | + throw new Swift_TransportException('Connection could not be established with host '.$this->_params['host'].' ['.$errstr.' #'.$errno.']'); |
|
| 335 | 335 | } |
| 336 | 336 | |
| 337 | 337 | if (!empty($this->_params['blocking'])) { |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | |
| 364 | 364 | $err = stream_get_contents($pipes[2]); |
| 365 | 365 | if ($err) { |
| 366 | - throw new Swift_TransportException('Process could not be started [' . $err . ']'); |
|
| 366 | + throw new Swift_TransportException('Process could not be started ['.$err.']'); |
|
| 367 | 367 | } |
| 368 | 368 | |
| 369 | 369 | $this->_in = &$pipes[0]; |
@@ -377,16 +377,16 @@ discard block |
||
| 377 | 377 | { |
| 378 | 378 | switch ($this->_params['type']) { |
| 379 | 379 | case self::TYPE_PROCESS: |
| 380 | - return 'Process ' . $this->_params['command']; |
|
| 380 | + return 'Process '.$this->_params['command']; |
|
| 381 | 381 | break; |
| 382 | 382 | |
| 383 | 383 | case self::TYPE_SOCKET: |
| 384 | 384 | default: |
| 385 | 385 | $host = $this->_params['host']; |
| 386 | 386 | if (!empty($this->_params['protocol'])) { |
| 387 | - $host = $this->_params['protocol'] . '://' . $host; |
|
| 387 | + $host = $this->_params['protocol'].'://'.$host; |
|
| 388 | 388 | } |
| 389 | - $host .= ':' . $this->_params['port']; |
|
| 389 | + $host .= ':'.$this->_params['port']; |
|
| 390 | 390 | |
| 391 | 391 | return $host; |
| 392 | 392 | break; |