tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Url error for emty baseUrl, less function calls

This commit is contained in:
Thomas Gelf 2014-04-29 12:27:19 +00:00
parent b7f4fa4a29
commit 270181885c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/Icinga/Web/Url.php
View File

@ -141,24 +141,24 @@ class Url
}
$urlObject = new Url();
$urlObject->setBaseUrl($request->getBaseUrl());
$baseUrl = $request->getBaseUrl();
$urlObject->setBaseUrl($baseUrl);
// Fetch fragment manually and remove it from the url, to 'help' the parse_url() function
// parsing the url properly. Otherwise calling the function with a fragment, but without a
// query will cause unpredictable behaviour.
$url = self::stripUrlFragment($url);
$urlParts = parse_url($url);
if (isset($urlParts["path"])) {
if (strpos($urlParts["path"], $request->getBaseUrl()) === 0) {
$urlObject->setPath(substr($urlParts["path"], strlen($request->getBaseUrl())));
if (isset($urlParts['path'])) {
if ($baseUrl !== '' && strpos($urlParts['path'], $baseUrl) === 0) {
$urlObject->setPath(substr($urlParts['path'], strlen($baseUrl)));
} else {
$urlObject->setPath($urlParts["path"]);
$urlObject->setPath($urlParts['path']);
}
}
if (isset($urlParts["query"])) {
if (isset($urlParts['query'])) {
$urlParams = array();
parse_str($urlParts["query"], $urlParams);
parse_str($urlParts['query'], $urlParams);
$params = array_merge($urlParams, $params);
}