diff --git a/module/CommonBundle/Component/Controller/ActionController/SiteController.php b/module/CommonBundle/Component/Controller/ActionController/SiteController.php index 157480f319..41514fc4bc 100644 --- a/module/CommonBundle/Component/Controller/ActionController/SiteController.php +++ b/module/CommonBundle/Component/Controller/ActionController/SiteController.php @@ -362,6 +362,10 @@ protected function getShibbolethUrl() $shibbolethUrl .= '%3Fsource=site'; + if ($this->getParam('redirect') !== null) { + $shibbolethUrl .= '%26redirect=' . urlencode($this->getParam('redirect')); + } + $server = $this->getRequest()->getServer(); if (isset($server['X-Forwarded-Host']) && isset($server['REQUEST_URI'])) { $shibbolethUrl .= '%26redirect=' . urlencode('https://' . $server['X-Forwarded-Host'] . $server['REQUEST_URI']); diff --git a/module/CommonBundle/Controller/Admin/AuthController.php b/module/CommonBundle/Controller/Admin/AuthController.php index 37f752e431..25fbcb8514 100644 --- a/module/CommonBundle/Controller/Admin/AuthController.php +++ b/module/CommonBundle/Controller/Admin/AuthController.php @@ -168,9 +168,6 @@ private function getShibbolethUrl() if ($this->getParam('redirect') !== null) { $shibbolethUrl .= '%26redirect=' . urlencode($this->getParam('redirect')); - $this->getSentryClient()->logMessage('shiburl: ' . $shibbolethUrl); - }else { - $this->getSentryClient()->logMessage("no redirect param"); } $server = $this->getRequest()->getServer(); diff --git a/module/CudiBundle/Component/Controller/ProfController.php b/module/CudiBundle/Component/Controller/ProfController.php index dfe5700090..460c1f6fab 100644 --- a/module/CudiBundle/Component/Controller/ProfController.php +++ b/module/CudiBundle/Component/Controller/ProfController.php @@ -85,6 +85,10 @@ private function getShibbolethUrl() $shibbolethUrl .= '?source=prof'; + if ($this->getParam('redirect') !== null) { + $shibbolethUrl .= '%26redirect=' . urlencode($this->getParam('redirect')); + } + $server = $this->getRequest()->getServer(); if (isset($server['X-Forwarded-Host']) && isset($server['REQUEST_URI'])) { $shibbolethUrl .= '%26redirect=' . urlencode('https://' . $server['X-Forwarded-Host'] . $server['REQUEST_URI']); diff --git a/module/FormBundle/Component/Controller/FormController.php b/module/FormBundle/Component/Controller/FormController.php index 27fcdf3096..8907edb874 100644 --- a/module/FormBundle/Component/Controller/FormController.php +++ b/module/FormBundle/Component/Controller/FormController.php @@ -89,6 +89,10 @@ private function getShibbolethUrl() $shibbolethUrl .= '?source=form'; + if ($this->getParam('redirect') !== null) { + $shibbolethUrl .= '%26redirect=' . urlencode($this->getParam('redirect')); + } + $server = $this->getRequest()->getServer(); if (isset($server['X-Forwarded-Host']) && isset($server['REQUEST_URI'])) { $shibbolethUrl .= '%26redirect=' . urlencode('https://' . $server['X-Forwarded-Host'] . $server['REQUEST_URI']); diff --git a/module/LogisticsBundle/Component/Controller/LogisticsController.php b/module/LogisticsBundle/Component/Controller/LogisticsController.php index ee01c8567d..4bdda192ff 100644 --- a/module/LogisticsBundle/Component/Controller/LogisticsController.php +++ b/module/LogisticsBundle/Component/Controller/LogisticsController.php @@ -68,6 +68,10 @@ private function getShibbolethUrl() $shibbolethUrl .= '?source=logistics'; + if ($this->getParam('redirect') !== null) { + $shibbolethUrl .= '%26redirect=' . urlencode($this->getParam('redirect')); + } + $server = $this->getRequest()->getServer(); if (isset($server['X-Forwarded-Host']) && isset($server['REQUEST_URI'])) { $shibbolethUrl .= '%26redirect=' . urlencode('https://' . $server['X-Forwarded-Host'] . $server['REQUEST_URI']);