Support for authentication

This commit is contained in:
Evan Seguin
2012-07-19 12:52:13 -07:00
parent 1c503f13ff
commit 78a0f180d0
8 changed files with 134 additions and 17 deletions

View File

@@ -42,12 +42,6 @@ class UrlUtils {
}
}
if ($addRegularQueryStringParameters) {
// Get regular query string parameters
self::addRegularQueryStringParameters($url, $parameters);
}
$finalUrl = $url;
$matches = null;
$match = preg_match_all(PLACEHOLDER_REGEX, $url, $matches);
@@ -67,6 +61,17 @@ class UrlUtils {
$finalUrl = preg_replace("/\?&/", "?", $finalUrl);
$finalUrl = preg_replace("/\?$/", "", $finalUrl);
if ($addRegularQueryStringParameters) {
// Get regular query string parameters
self::addRegularQueryStringParameters($finalUrl, $parameters);
} else {
foreach ($parameters as $paramKey => $paramValue) {
$delimiter = (strpos($finalUrl, "?") === false) ? "?" : "&";
$finalUrl .= $delimiter . $paramKey . "=" . $paramValue;
}
}
$url = $finalUrl;
}