[BUGFIX] Make any date manipulation only if at least one date paramet…

…er exists (#1245)
kitodo · Jun 4, 2024 · f7a63eb · f7a63eb
1 parent bff4419
commit f7a63eb
Showing 1 changed file with 14 additions and 10 deletions.
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.