Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BUGFIX] Fix configuration for forceAbsoluteUrl property #1239

Merged
merged 4 commits into from
May 31, 2024
Merged

[BUGFIX] Fix configuration for forceAbsoluteUrl property #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
385e46d
Fix configuration for `forceAbsoluteUrl` property
beatrycze-volk May 31, 2024
47e585c
Merge branch 'master' into fix-settings
sebastian-meyer May 31, 2024
9e9df97
Use `forceAbsoluteUrl` as general configuration
beatrycze-volk May 31, 2024
40878a0
Merge branch 'master' into fix-settings
sebastian-meyer May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/Controller/AbstractController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ protected function configureProxyUrl(string &$url): void
{
$this->uriBuilder->reset()
->setTargetPageUid($this->pageUid)
->setCreateAbsoluteUri(!empty($this->settings['general']['forceAbsoluteUrl']))
->setCreateAbsoluteUri(!empty($this->extConf['general']['forceAbsoluteUrl']))
->setArguments(
[
'eID' => 'tx_dlf_pageview_proxy',
Expand Down
2 changes: 1 addition & 1 deletion Classes/Controller/PageViewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function mainAction(): void
// Get the controls for the map.
$this->controls = explode(',', $this->settings['features']);

$this->view->assign('forceAbsoluteUrl', $this->settings['general']['forceAbsoluteUrl']);
$this->view->assign('forceAbsoluteUrl', $this->extConf['general']['forceAbsoluteUrl']);

$this->addViewerJS();

Expand Down
6 changes: 3 additions & 3 deletions Resources/Private/Language/locallang_labels.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,12 +479,12 @@
<trans-unit id="config.general.enableInternalProxy">
<source>Enable internal page view proxy?: (default is "FALSE")</source>
</trans-unit>
<trans-unit id="config.general.userAgent">
<source>DLF User-Agent: (default is "Kitodo.Presentation")</source>
</trans-unit>
<trans-unit id="config.general.forceAbsoluteUrl">
<source>Force all links to pages and resources to be absolute?: Only needed for some multi-domain environments; requires a fully qualified Entry Point in Site Configuration (default is "FALSE")</source>
</trans-unit>
<trans-unit id="config.general.userAgent">
<source>DLF User-Agent: (default is "Kitodo.Presentation")</source>
</trans-unit>
<trans-unit id="config.general.forceAbsoluteUrlHttps">
<source>Use HTTPS for absolute links?: requires a valid Entry Point with "https://..." in Site Configuration (default is "FALSE")</source>
</trans-unit>
Expand Down