diff --git a/module/fid/src/Controller/UserController.php b/module/fid/src/Controller/UserController.php index 984a8db0c99454643028a41f8f6a6b5adcbabbe4..dff182627d652cc0a5c0216c610b06f19779aedf 100644 --- a/module/fid/src/Controller/UserController.php +++ b/module/fid/src/Controller/UserController.php @@ -218,6 +218,10 @@ class UserController extends AbstractBase $viewModel = $this->createViewModel(); $viewModel->setTemplate('fid/user/policy'); + if (isset($_REQUEST['lbreferer'])) { + $viewModel->setVariable('backUrl', $_REQUEST['lbreferer']); + } + return $viewModel; } @@ -226,6 +230,10 @@ class UserController extends AbstractBase $viewModel = $this->createViewModel(); $viewModel->setTemplate('fid/user/terms'); + if (isset($_REQUEST['lbreferer'])) { + $viewModel->setVariable('backUrl', $_REQUEST['lbreferer']); + } + return $viewModel; } diff --git a/themes/fid/templates/fid/user/policy.phtml b/themes/fid/templates/fid/user/policy.phtml index bb3e1fb5ed4bb095daa2c8afe6a1cc72e21f27fe..f7e025df366ddd961f7674ee8c3c543c4d2e377f 100644 --- a/themes/fid/templates/fid/user/policy.phtml +++ b/themes/fid/templates/fid/user/policy.phtml @@ -1,8 +1,8 @@ <!-- fid - policy begin --> <? $lang = $this->layout()->userLang; ?> -<?php if ($this->layout()->getTemplate() == 'layout/lightbox'): ?> +<?php if (isset($backUrl) && $this->layout()->getTemplate() == 'layout/lightbox'): ?> <div class="form-group"> - <a class="back-to-login btn btn-link" href="<?=$this->url('myresearch-account') ?>"> + <a class="back-to-login btn btn-link" href="<?= $backUrl?>"> <i class="fa fa-chevron-left" aria-hidden="true"></i> <?=$this->transEsc('Back')?> </a> diff --git a/themes/fid/templates/fid/user/terms.phtml b/themes/fid/templates/fid/user/terms.phtml index 25489e365284633040351d5af5d91618a6b74308..e31fdb1568c231ecbdea12514620fefbc0485cd5 100644 --- a/themes/fid/templates/fid/user/terms.phtml +++ b/themes/fid/templates/fid/user/terms.phtml @@ -1,9 +1,9 @@ <!-- fid - terms begin --> <? $lang = $this->layout()->userLang; ?> <? $fileExists = file_exists(dirname(__FILE__) . '/terms-'.$lang.'.phtml'); ?> -<?php if ($this->layout()->getTemplate() == 'layout/lightbox'): ?> +<?php if (isset($backUrl) && $this->layout()->getTemplate() == 'layout/lightbox'): ?> <div class="form-group"> - <a class="back-to-login btn btn-link" href="<?=$this->url('myresearch-account') ?>"> + <a class="back-to-login btn btn-link" href="<?= $backUrl?>"> <i class="fa fa-chevron-left" aria-hidden="true"></i> <?=$this->transEsc('Back')?> </a>