NavigationItemRenderer: Pass external urls through the iframe module

refs #5600
This commit is contained in:
Johannes Meyer 2015-09-21 14:13:10 +02:00
parent 7e460e7c03
commit 3c7155f246
1 changed files with 18 additions and 2 deletions

View File

@ -7,6 +7,7 @@ use Icinga\Application\Icinga;
use Icinga\Exception\ProgrammingError;
use Icinga\Util\String;
use Icinga\Web\Navigation\NavigationItem;
use Icinga\Web\Url;
use Icinga\Web\View;
/**
@ -28,6 +29,13 @@ class NavigationItemRenderer
*/
protected $item;
/**
* Internal link targets provided by Icinga Web 2
*
* @var array
*/
protected $internalLinkTargets;
/**
* Create a new NavigationItemRenderer
*
@ -39,6 +47,7 @@ class NavigationItemRenderer
$this->setOptions($options);
}
$this->internalLinkTargets = array('_main', '_self', '_next');
$this->init();
}
@ -141,10 +150,17 @@ class NavigationItemRenderer
}
if (($url = $item->getUrl()) !== null) {
$url->overwriteParams($item->getUrlParameters());
$target = $item->getTarget();
if ($url->isExternal() && (!$target || in_array($target, $this->internalLinkTargets, true))) {
$url = Url::fromPath('iframe', array('url' => $url));
}
$content = sprintf(
'<a%s href="%s"%s>%s</a>',
$this->view()->propertiesToString($item->getAttributes()),
$this->view()->url($url, $item->getUrlParameters()),
$url,
$this->renderTargetAttribute(),
$label
);
@ -172,7 +188,7 @@ class NavigationItemRenderer
return '';
}
if (! in_array($target, array('_main', '_self', '_next'))) {
if (! in_array($target, $this->internalLinkTargets, true)) {
return ' target="' . $this->view()->escape($target) . '"';
}