@@ -347,10 +347,10 @@ discard block |
||
| 347 | 347 | $charId = strtoupper(md5(uniqid(rand(), true))); |
| 348 | 348 | $hyphen = chr(45); // "-" |
| 349 | 349 | |
| 350 | - $uuid = substr($charId, 0, 8) . $hyphen |
|
| 351 | - .substr($charId, 8, 4) . $hyphen |
|
| 352 | - .substr($charId, 12, 4) . $hyphen |
|
| 353 | - .substr($charId, 16, 4) . $hyphen |
|
| 350 | + $uuid = substr($charId, 0, 8).$hyphen |
|
| 351 | + .substr($charId, 8, 4).$hyphen |
|
| 352 | + .substr($charId, 12, 4).$hyphen |
|
| 353 | + .substr($charId, 16, 4).$hyphen |
|
| 354 | 354 | .substr($charId, 20, 12); |
| 355 | 355 | |
| 356 | 356 | return $uuid; |
@@ -367,10 +367,10 @@ discard block |
||
| 367 | 367 | { |
| 368 | 368 | return $xml = '<oas:Security xmlns:oas="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"> |
| 369 | 369 | <oas:UsernameToken xmlns:oas1="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" oas1:Id="UsernameToken-1"> |
| 370 | - <oas:Username>' . $originator . '</oas:Username> |
|
| 371 | - <oas:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">' . $nonce . '</oas:Nonce> |
|
| 372 | - <oas:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest">' . $pwDigest . '</oas:Password> |
|
| 373 | - <oas1:Created>' . $creationTimeString . '</oas1:Created> |
|
| 370 | + <oas:Username>' . $originator.'</oas:Username> |
|
| 371 | + <oas:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">' . $nonce.'</oas:Nonce> |
|
| 372 | + <oas:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest">' . $pwDigest.'</oas:Password> |
|
| 373 | + <oas1:Created>' . $creationTimeString.'</oas1:Created> |
|
| 374 | 374 | </oas:UsernameToken> |
| 375 | 375 | </oas:Security>'; |
| 376 | 376 | } |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | { |
| 386 | 386 | return substr( |
| 387 | 387 | sha1( |
| 388 | - $nonceBase . $creationString, |
|
| 388 | + $nonceBase.$creationString, |
|
| 389 | 389 | true |
| 390 | 390 | ), |
| 391 | 391 | 0, |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | */ |
| 414 | 414 | protected function generatePasswordDigest($password, $creationString, $messageNonce) |
| 415 | 415 | { |
| 416 | - return base64_encode(sha1($messageNonce . $creationString . sha1($password, true), true)); |
|
| 416 | + return base64_encode(sha1($messageNonce.$creationString.sha1($password, true), true)); |
|
| 417 | 417 | } |
| 418 | 418 | |
| 419 | 419 | /** |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | protected function createDateTimeStringForAuth($creationDateTime, $micro) |
| 425 | 425 | { |
| 426 | 426 | $creationDateTime->setTimezone(new \DateTimeZone('UTC')); |
| 427 | - return $creationDateTime->format("Y-m-d\TH:i:s:") . $micro . 'Z'; |
|
| 427 | + return $creationDateTime->format("Y-m-d\TH:i:s:").$micro.'Z'; |
|
| 428 | 428 | } |
| 429 | 429 | |
| 430 | 430 | /** |