bitmotor/unirest-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed unnecessary parameters from query string

Browse Source
This commit is contained in:
Evan Seguin
2012-08-07 16:07:20 -07:00
parent 32825ef541
commit 9e63501237
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/mashape/http/HttpClient.php
View File

@@ -86,11 +86,9 @@ class HttpClient {
//$url = self::removeQueryString($url); //$url = self::removeQueryString($url);
$data = http_build_query($parameters); $data = http_build_query($parameters);
} }
$ch = curl_init (); $ch = curl_init ();
// prepare the request // prepare the request
//curl_setopt($ch, CURLOPT_USERPWD, "username:password"); for basic auth
curl_setopt ($ch, CURLOPT_URL , $url); curl_setopt ($ch, CURLOPT_URL , $url);
if ($httpMethod != HttpMethod::GET) { if ($httpMethod != HttpMethod::GET) {
curl_setopt ($ch, CURLOPT_CUSTOMREQUEST, $httpMethod); curl_setopt ($ch, CURLOPT_CUSTOMREQUEST, $httpMethod);

5
main/mashape/http/UrlUtils.php
View File

@@ -53,6 +53,7 @@ class UrlUtils {
if (array_key_exists($key, $parameters)) { if (array_key_exists($key, $parameters)) {
$finalUrl = preg_replace("/(\?.+)\{" . $key . "\}/", '${1}' . urlencode($parameters[$key]), $finalUrl); $finalUrl = preg_replace("/(\?.+)\{" . $key . "\}/", '${1}' . urlencode($parameters[$key]), $finalUrl);
$finalUrl = preg_replace("/\{" . $key . "\}/", rawurlencode($parameters[$key]), $finalUrl); $finalUrl = preg_replace("/\{" . $key . "\}/", rawurlencode($parameters[$key]), $finalUrl);
unset($parameters[$key]);
} else { } else {
$finalUrl = preg_replace("/&?[\w]*=?\{" . $key . "\}/", "", $finalUrl); $finalUrl = preg_replace("/&?[\w]*=?\{" . $key . "\}/", "", $finalUrl);
} }
@@ -68,9 +69,7 @@ class UrlUtils {
} else { } else {
foreach ($parameters as $paramKey => $paramValue) { foreach ($parameters as $paramKey => $paramValue) {
$delimiter = (strpos($finalUrl, "?") === false) ? "?" : "&"; $delimiter = (strpos($finalUrl, "?") === false) ? "?" : "&";
if (strpos($finalUrl, $paramKey."=") === false) { $finalUrl .= $delimiter . $paramKey . "=" . urlencode($paramValue);
$finalUrl .= $delimiter . $paramKey . "=" . urlencode($paramValue);
}
} }
} }