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

NavigationItemForm: Don't pre-optimize urls with a port-macro 

fixes #2695
This commit is contained in:
Johannes Meyer 2017-01-23 14:56:27 +01:00
parent 1b4522606d
commit d246f76268
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/forms/Navigation/NavigationItemForm.php
View File

@ -97,7 +97,10 @@ class NavigationItemForm extends Form
public function getValues($suppressArrayNotation = false) public function getValues($suppressArrayNotation = false)
{ {
$values = parent::getValues($suppressArrayNotation); $values = parent::getValues($suppressArrayNotation);
if (isset($values['url']) && $values['url']) { // The regex here specifically matches the port-macro as it's the only one preventing Url::fromPath() from
// successfully parsing the given url. Any other macro such as for the scheme or host simply gets identified
// as path which is just fine in this case.
if (isset($values['url']) && $values['url'] && !preg_match('~://.+:(\$.+\$)~', $values['url'])) {
$url = Url::fromPath($values['url']); $url = Url::fromPath($values['url']);
if ($url->getBasePath() === $this->getRequest()->getBasePath()) { if ($url->getBasePath() === $this->getRequest()->getBasePath()) {
$values['url'] = $url->getRelativeUrl(); $values['url'] = $url->getRelativeUrl();