--- a/web/lib/Zend/Oauth/Http/Utility.php Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Oauth/Http/Utility.php Thu Mar 21 19:50:53 2013 +0100
@@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Oauth
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Utility.php 22662 2010-07-24 17:37:36Z mabe $
+ * @version $Id: Utility.php 24593 2012-01-05 20:35:02Z matthew $
*/
/** Zend_Oauth */
@@ -28,7 +28,7 @@
/**
* @category Zend
* @package Zend_Oauth
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Oauth_Http_Utility
@@ -43,7 +43,7 @@
* @return array
*/
public function assembleParams(
- $url,
+ $url,
Zend_Oauth_Config_ConfigInterface $config,
array $serviceProviderParams = null
) {
@@ -54,7 +54,7 @@
'oauth_timestamp' => $this->generateTimestamp(),
'oauth_version' => $config->getVersion(),
);
-
+
if ($config->getToken()->getToken() != null) {
$params['oauth_token'] = $config->getToken()->getToken();
}
@@ -96,8 +96,8 @@
}
$encodedParams = array();
foreach ($params as $key => $value) {
- $encodedParams[] = self::urlEncode($key)
- . '='
+ $encodedParams[] = self::urlEncode($key)
+ . '='
. self::urlEncode($value);
}
return implode('&', $encodedParams);
@@ -105,10 +105,10 @@
/**
* Cast to authorization header
- *
- * @param array $params
- * @param null|string $realm
- * @param bool $excludeCustomParams
+ *
+ * @param array $params
+ * @param null|string $realm
+ * @param bool $excludeCustomParams
* @return void
*/
public function toAuthorizationHeader(array $params, $realm = null, $excludeCustomParams = true)
@@ -123,7 +123,7 @@
continue;
}
}
- $headerValue[] = self::urlEncode($key)
+ $headerValue[] = self::urlEncode($key)
. '="'
. self::urlEncode($value) . '"';
}
@@ -132,13 +132,13 @@
/**
* Sign request
- *
- * @param array $params
- * @param string $signatureMethod
- * @param string $consumerSecret
- * @param null|string $tokenSecret
- * @param null|string $method
- * @param null|string $url
+ *
+ * @param array $params
+ * @param string $signatureMethod
+ * @param string $consumerSecret
+ * @param null|string $tokenSecret
+ * @param null|string $method
+ * @param null|string $url
* @return string
*/
public function sign(
@@ -161,8 +161,8 @@
/**
* Parse query string
- *
- * @param mixed $query
+ *
+ * @param mixed $query
* @return array
*/
public function parseQueryString($query)
@@ -184,7 +184,7 @@
/**
* Generate nonce
- *
+ *
* @return string
*/
public function generateNonce()
@@ -194,7 +194,7 @@
/**
* Generate timestamp
- *
+ *
* @return int
*/
public function generateTimestamp()
@@ -204,8 +204,8 @@
/**
* urlencode a value
- *
- * @param string $value
+ *
+ * @param string $value
* @return string
*/
public static function urlEncode($value)