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

Url: Build full urlString instead of path if username is set 

refs #12133
This commit is contained in:
Noah Hilverling 2016-10-18 16:19:24 +02:00
parent a952a400ca
commit 3b6b0b8d4b
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -586,28 +586,31 @@ class Url
} }
$basePath = $this->getBasePath(); $basePath = $this->getBasePath();
if (!$basePath) { if (! $basePath) {
$basePath = '/'; $basePath = '/';
} }
if (!$this->isExternal()) {
if ($this->getUsername() || $this->isExternal()) {
$urlString = '';
if ($this->getScheme()) {
$urlString .= $this->getScheme() . '://';
}
if ($this->getPassword()) {
$urlString .= $this->getUsername() . ':' . $this->getPassword() . '@';
} elseif ($this->getUsername()) {
$urlString .= $this->getUsername() . '@';
}
if ($this->getHost()) {
$urlString .= $this->getHost();
}
if ($this->getPort()) {
$urlString .= ':' . $this->getPort();
}
return $urlString . '/' . $path;
} else {
return $basePath . ($basePath !== '/' && $path ? '/' : '') . $path; return $basePath . ($basePath !== '/' && $path ? '/' : '') . $path;
} }
$urlString = '';
if ($this->getScheme()) {
$urlString = $urlString . $this->getScheme() . '://';
}
if ($this->getUsername() && $this->getPassword()) {
$urlString = $urlString . $this->getUsername() . ':' . $this->getPassword() . "@";
}
if ($this->getHost()) {
$urlString = $urlString . $this->getHost();
}
if ($this->getPort()) {
$urlString = $urlString . $this->getPort();
}
return $urlString . '/' . $path;
} }
/** /**