| @@ -30,6 +30,6 @@ | ||
| 30 | 30 | */ | 
| 31 | 31 | public function isValidSimpleWrapper($email) | 
| 32 | 32 |      { | 
| 33 | -        return (boolean)preg_match('/^(.*<?)(.*)@(.*)(>?)$/', $email); | |
| 33 | +        return (boolean) preg_match('/^(.*<?)(.*)@(.*)(>?)$/', $email); | |
| 34 | 34 | } | 
| 35 | 35 | } | 
| @@ -77,9 +77,9 @@ | ||
| 77 | 77 | } | 
| 78 | 78 | |
| 79 | 79 | $count = ( | 
| 80 | - count((array)$message->getTo()) | |
| 81 | - + count((array)$message->getCc()) | |
| 82 | - + count((array)$message->getBcc()) | |
| 80 | + count((array) $message->getTo()) | |
| 81 | + + count((array) $message->getCc()) | |
| 82 | + + count((array) $message->getBcc()) | |
| 83 | 83 | ); | 
| 84 | 84 | |
| 85 | 85 | return $count; | 
| @@ -226,8 +226,8 @@ discard block | ||
| 226 | 226 | protected function createMessage1() | 
| 227 | 227 |      { | 
| 228 | 228 | return self::NTLMSIG | 
| 229 | -               . $this->createByte('01') // Message 1 | |
| 230 | -               . $this->createByte('0702'); // Flags | |
| 229 | +                . $this->createByte('01') // Message 1 | |
| 230 | +                . $this->createByte('0702'); // Flags | |
| 231 | 231 | } | 
| 232 | 232 | |
| 233 | 233 | /** | 
| @@ -255,19 +255,19 @@ discard block | ||
| 255 | 255 | $ntlmSec = $this->createSecurityBuffer($ntlmResponse, ($lmInfo[0] + $lmInfo[1]) / 2, true); | 
| 256 | 256 | |
| 257 | 257 | return self::NTLMSIG | 
| 258 | -               . $this->createByte('03') // TYPE 3 message | |
| 259 | - . $lmSec // LM response header | |
| 260 | - . $ntlmSec // NTLM response header | |
| 261 | - . $domainSec // Domain header | |
| 262 | - . $userSec // User header | |
| 263 | - . $workSec // Workstation header | |
| 264 | -               . $this->createByte('000000009a', 8) // session key header (empty) | |
| 265 | -               . $this->createByte('01020000') // FLAGS | |
| 266 | - . $this->convertTo16bit($domain) // domain name | |
| 267 | - . $this->convertTo16bit($username) // username | |
| 268 | - . $this->convertTo16bit($workstation) // workstation | |
| 269 | - . $lmResponse | |
| 270 | - . $ntlmResponse; | |
| 258 | +                . $this->createByte('03') // TYPE 3 message | |
| 259 | + . $lmSec // LM response header | |
| 260 | + . $ntlmSec // NTLM response header | |
| 261 | + . $domainSec // Domain header | |
| 262 | + . $userSec // User header | |
| 263 | + . $workSec // Workstation header | |
| 264 | +                . $this->createByte('000000009a', 8) // session key header (empty) | |
| 265 | +                . $this->createByte('01020000') // FLAGS | |
| 266 | + . $this->convertTo16bit($domain) // domain name | |
| 267 | + . $this->convertTo16bit($username) // username | |
| 268 | + . $this->convertTo16bit($workstation) // workstation | |
| 269 | + . $lmResponse | |
| 270 | + . $ntlmResponse; | |
| 271 | 271 | } | 
| 272 | 272 | |
| 273 | 273 | /** | 
| @@ -280,12 +280,12 @@ discard block | ||
| 280 | 280 | protected function createBlob($timestamp, $client, $targetInfo) | 
| 281 | 281 |      { | 
| 282 | 282 |          return $this->createByte('0101') | 
| 283 | -               . $this->createByte('00') | |
| 284 | - . $timestamp | |
| 285 | - . $client | |
| 286 | -               . $this->createByte('00') | |
| 287 | - . $targetInfo | |
| 288 | -               . $this->createByte('00'); | |
| 283 | +                . $this->createByte('00') | |
| 284 | + . $timestamp | |
| 285 | + . $client | |
| 286 | +                . $this->createByte('00') | |
| 287 | + . $targetInfo | |
| 288 | +                . $this->createByte('00'); | |
| 289 | 289 | } | 
| 290 | 290 | |
| 291 | 291 | /** | 
| @@ -451,16 +451,16 @@ discard block | ||
| 451 | 451 |          foreach ($material as $k => $v) { | 
| 452 | 452 | $b = $this->castToByte(hexdec($v)); | 
| 453 | 453 | $needsParity = ( | 
| 454 | - ( | |
| 455 | - $this->uRShift($b, 7) | |
| 456 | - ^ $this->uRShift($b, 6) | |
| 457 | - ^ $this->uRShift($b, 5) | |
| 458 | - ^ $this->uRShift($b, 4) | |
| 459 | - ^ $this->uRShift($b, 3) | |
| 460 | - ^ $this->uRShift($b, 2) | |
| 461 | - ^ $this->uRShift($b, 1) | |
| 462 | - ) & 0x01 | |
| 463 | - ) == 0; | |
| 454 | + ( | |
| 455 | + $this->uRShift($b, 7) | |
| 456 | + ^ $this->uRShift($b, 6) | |
| 457 | + ^ $this->uRShift($b, 5) | |
| 458 | + ^ $this->uRShift($b, 4) | |
| 459 | + ^ $this->uRShift($b, 3) | |
| 460 | + ^ $this->uRShift($b, 2) | |
| 461 | + ^ $this->uRShift($b, 1) | |
| 462 | + ) & 0x01 | |
| 463 | + ) == 0; | |
| 464 | 464 | |
| 465 | 465 | list($high, $low) = str_split($v); | 
| 466 | 466 | |
| @@ -86,7 +86,7 @@ discard block | ||
| 86 | 86 | // pad to $bits bit | 
| 87 | 87 | $bin_length = strlen($bin); | 
| 88 | 88 |                  if ($bin_length < $bits) { | 
| 89 | -                    $bin = str_repeat('0', $bits - $bin_length) . $bin; | |
| 89 | +                    $bin = str_repeat('0', $bits - $bin_length).$bin; | |
| 90 | 90 | } | 
| 91 | 91 |              } else { | 
| 92 | 92 | // negative | 
| @@ -94,7 +94,7 @@ discard block | ||
| 94 | 94 | $bin = base_convert($si, 10, 2); | 
| 95 | 95 | $bin_length = strlen($bin); | 
| 96 | 96 |                  if ($bin_length > $bits) { | 
| 97 | -                    $bin = str_repeat('1', $bits - $bin_length) . $bin; | |
| 97 | +                    $bin = str_repeat('1', $bits - $bin_length).$bin; | |
| 98 | 98 | } | 
| 99 | 99 | } | 
| 100 | 100 | } | 
| @@ -199,7 +199,7 @@ discard block | ||
| 199 | 199 |      { | 
| 200 | 200 | list($domain, $username) = $this->getDomainAndUsername($username); | 
| 201 | 201 | //$challenge, $context, $targetInfoH, $targetName, $domainName, $workstation, $DNSDomainName, $DNSServerName, $blob, $ter | 
| 202 | - list($challenge, , , , , $workstation, , , $blob) = $this->parseMessage2($response); | |
| 202 | + list($challenge,,,,, $workstation,,, $blob) = $this->parseMessage2($response); | |
| 203 | 203 | |
| 204 | 204 |          if (!$v2) { | 
| 205 | 205 | // LMv1 | 
| @@ -325,7 +325,7 @@ discard block | ||
| 325 | 325 | $desKey1 = $this->createDesKey($key1); | 
| 326 | 326 | $desKey2 = $this->createDesKey($key2); | 
| 327 | 327 | |
| 328 | - $constantDecrypt = $this->createByte($this->desEncrypt(self::DESCONST, $desKey1) . $this->desEncrypt(self::DESCONST, $desKey2), 21, false); | |
| 328 | + $constantDecrypt = $this->createByte($this->desEncrypt(self::DESCONST, $desKey1).$this->desEncrypt(self::DESCONST, $desKey2), 21, false); | |
| 329 | 329 | |
| 330 | 330 | // SECOND PART | 
| 331 | 331 | list($key1, $key2, $key3) = str_split($constantDecrypt, 7); | 
| @@ -334,7 +334,7 @@ discard block | ||
| 334 | 334 | $desKey2 = $this->createDesKey($key2); | 
| 335 | 335 | $desKey3 = $this->createDesKey($key3); | 
| 336 | 336 | |
| 337 | - return $this->desEncrypt($challenge, $desKey1) . $this->desEncrypt($challenge, $desKey2) . $this->desEncrypt($challenge, $desKey3); | |
| 337 | + return $this->desEncrypt($challenge, $desKey1).$this->desEncrypt($challenge, $desKey2).$this->desEncrypt($challenge, $desKey3); | |
| 338 | 338 | } | 
| 339 | 339 | |
| 340 | 340 | /** | 
| @@ -355,7 +355,7 @@ discard block | ||
| 355 | 355 | $desKey2 = $this->createDesKey($key2); | 
| 356 | 356 | $desKey3 = $this->createDesKey($key3); | 
| 357 | 357 | |
| 358 | - return $this->desEncrypt($challenge, $desKey1) . $this->desEncrypt($challenge, $desKey2) . $this->desEncrypt($challenge, $desKey3); | |
| 358 | + return $this->desEncrypt($challenge, $desKey1).$this->desEncrypt($challenge, $desKey2).$this->desEncrypt($challenge, $desKey3); | |
| 359 | 359 | } | 
| 360 | 360 | |
| 361 | 361 | /** | 
| @@ -400,9 +400,9 @@ discard block | ||
| 400 | 400 | // if $password > 15 than we can't use this method | 
| 401 | 401 |          if (strlen($password) <= 15) { | 
| 402 | 402 | $ntlmHash = $this->md4Encrypt($password); | 
| 403 | - $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username) . $domain)); | |
| 403 | + $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain)); | |
| 404 | 404 | |
| 405 | - $lmPass = bin2hex($this->md5Encrypt($ntml2Hash, $challenge . $client) . $client); | |
| 405 | + $lmPass = bin2hex($this->md5Encrypt($ntml2Hash, $challenge.$client).$client); | |
| 406 | 406 | } | 
| 407 | 407 | |
| 408 | 408 | return $this->createByte($lmPass, 24); | 
| @@ -426,14 +426,14 @@ discard block | ||
| 426 | 426 | protected function createNTLMv2Hash($password, $username, $domain, $challenge, $targetInfo, $timestamp, $client) | 
| 427 | 427 |      { | 
| 428 | 428 | $ntlmHash = $this->md4Encrypt($password); | 
| 429 | - $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username) . $domain)); | |
| 429 | + $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain)); | |
| 430 | 430 | |
| 431 | 431 | // create blob | 
| 432 | 432 | $blob = $this->createBlob($timestamp, $client, $targetInfo); | 
| 433 | 433 | |
| 434 | - $ntlmv2Response = $this->md5Encrypt($ntml2Hash, $challenge . $blob); | |
| 434 | + $ntlmv2Response = $this->md5Encrypt($ntml2Hash, $challenge.$blob); | |
| 435 | 435 | |
| 436 | - return $ntlmv2Response . $blob; | |
| 436 | + return $ntlmv2Response.$blob; | |
| 437 | 437 | } | 
| 438 | 438 | |
| 439 | 439 | protected function createDesKey($key) | 
| @@ -442,7 +442,7 @@ discard block | ||
| 442 | 442 | $len = strlen($key); | 
| 443 | 443 |          for ($i = 1; $i < $len; ++$i) { | 
| 444 | 444 | list($high, $low) = str_split(bin2hex($key[$i])); | 
| 445 | - $v = $this->castToByte(ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf) . dechex(hexdec($low) & 0xf)), $i)); | |
| 445 | + $v = $this->castToByte(ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xf)), $i)); | |
| 446 | 446 | $material[] = str_pad(substr(dechex($v), -2), 2, '0', STR_PAD_LEFT); // cast to byte | 
| 447 | 447 | } | 
| 448 | 448 | $material[] = str_pad(substr(dechex($this->castToByte(ord($key[6]) << 1)), -2), 2, '0'); | 
| @@ -465,9 +465,9 @@ discard block | ||
| 465 | 465 | list($high, $low) = str_split($v); | 
| 466 | 466 | |
| 467 | 467 |              if ($needsParity) { | 
| 468 | - $material[$k] = dechex(hexdec($high) | 0x0) . dechex(hexdec($low) | 0x1); | |
| 468 | + $material[$k] = dechex(hexdec($high) | 0x0).dechex(hexdec($low) | 0x1); | |
| 469 | 469 |              } else { | 
| 470 | - $material[$k] = dechex(hexdec($high) & 0xf) . dechex(hexdec($low) & 0xe); | |
| 470 | + $material[$k] = dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xe); | |
| 471 | 471 | } | 
| 472 | 472 | } | 
| 473 | 473 | |
| @@ -490,7 +490,7 @@ discard block | ||
| 490 | 490 | $length = $is16 ? $length / 2 : $length; | 
| 491 | 491 | $length = $this->createByte(str_pad(dechex($length), 2, '0', STR_PAD_LEFT), 2); | 
| 492 | 492 | |
| 493 | - return $length . $length . $this->createByte(dechex($offset), 4); | |
| 493 | + return $length.$length.$this->createByte(dechex($offset), 4); | |
| 494 | 494 | } | 
| 495 | 495 | |
| 496 | 496 | /** | 
| @@ -612,7 +612,7 @@ discard block | ||
| 612 | 612 |          $ipadk = $key ^ str_repeat("\x36", $blocksize); | 
| 613 | 613 |          $opadk = $key ^ str_repeat("\x5c", $blocksize); | 
| 614 | 614 | |
| 615 | -        return pack('H*', md5($opadk . pack('H*', md5($ipadk . $msg)))); | |
| 615 | +        return pack('H*', md5($opadk.pack('H*', md5($ipadk.$msg)))); | |
| 616 | 616 | } | 
| 617 | 617 | |
| 618 | 618 | /** | 
| @@ -666,8 +666,8 @@ discard block | ||
| 666 | 666 |      { | 
| 667 | 667 | $message = bin2hex($message); | 
| 668 | 668 | $messageId = substr($message, 16, 8); | 
| 669 | - echo substr($message, 0, 16) . " NTLMSSP Signature<br />\n"; | |
| 670 | - echo $messageId . " Type Indicator<br />\n"; | |
| 669 | + echo substr($message, 0, 16)." NTLMSSP Signature<br />\n"; | |
| 670 | + echo $messageId." Type Indicator<br />\n"; | |
| 671 | 671 | |
| 672 | 672 |          if ($messageId === '02000000') { | 
| 673 | 673 | $map = array( | 
| @@ -686,7 +686,7 @@ discard block | ||
| 686 | 686 | $data = $this->parseMessage2($this->hex2bin($message)); | 
| 687 | 687 | |
| 688 | 688 |              foreach ($map as $key => $value) { | 
| 689 | - echo bin2hex($data[$key]) . ' - ' . $data[$key] . ' ||| ' . $value . "<br />\n"; | |
| 689 | + echo bin2hex($data[$key]).' - '.$data[$key].' ||| '.$value."<br />\n"; | |
| 690 | 690 | } | 
| 691 | 691 |          } elseif ($messageId === '03000000') { | 
| 692 | 692 | $i = 0; | 
| @@ -729,7 +729,7 @@ discard block | ||
| 729 | 729 | ); | 
| 730 | 730 | |
| 731 | 731 |              foreach ($map as $key => $value) { | 
| 732 | - echo $data[$key] . ' - ' . $this->hex2bin($data[$key]) . ' ||| ' . $value . "<br />\n"; | |
| 732 | + echo $data[$key].' - '.$this->hex2bin($data[$key]).' ||| '.$value."<br />\n"; | |
| 733 | 733 | } | 
| 734 | 734 | } | 
| 735 | 735 | |
| @@ -111,7 +111,7 @@ | ||
| 111 | 111 |          if ($i !== null) { | 
| 112 | 112 | $tree[-1] = min(count($replace) - 1, $i); | 
| 113 | 113 | $tree[-2] = $last_size; | 
| 114 | - $this->_treeMaxLen = (int)$size; | |
| 114 | + $this->_treeMaxLen = (int) $size; | |
| 115 | 115 | } | 
| 116 | 116 |          foreach ($replace as $rep) { | 
| 117 | 117 |              if (!is_array($rep)) { | 
| @@ -8,17 +8,17 @@ | ||
| 8 | 8 | * file that was distributed with this source code. | 
| 9 | 9 | */ | 
| 10 | 10 | |
| 11 | -require __DIR__ . '/classes/Swift.php'; | |
| 11 | +require __DIR__.'/classes/Swift.php'; | |
| 12 | 12 | |
| 13 | 13 | Swift::registerAutoload( | 
| 14 | -    function () { | |
| 14 | +    function() { | |
| 15 | 15 | // Load in dependency maps | 
| 16 | - require __DIR__ . '/dependency_maps/cache_deps.php'; | |
| 17 | - require __DIR__ . '/dependency_maps/mime_deps.php'; | |
| 18 | - require __DIR__ . '/dependency_maps/message_deps.php'; | |
| 19 | - require __DIR__ . '/dependency_maps/transport_deps.php'; | |
| 16 | + require __DIR__.'/dependency_maps/cache_deps.php'; | |
| 17 | + require __DIR__.'/dependency_maps/mime_deps.php'; | |
| 18 | + require __DIR__.'/dependency_maps/message_deps.php'; | |
| 19 | + require __DIR__.'/dependency_maps/transport_deps.php'; | |
| 20 | 20 | |
| 21 | 21 | // Load in global library preferences | 
| 22 | - require __DIR__ . '/preferences.php'; | |
| 22 | + require __DIR__.'/preferences.php'; | |
| 23 | 23 | } | 
| 24 | 24 | ); | 
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | -require __DIR__ . '/../mime_types.php'; | |
| 3 | +require __DIR__.'/../mime_types.php'; | |
| 4 | 4 | |
| 5 | 5 | Swift_DependencyContainer::getInstance() | 
| 6 | 6 |      ->register('properties.charset') | 
| @@ -113,7 +113,7 @@ | ||
| 113 | 113 | */ | 
| 114 | 114 | public function toString() | 
| 115 | 115 |      { | 
| 116 | - return $this->_fieldName . ': ' . $this->_value; | |
| 116 | + return $this->_fieldName.': '.$this->_value; | |
| 117 | 117 | } | 
| 118 | 118 | |
| 119 | 119 | /** | 
| @@ -156,7 +156,7 @@ discard block | ||
| 156 | 156 | $angleAddrs = array(); | 
| 157 | 157 | |
| 158 | 158 |              foreach ($this->_ids as $id) { | 
| 159 | - $angleAddrs[] = '<' . $id . '>'; | |
| 159 | + $angleAddrs[] = '<'.$id.'>'; | |
| 160 | 160 | } | 
| 161 | 161 | |
| 162 | 162 |              $this->setCachedValue(implode(' ', $angleAddrs)); | 
| @@ -176,7 +176,7 @@ discard block | ||
| 176 | 176 |      { | 
| 177 | 177 |          if ($this->_emailValidator->isValidSimpleWrapper($id) === false) { | 
| 178 | 178 | throw new Swift_RfcComplianceException( | 
| 179 | - 'Invalid ID given <' . $id . '>' | |
| 179 | + 'Invalid ID given <'.$id.'>' | |
| 180 | 180 | ); | 
| 181 | 181 | } | 
| 182 | 182 | } | 
| @@ -109,7 +109,7 @@ discard block | ||
| 109 | 109 | */ | 
| 110 | 110 | public function setNameAddresses($mailboxes) | 
| 111 | 111 |      { | 
| 112 | - $this->_mailboxes = $this->normalizeMailboxes((array)$mailboxes); | |
| 112 | + $this->_mailboxes = $this->normalizeMailboxes((array) $mailboxes); | |
| 113 | 113 | $this->setCachedValue(null); //Clear any cached value | 
| 114 | 114 | } | 
| 115 | 115 | |
| @@ -194,7 +194,7 @@ discard block | ||
| 194 | 194 | */ | 
| 195 | 195 | public function setAddresses($addresses) | 
| 196 | 196 |      { | 
| 197 | - $this->setNameAddresses(array_values((array)$addresses)); | |
| 197 | + $this->setNameAddresses(array_values((array) $addresses)); | |
| 198 | 198 | } | 
| 199 | 199 | |
| 200 | 200 | /** | 
| @@ -217,7 +217,7 @@ discard block | ||
| 217 | 217 | public function removeAddresses($addresses) | 
| 218 | 218 |      { | 
| 219 | 219 | $this->setCachedValue(null); | 
| 220 | -        foreach ((array)$addresses as $address) { | |
| 220 | +        foreach ((array) $addresses as $address) { | |
| 221 | 221 | unset($this->_mailboxes[$address]); | 
| 222 | 222 | } | 
| 223 | 223 | } | 
| @@ -333,7 +333,7 @@ discard block | ||
| 333 | 333 | $mailboxStr = $email; | 
| 334 | 334 |              if ($name) { | 
| 335 | 335 | $nameStr = $this->createDisplayNameString($name, empty($strings)); | 
| 336 | - $mailboxStr = $nameStr . ' <' . $mailboxStr . '>'; | |
| 336 | + $mailboxStr = $nameStr.' <'.$mailboxStr.'>'; | |
| 337 | 337 | } | 
| 338 | 338 | $strings[] = $mailboxStr; | 
| 339 | 339 | } | 
| @@ -351,7 +351,7 @@ discard block | ||
| 351 | 351 | private function _assertValidAddress($address) | 
| 352 | 352 |      { | 
| 353 | 353 |          if ($this->_emailValidator->isValidWrapper($address) === false) { | 
| 354 | -            throw new Swift_RfcComplianceException('Address in mailbox given [' . $address . '] does not comply with RFC 2822, 3.6.2.'); | |
| 354 | +            throw new Swift_RfcComplianceException('Address in mailbox given ['.$address.'] does not comply with RFC 2822, 3.6.2.'); | |
| 355 | 355 | } | 
| 356 | 356 | } | 
| 357 | 357 | } |