projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #14335 from eileenmcnaughton/bao_contribution
[civicrm-core.git]
/
CRM
/
Utils
/
Signer.php
diff --git
a/CRM/Utils/Signer.php
b/CRM/Utils/Signer.php
index a4a09bff7b683d698bbd8468a851080222f83bf8..6323b8931d7d7db0979f10475ea568e50346fb92 100644
(file)
--- a/
CRM/Utils/Signer.php
+++ b/
CRM/Utils/Signer.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
8
|
+ | Copyright CiviCRM LLC (c) 2004-201
9
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
8
+ * @copyright CiviCRM LLC (c) 2004-201
9
*/
/**
*/
/**
@@
-64,10
+64,12
@@
class CRM_Utils_Signer {
* Array, fields which should be part of the signature.
*/
public function __construct($secret, $paramNames) {
* Array, fields which should be part of the signature.
*/
public function __construct($secret, $paramNames) {
- sort($paramNames); // ensure consistent serialization of payloads
+ // ensure consistent serialization of payloads
+ sort($paramNames);
$this->secret = $secret;
$this->paramNames = $paramNames;
$this->secret = $secret;
$this->paramNames = $paramNames;
- $this->signDelim = "_"; // chosen to be valid in URLs but not in salt or md5
+ // chosen to be valid in URLs but not in salt or md5
+ $this->signDelim = "_";
$this->defaultSalt = CRM_Utils_String::createRandom(self::SALT_LEN, CRM_Utils_String::ALPHANUMERIC);
}
$this->defaultSalt = CRM_Utils_String::createRandom(self::SALT_LEN, CRM_Utils_String::ALPHANUMERIC);
}
@@
-81,9
+83,9
@@
class CRM_Utils_Signer {
* @return string, the full public token representing the signature
*/
public function sign($params, $salt = NULL) {
* @return string, the full public token representing the signature
*/
public function sign($params, $salt = NULL) {
- $message =
array()
;
+ $message =
[]
;
$message['secret'] = $this->secret;
$message['secret'] = $this->secret;
- $message['payload'] =
array()
;
+ $message['payload'] =
[]
;
if (empty($salt)) {
$message['salt'] = $this->createSalt();
}
if (empty($salt)) {
$message['salt'] = $this->createSalt();
}