jjkiers/OAuth
1
0
Fork 0
Code Issues 2 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

Change static calls from method_names to methodNames.

Browse Source
This commit is contained in:
Gary Jones 2012-11-17 22:33:43 +00:00
parent 244bd74225
commit f896020b35
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/GaryJones/OAuth/OAuthRequest.php
View File

@ -14,7 +14,7 @@ class OAuthRequest
public function __construct($http_method, $http_url, $parameters = null) public function __construct($http_method, $http_url, $parameters = null)
{ {
$parameters = ($parameters) ? $parameters : array(); $parameters = ($parameters) ? $parameters : array();
$this->parameters = array_merge(Util::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters); $this->parameters = array_merge(Util::parseParameters(parse_url($http_url, PHP_URL_QUERY)), $parameters);
$this->http_method = $http_method; $this->http_method = $http_method;
$this->http_url = $http_url; $this->http_url = $http_url;
} }
@ -38,10 +38,10 @@ class OAuthRequest
// parsed parameter-list // parsed parameter-list
if (!$parameters) { if (!$parameters) {
// Find request headers // Find request headers
$request_headers = Util::get_headers(); $request_headers = Util::getHeaders();
// Parse the query-string to find GET parameters // Parse the query-string to find GET parameters
$parameters = Util::parse_parameters($_SERVER['QUERY_STRING']); $parameters = Util::parseParameters($_SERVER['QUERY_STRING']);
// It's a POST request of the proper content-type, so parse POST // It's a POST request of the proper content-type, so parse POST
// parameters and add those overriding any duplicates from GET // parameters and add those overriding any duplicates from GET
@ -49,7 +49,7 @@ class OAuthRequest
&& isset($request_headers['Content-Type']) && isset($request_headers['Content-Type'])
&& strstr($request_headers['Content-Type'], 'application/x-www-form-urlencoded') && strstr($request_headers['Content-Type'], 'application/x-www-form-urlencoded')
) { ) {
$post_data = Util::parse_parameters( $post_data = Util::parseParameters(
file_get_contents(self::$POST_INPUT) file_get_contents(self::$POST_INPUT)
); );
$parameters = array_merge($parameters, $post_data); $parameters = array_merge($parameters, $post_data);
@ -59,7 +59,7 @@ class OAuthRequest
// and add those overriding any duplicates from GET or POST // and add those overriding any duplicates from GET or POST
if (isset($request_headers['Authorization']) && if (isset($request_headers['Authorization']) &&
substr($request_headers['Authorization'], 0, 6) == 'OAuth ') { substr($request_headers['Authorization'], 0, 6) == 'OAuth ') {
$header_parameters = Util::split_header( $header_parameters = Util::splitHeader(
$request_headers['Authorization'] $request_headers['Authorization']
); );
$parameters = array_merge($parameters, $header_parameters); $parameters = array_merge($parameters, $header_parameters);
@ -75,9 +75,9 @@ class OAuthRequest
public static function fromConsumerAndToken($consumer, $token, $http_method, $http_url, $parameters = null) public static function fromConsumerAndToken($consumer, $token, $http_method, $http_url, $parameters = null)
{ {
$parameters = ($parameters) ? $parameters : array(); $parameters = ($parameters) ? $parameters : array();
$defaults = array("oauth_version" => Request::$version, $defaults = array("oauth_version" => OAuthRequest::$version,
"oauth_nonce" => Request::generate_nonce(), "oauth_nonce" => OAuthRequest::generateNonce(),
"oauth_timestamp" => Request::generate_timestamp(), "oauth_timestamp" => OAuthRequest::generateTimestamp(),
"oauth_consumer_key" => $consumer->key); "oauth_consumer_key" => $consumer->key);
if ($token) { if ($token) {
$defaults['oauth_token'] = $token->key; $defaults['oauth_token'] = $token->key;
@ -134,7 +134,7 @@ class OAuthRequest
unset($params['oauth_signature']); unset($params['oauth_signature']);
} }
return Util::build_http_query($params); return Util::buildHttpQuery($params);
} }
/** /**
@ -152,7 +152,7 @@ class OAuthRequest
$this->getSignableParameters() $this->getSignableParameters()
); );
$encoded_parts = Util::urlencode_rfc3986($parts); $encoded_parts = Util::urlencodeRfc3986($parts);
return implode('&', $encoded_parts); return implode('&', $encoded_parts);
} }
@ -203,7 +203,7 @@ class OAuthRequest
*/ */
public function toPostdata() public function toPostdata()
{ {
return Util::build_http_query($this->parameters); return Util::buildHttpQuery($this->parameters);
} }
/** /**
@ -213,7 +213,7 @@ class OAuthRequest
{ {
$first = true; $first = true;
if ($realm) { if ($realm) {
$out = 'Authorization: OAuth realm="' . Util::urlencode_rfc3986($realm) . '"'; $out = 'Authorization: OAuth realm="' . Util::urlencodeRfc3986($realm) . '"';
$first = false; $first = false;
} else { } else {
$out = 'Authorization: OAuth'; $out = 'Authorization: OAuth';
@ -228,9 +228,9 @@ class OAuthRequest
throw new OAuthException('Arrays not supported in headers'); throw new OAuthException('Arrays not supported in headers');
} }
$out .= ($first) ? ' ' : ','; $out .= ($first) ? ' ' : ',';
$out .= Util::urlencode_rfc3986($k) . $out .= Util::urlencodeRfc3986($k) .
'="' . '="' .
Util::urlencode_rfc3986($v) . Util::urlencodeRfc3986($v) .
'"'; '"';
$first = false; $first = false;
} }