Merge branch 'master' into fix-searchindocument

kitodo · Jun 4, 2024 · be97267 · be97267
2 parents 06eab68 + b95e9c7
commit be97267
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/Classes/Controller/ListViewController.php b/Classes/Controller/ListViewController.php
@@ -81,7 +81,7 @@ public function mainAction(): void
 
  // extract collection(s) from collection parameter
  $collections = [];
- if ($this->searchParams['collection']) {
+ if (array_key_exists('collection', $this->searchParams)) {
  foreach(explode(',', $this->searchParams['collection']) as $collectionEntry) {
  $collections[] = $this->collectionRepository->findByUid((int) $collectionEntry);
  }

diff --git a/Classes/Controller/SearchController.php b/Classes/Controller/SearchController.php
@@ -128,16 +128,20 @@ public function mainAction(): void
  }
 
  // sanitize date search input
- if (empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) {
- $this->searchParams['dateFrom'] = '*';
- }
- if (empty($this->searchParams['dateTo']) && !empty($this->searchParams['dateFrom'])) {
- $this->searchParams['dateTo'] = 'NOW';
- }
- if ($this->searchParams['dateFrom'] > $this->searchParams['dateTo']) {
- $tmpDate = $this->searchParams['dateFrom'];
- $this->searchParams['dateFrom'] = $this->searchParams['dateTo'];
- $this->searchParams['dateTo'] = $tmpDate;
+ if (!empty($this->searchParams['dateFrom']) || !empty($this->searchParams['dateTo'])) {
+ if (empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) {
+ $this->searchParams['dateFrom'] = '*';
+ }
+
+ if (empty($this->searchParams['dateTo']) && !empty($this->searchParams['dateFrom'])) {
+ $this->searchParams['dateTo'] = 'NOW';
+ }
+
+ if ($this->searchParams['dateFrom'] > $this->searchParams['dateTo']) {
+ $tmpDate = $this->searchParams['dateFrom'];
+ $this->searchParams['dateFrom'] = $this->searchParams['dateTo'];
+ $this->searchParams['dateTo'] = $tmpDate;
+ }
  }
 
  // Pagination of Results: Pass the currentPage to the fluid template to calculate current index of search result.
@@ -386,7 +390,7 @@ private function addCollectionsQuery(string $query): string
  // if collections are given, we prepare the collections query string
  // extract collections from collection parameter
  $collections = null;
- if ($this->searchParams['collection']) {
+ if (array_key_exists('collection', $this->searchParams)) {
  foreach (explode(',', $this->searchParams['collection']) as $collectionEntry) {
  $collections[] = $this->collectionRepository->findByUid((int) $collectionEntry);
  }

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -82,19 +82,17 @@
  $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Eid\PageViewProxy::class . '::main';
 }
 // Use Caching Framework for Solr queries
-if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr']) || !is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'])) {
- $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'] = [];
-}
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'] ??= [];
+
 if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr']['backend'])) {
  $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr']['backend'] = 'TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend';
 }
 if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr']['options']['defaultLifeTime'])) {
  $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr']['options']['defaultLifeTime'] = 86400; // 86400 seconds = 1 day
 }
 // Use Caching Framework for XML file caching
-if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_doc']) || !is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_doc'])) {
- $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_doc'] = [];
-}
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_doc'] ??= [];
+
 if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_doc']['backend'])) {
  $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_doc']['backend'] = 'TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend';
 }