From 1837c57b2eaa59356a2568aed3711ad6077cde30 Mon Sep 17 00:00:00 2001 From: Beatrycze Volk Date: Fri, 31 May 2024 15:21:04 +0200 Subject: [PATCH] [BUGFIX] Fix configuration for `forceAbsoluteUrl` property (#1239) Co-authored-by: Sebastian Meyer --- Classes/Controller/AbstractController.php | 2 +- Classes/Controller/PageViewController.php | 2 +- .../Private/Language/locallang_labels.xlf | 309 +++++++++--------- 3 files changed, 158 insertions(+), 155 deletions(-) diff --git a/Classes/Controller/AbstractController.php b/Classes/Controller/AbstractController.php index f1a6b5615..3eebc8229 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->extConf['general']['forceAbsoluteUrl'])) ->setArguments( [ 'eID' => 'tx_dlf_pageview_proxy', diff --git a/Classes/Controller/PageViewController.php b/Classes/Controller/PageViewController.php index aba4ad07f..1af8443bc 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->extConf['general']['forceAbsoluteUrl']); $this->addViewerJS(); diff --git a/Resources/Private/Language/locallang_labels.xlf b/Resources/Private/Language/locallang_labels.xlf index e3ceeb7f6..1e47b816b 100644 --- a/Resources/Private/Language/locallang_labels.xlf +++ b/Resources/Private/Language/locallang_labels.xlf @@ -476,159 +476,162 @@ Default metadata namespaces - - Enable internal page view proxy?: (default is "FALSE") - - - DLF User-Agent: (default is "Kitodo.Presentation") - - - 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") - - - Use HTTPS for absolute links?: requires a valid Entry Point with "https://..." in Site Configuration (default is "FALSE") - - - Cache parsed METS files / IIIF manifests: Caching improves performance a little bit but can result in a very large "fe_session_data" table (default is "FALSE") - - - Publish new collections?: Should new collections automatically be published in the OAI-PMH interface? (default is "TRUE") - - - Unhide ided documents?: Should hidden documents be unhidden when re-iding them? (default is "FALSE") - - - Use external APIs for getting metadata?: (default is "FALSE") - - - Page fileGrps: comma-separated list of @USE attribute values ordered by increasing size (default is "DEFAULT,MAX") - - - Thumbnail fileGrp: comma-separated list of @USE attribute values ordered by decreasing priority (default is "THUMBS") - - - Download fileGrp: comma-separated list of @USE attribute values ordered by decreasing priority (default is "DOWNLOAD") - - - Fulltext fileGrp: comma-separated list of @USE attribute values ordered by decreasing priority (default is "FULLTEXT") - - - Audio fileGrp: comma-separated list of @USE attribute values ordered by decreasing priority (default is "AUDIO") - - - Handle IIIF annotations with motivation "painting" as fulltext?: Handling annotations as fulltexts means they are ided (default is "FALSE") - - - Maximum thumbnail width for IIIF images: Only for images without a thumbnail declaration (default is "150") - - - Maximum thumbnail height for IIIF images: Only for images without a thumbnail declaration (default is "150") - - - Solr Connection - - - Use HTTPS: (default is "FALSE") - - - Solr Server Host: (default is "localhost") - - - Solr Server Port: (default is "8983") - - - Solr Server Path: without API endpoint "/solr" (default is "/") - - - Solr Server User: (default is "") - - - Solr Server Password: (default is "") - - - Solr Server Timeout: (default is "10") - - - Allow Solr Core Deletion?: If a Solr Core is deleted in the TYPO3 Backend, should it be deleted in Apache Solr as well? (default is "FALSE") - - - Solr Schema Field "id" : Unique identifier for the document in the id (default is "id") - - - Solr Schema Field "uid" : Unique identifier for the document (or its top-level parent) in the TYPO3 database (default is "uid") - - - Solr Schema Field "pid" : PageID for the document (or its top-level parent) in the TYPO3 database (default is "pid") - - - Solr Schema Field "page" : Image number where this document starts (default is "page") - - - Solr Schema Field "partof" : Unique identifier for the parent document in the TYPO3 database. Only if this is a multi-volume work! (default is "partof") - - - Solr Schema Field "root" : Unique identifier for the root document in the TYPO3 database. Only if this is a multi-volume work! (default is "root") - - - Solr Schema Field "sid" : XML ID of this document in the METS file. This is only unique within the METS file! (default is "sid") - - - Solr Schema Field "toplevel" : Information if it is a top-level document (default is "toplevel") - - - Solr Schema Field "type" : Type of document (eg. monograph, chapter, etc.) (default is "type") - - - Solr Schema Field "title" : Title field is mandatory for identifying documents (default is "title") - - - Solr Schema Field "volume" : Volume field is mandatory for identifying documents (default is "volume") - - - Solr Schema Field "date" : The date a resource was issued or created. Used for datesearch (default is "date") - - - Solr Schema Field "thumbnail" : URL of thumbnail image for the document (default is "thumbnail") - - - Solr Schema Field default" : CatchAll field (default is "default") - - - Solr Schema Field "timestamp" : (default is "timestamp") - - - Solr Schema Field "autocomplete" : Autocomplete field for search form (default is "autocomplete") - - - Solr Schema Field "fulltext" : Fulltext field for OCR results (default is "fulltext") - - - Solr Schema Field "record_id" : Record ID of the document (required for OAI_DC output) (default is "record_id") - - - Solr Schema Field "purl" : Permanent URL of the document (required for EPICUR output) (default is "purl") - - - Solr Schema Field "urn" : URN of the Document (required for EPICUR output) (default is "urn") - - - Solr Schema Field "location" : Location of METS XML (required for METS output) (default is "location") - - - Solr Schema Field "collection" : Associated collection(s) of the document (default is "collection") - - - Solr Schema Field "license" : License (should be URI) (default is "license") - - - Solr Schema Field "terms" : Term of Use (should be URI) (default is "terms") - - - Solr Schema Field "restrictions" : Access Restrictions (should be URI) (default is "restrictions") - - - Solr Schema Field "geom" : GeoJSON geometry for spatial search (default is "geom") - + + Enable internal page view proxy?: (default is "FALSE") + + + 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") + + + DLF User-Agent: (default is "Kitodo.Presentation") + + + Use HTTPS for absolute links?: requires a valid Entry Point with "https://..." in Site Configuration (default is "FALSE") + + + Cache parsed METS files / IIIF manifests: Caching improves performance a little bit but can result in a very large "fe_session_data" table (default is "FALSE") + + + Publish new collections?: Should new collections automatically be published in the OAI-PMH interface? (default is "TRUE") + + + Unhide ided documents?: Should hidden documents be unhidden when re-iding them? (default is "FALSE") + + + Use external APIs for getting metadata?: (default is "FALSE") + + + Metadata fields required for indexing documents + + + Page fileGrps: comma-separated list of @USE attribute values ordered by increasing size (default is "DEFAULT,MAX") + + + Thumbnail fileGrp: comma-separated list of @USE attribute values ordered by decreasing priority (default is "THUMBS") + + + Download fileGrp: comma-separated list of @USE attribute values ordered by decreasing priority (default is "DOWNLOAD") + + + Fulltext fileGrp: comma-separated list of @USE attribute values ordered by decreasing priority (default is "FULLTEXT") + + + Audio fileGrp: comma-separated list of @USE attribute values ordered by decreasing priority (default is "AUDIO") + + + Handle IIIF annotations with motivation "painting" as fulltext?: Handling annotations as fulltexts means they are ided (default is "FALSE") + + + Maximum thumbnail width for IIIF images: Only for images without a thumbnail declaration (default is "150") + + + Maximum thumbnail height for IIIF images: Only for images without a thumbnail declaration (default is "150") + + + Solr Connection + + + Use HTTPS: (default is "FALSE") + + + Solr Server Host: (default is "localhost") + + + Solr Server Port: (default is "8983") + + + Solr Server Path: without API endpoint "/solr" (default is "/") + + + Solr Server User: (default is "") + + + Solr Server Password: (default is "") + + + Solr Server Timeout: (default is "10") + + + Allow Solr Core Deletion?: If a Solr Core is deleted in the TYPO3 Backend, should it be deleted in Apache Solr as well? (default is "FALSE") + + + Solr Schema Field "id" : Unique identifier for the document in the id (default is "id") + + + Solr Schema Field "uid" : Unique identifier for the document (or its top-level parent) in the TYPO3 database (default is "uid") + + + Solr Schema Field "pid" : PageID for the document (or its top-level parent) in the TYPO3 database (default is "pid") + + + Solr Schema Field "page" : Image number where this document starts (default is "page") + + + Solr Schema Field "partof" : Unique identifier for the parent document in the TYPO3 database. Only if this is a multi-volume work! (default is "partof") + + + Solr Schema Field "root" : Unique identifier for the root document in the TYPO3 database. Only if this is a multi-volume work! (default is "root") + + + Solr Schema Field "sid" : XML ID of this document in the METS file. This is only unique within the METS file! (default is "sid") + + + Solr Schema Field "toplevel" : Information if it is a top-level document (default is "toplevel") + + + Solr Schema Field "type" : Type of document (eg. monograph, chapter, etc.) (default is "type") + + + Solr Schema Field "title" : Title field is mandatory for identifying documents (default is "title") + + + Solr Schema Field "volume" : Volume field is mandatory for identifying documents (default is "volume") + + + Solr Schema Field "date" : The date a resource was issued or created. Used for datesearch (default is "date") + + + Solr Schema Field "thumbnail" : URL of thumbnail image for the document (default is "thumbnail") + + + Solr Schema Field default" : CatchAll field (default is "default") + + + Solr Schema Field "timestamp" : (default is "timestamp") + + + Solr Schema Field "autocomplete" : Autocomplete field for search form (default is "autocomplete") + + + Solr Schema Field "fulltext" : Fulltext field for OCR results (default is "fulltext") + + + Solr Schema Field "record_id" : Record ID of the document (required for OAI_DC output) (default is "record_id") + + + Solr Schema Field "purl" : Permanent URL of the document (required for EPICUR output) (default is "purl") + + + Solr Schema Field "urn" : URN of the Document (required for EPICUR output) (default is "urn") + + + Solr Schema Field "location" : Location of METS XML (required for METS output) (default is "location") + + + Solr Schema Field "collection" : Associated collection(s) of the document (default is "collection") + + + Solr Schema Field "license" : License (should be URI) (default is "license") + + + Solr Schema Field "terms" : Term of Use (should be URI) (default is "terms") + + + Solr Schema Field "restrictions" : Access Restrictions (should be URI) (default is "restrictions") + + + Solr Schema Field "geom" : GeoJSON geometry for spatial search (default is "geom") +