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

Url: Set basePath correctly in methods fromRequest and fromPath 

refs #12133
This commit is contained in:
Noah Hilverling 2016-10-18 12:25:11 +02:00
parent 7df6e6cb63
commit f6f90822d6
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,7 @@ class Url
$urlParams->set($k, $v);
}
$url->setParams($urlParams);
$url->setBaseUrl($request->getBaseUrl());
$url->setBasePath($request->getBaseUrl());
return $url;
}
@ -191,17 +191,27 @@ class Url
|| (isset($urlParts['port']) && $urlParts['port'] != $request->getServer('SERVER_PORT')))
) {
$urlObject->setIsExternal();
} else {
$urlObject->setBasePath($request->getBaseUrl());
}
if (isset($urlParts['path'])) {
$urlPath = $urlParts['path'];
if ($urlPath && $urlPath[0] === '/') {
$urlPath = substr($urlPath, 1);
if ($urlObject->isExternal()) {
$urlPath = substr($urlPath, 1);
} else {
$requestBaseUrl = $request->getBaseUrl();
if ($requestBaseUrl && $requestBaseUrl !== '/' && strpos($urlPath, $requestBaseUrl) === 0) {
$urlPath = substr($urlPath, strlen($requestBaseUrl) + 1);
$urlObject->setBasePath($requestBaseUrl);
}
}
} elseif (!$urlObject->isExternal()) {
$urlObject->setBasePath($request->getBaseUrl());
}
$urlObject->setPath($urlPath);
} elseif (!$urlObject->isExternal()) {
$urlObject->setBasePath($request->getBaseUrl());
}
// TODO: This has been used by former filter implementation, remove it: