From 385e46d5f5eb003988bb1db942abbdb0b0b662f0 Mon Sep 17 00:00:00 2001
From: Beatrycze Volk <beatrycze.volk@slub-dresden.de>
Date: Fri, 31 May 2024 11:05:52 +0200
Subject: [PATCH] Fix configuration for `forceAbsoluteUrl` property

---
 Classes/Controller/AbstractController.php          |  2 +-
 Classes/Controller/PageViewController.php          |  2 +-
 Configuration/FlexForms/PageView.xml               | 10 ++++++++++
 Resources/Private/Language/de.locallang_be.xlf     |  4 ++++
 Resources/Private/Language/de.locallang_labels.xlf |  4 ----
 Resources/Private/Language/locallang_be.xlf        |  3 +++
 Resources/Private/Language/locallang_labels.xlf    |  3 ---
 ext_conf_template.txt                              |  2 --
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Classes/Controller/AbstractController.php b/Classes/Controller/AbstractController.php
index f1a6b5615..f2704a5bb 100644
--- a/Classes/Controller/AbstractController.php
+++ b/Classes/Controller/AbstractController.php
@@ -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->settings['forceAbsoluteUrl']))
             ->setArguments(
                 [
                     'eID' => 'tx_dlf_pageview_proxy',
diff --git a/Classes/Controller/PageViewController.php b/Classes/Controller/PageViewController.php
index 5cb106079..7f49fb4b8 100644
--- a/Classes/Controller/PageViewController.php
+++ b/Classes/Controller/PageViewController.php
@@ -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->settings['forceAbsoluteUrl']);
 
         $this->addViewerJS();
 
diff --git a/Configuration/FlexForms/PageView.xml b/Configuration/FlexForms/PageView.xml
index 69dc843d0..3296c68d6 100644
--- a/Configuration/FlexForms/PageView.xml
+++ b/Configuration/FlexForms/PageView.xml
@@ -76,6 +76,16 @@
                             </config>
                         </TCEforms>
                     </settings.progressElementId>
+                    <settings.forceAbsoluteUrl>
+                        <TCEforms>
+                            <exclude>1</exclude>
+                            <label>LLL:EXT:dlf/Resources/Private/Language/locallang_be.xlf:plugins.pageview.flexform.forceAbsoluteUrl</label>
+                            <config>
+                                <type>check</type>
+                                <default>0</default>
+                            </config>
+                        </TCEforms>
+                    </settings.forceAbsoluteUrl>
                     <settings.useInternalProxy>
                         <TCEforms>
                             <exclude>1</exclude>
diff --git a/Resources/Private/Language/de.locallang_be.xlf b/Resources/Private/Language/de.locallang_be.xlf
index d5352a1be..913a8d74b 100644
--- a/Resources/Private/Language/de.locallang_be.xlf
+++ b/Resources/Private/Language/de.locallang_be.xlf
@@ -373,6 +373,10 @@
 				<source><![CDATA[Zoom Panel]]></source>
 				<target><![CDATA[Zoom-Knöpfe]]></target>
 			</trans-unit>
+            <trans-unit id="plugins.pageview.flexform.forceAbsoluteUrl" approved="yes">
+                <target><![CDATA[Verwende nur absolute Links für Seiten und Ressourcen?: Wird nur in speziellen Multi-Domain-Umgebungen benötigt; erfordert einen voll qualifizierten Einstiegspunkt in der Seitenkonfiguration (Standard ist "FALSE")]]></target>
+                <source><![CDATA[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="plugins.pageview.flexform.magnifier" approved="yes">
 				<source><![CDATA[Activate magnifier]]></source>
 				<target><![CDATA[Lupenfunktion aktivieren]]></target>
diff --git a/Resources/Private/Language/de.locallang_labels.xlf b/Resources/Private/Language/de.locallang_labels.xlf
index 597c15ac3..22f32ded3 100644
--- a/Resources/Private/Language/de.locallang_labels.xlf
+++ b/Resources/Private/Language/de.locallang_labels.xlf
@@ -641,10 +641,6 @@
 				<target>DLF User-Agent: (Standard ist "Kitodo.Presentation")</target>
 				<source>DLF User-Agent: (default is "Kitodo.Presentation")</source>
 			</trans-unit>
-			<trans-unit id="config.general.forceAbsoluteUrl">
-				<target>Verwende nur absolute Links für Seiten und Ressourcen?: Wird nur in speziellen Multi-Domain-Umgebungen benötigt; erfordert einen voll qualifizierten Einstiegspunkt in der Seitenkonfiguration (Standard ist "FALSE")</target>
-				<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.forceAbsoluteUrlHttps">
 				<target>Verwende HTTPS for absolute Links?: erfordert einen Einstiegspunkt mit "https://..." in der Seitenkonfiguration (Standard ist "FALSE")</target>
 				<source>Use HTTPS for absolute links?: requires a valid Entry Point with "https://..." in Site Configuration (default is "FALSE")</source>
diff --git a/Resources/Private/Language/locallang_be.xlf b/Resources/Private/Language/locallang_be.xlf
index 590249990..c3df41639 100644
--- a/Resources/Private/Language/locallang_be.xlf
+++ b/Resources/Private/Language/locallang_be.xlf
@@ -239,6 +239,9 @@
 			<trans-unit id="plugins.pageview.flexform.features.zoompanel">
 				<source><![CDATA[Zoom Panel]]></source>
 			</trans-unit>
+            <trans-unit id="plugins.pageview.flexform.forceAbsoluteUrl">
+                <source><![CDATA[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="plugins.pageview.flexform.magnifier">
 				<source><![CDATA[Activate magnifier]]></source>
 			</trans-unit>
diff --git a/Resources/Private/Language/locallang_labels.xlf b/Resources/Private/Language/locallang_labels.xlf
index abacff0e9..2dad8187e 100644
--- a/Resources/Private/Language/locallang_labels.xlf
+++ b/Resources/Private/Language/locallang_labels.xlf
@@ -482,9 +482,6 @@
 			<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.forceAbsoluteUrlHttps">
 				<source>Use HTTPS for absolute links?: requires a valid Entry Point with "https://..." in Site Configuration (default is "FALSE")</source>
 			</trans-unit>
diff --git a/ext_conf_template.txt b/ext_conf_template.txt
index 484353b12..35b052152 100644
--- a/ext_conf_template.txt
+++ b/ext_conf_template.txt
@@ -2,8 +2,6 @@
 general.enableInternalProxy = 0
 # cat=General; type=string; label=LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:config.general.userAgent
 general.userAgent = Kitodo.Presentation
-# cat=General; type=boolean; label=LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:config.general.forceAbsoluteUrl
-general.forceAbsoluteUrl = 0
 # cat=General; type=boolean; label=LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:config.general.forceAbsoluteUrlHttps
 general.forceAbsoluteUrlHttps = 0
 # cat=General; type=boolean; label=LLL:EXT:dlf/Resources/Private/Language/locallang_labels.xlf:config.general.caching