@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | //Generate nonce, msg creation string & password digest: |
| 308 | 308 | $password = base64_decode($params->authParams->passwordData); |
| 309 | 309 | $creation = new \DateTime('now', new \DateTimeZone('UTC')); |
| 310 | - $t = (float)microtime(true); |
|
| 310 | + $t = (float) microtime(true); |
|
| 311 | 311 | $micro = sprintf("%03d", ($t - floor($t)) * 1000); |
| 312 | 312 | $creationString = $this->createDateTimeStringForAuth($creation, $micro); |
| 313 | 313 | $messageNonce = $this->generateUniqueNonce($params->authParams->nonceBase, $creationString); |
@@ -420,14 +420,14 @@ discard block |
||
| 420 | 420 | */ |
| 421 | 421 | protected function generateGuid() |
| 422 | 422 | { |
| 423 | - mt_srand((int)microtime(true)); |
|
| 423 | + mt_srand((int) microtime(true)); |
|
| 424 | 424 | $charId = strtoupper(md5(uniqid(mt_rand(), true))); |
| 425 | 425 | $hyphen = chr(45); // "-" |
| 426 | 426 | |
| 427 | - $uuid = substr($charId, 0, 8) . $hyphen |
|
| 428 | - . substr($charId, 8, 4) . $hyphen |
|
| 429 | - . substr($charId, 12, 4) . $hyphen |
|
| 430 | - . substr($charId, 16, 4) . $hyphen |
|
| 427 | + $uuid = substr($charId, 0, 8).$hyphen |
|
| 428 | + . substr($charId, 8, 4).$hyphen |
|
| 429 | + . substr($charId, 12, 4).$hyphen |
|
| 430 | + . substr($charId, 16, 4).$hyphen |
|
| 431 | 431 | . substr($charId, 20, 12); |
| 432 | 432 | |
| 433 | 433 | return $uuid; |
@@ -444,10 +444,10 @@ discard block |
||
| 444 | 444 | { |
| 445 | 445 | return '<oas:Security xmlns:oas="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"> |
| 446 | 446 | <oas:UsernameToken xmlns:oas1="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" oas1:Id="UsernameToken-1"> |
| 447 | - <oas:Username>' . $originator . '</oas:Username> |
|
| 448 | - <oas:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">' . $nonce . '</oas:Nonce> |
|
| 449 | - <oas:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest">' . $pwDigest . '</oas:Password> |
|
| 450 | - <oas1:Created>' . $creationTimeString . '</oas1:Created> |
|
| 447 | + <oas:Username>' . $originator.'</oas:Username> |
|
| 448 | + <oas:Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">' . $nonce.'</oas:Nonce> |
|
| 449 | + <oas:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest">' . $pwDigest.'</oas:Password> |
|
| 450 | + <oas1:Created>' . $creationTimeString.'</oas1:Created> |
|
| 451 | 451 | </oas:UsernameToken> |
| 452 | 452 | </oas:Security>'; |
| 453 | 453 | } |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | { |
| 463 | 463 | return substr( |
| 464 | 464 | sha1( |
| 465 | - $nonceBase . $creationString, |
|
| 465 | + $nonceBase.$creationString, |
|
| 466 | 466 | true |
| 467 | 467 | ), |
| 468 | 468 | 0, |
@@ -491,7 +491,7 @@ discard block |
||
| 491 | 491 | */ |
| 492 | 492 | protected function generatePasswordDigest($password, $creationString, $messageNonce) |
| 493 | 493 | { |
| 494 | - return base64_encode(sha1($messageNonce . $creationString . sha1($password, true), true)); |
|
| 494 | + return base64_encode(sha1($messageNonce.$creationString.sha1($password, true), true)); |
|
| 495 | 495 | } |
| 496 | 496 | |
| 497 | 497 | /** |
@@ -503,7 +503,7 @@ discard block |
||
| 503 | 503 | { |
| 504 | 504 | $creationDateTime->setTimezone(new \DateTimeZone('UTC')); |
| 505 | 505 | |
| 506 | - return $creationDateTime->format("Y-m-d\TH:i:s:") . $micro . 'Z'; |
|
| 506 | + return $creationDateTime->format("Y-m-d\TH:i:s:").$micro.'Z'; |
|
| 507 | 507 | } |
| 508 | 508 | |
| 509 | 509 | /** |