diff --git a/inc/Action/Search.php b/inc/Action/Search.php index 42a5945bf68fb5d68a5e7f944df27f1e27fbf2da..c182ca3e9412cae776e9bfe97fcb04bd38d6f179 100644 --- a/inc/Action/Search.php +++ b/inc/Action/Search.php @@ -64,8 +64,8 @@ class Search extends AbstractAction { protected function execute() { global $INPUT, $QUERY; - $after = $INPUT->str('dta'); - $before = $INPUT->str('dtb'); + $after = $INPUT->str('min'); + $before = $INPUT->str('max'); $this->pageLookupResults = ft_pageLookup($QUERY, true, useHeading('navigation'), $after, $before); $this->fullTextResults = ft_pageSearch($QUERY, $highlight, $INPUT->str('srt'), $after, $before); $this->highlight = $highlight; diff --git a/inc/Ui/Search.php b/inc/Ui/Search.php index 47da906559527bfbf47ea8672e306bd0d6b7411e..c27cd77642d56dd9d99648024d22b4ec836b0a49 100644 --- a/inc/Ui/Search.php +++ b/inc/Ui/Search.php @@ -69,11 +69,11 @@ class Search extends Ui $searchForm->setHiddenField('do', 'search'); $searchForm->setHiddenField('id', $ID); $searchForm->setHiddenField('sf', '1'); - if ($INPUT->has('dta')) { - $searchForm->setHiddenField('dta', $INPUT->str('dta')); + if ($INPUT->has('min')) { + $searchForm->setHiddenField('min', $INPUT->str('min')); } - if ($INPUT->has('dtb')) { - $searchForm->setHiddenField('dtb', $INPUT->str('dtb')); + if ($INPUT->has('max')) { + $searchForm->setHiddenField('max', $INPUT->str('max')); } if ($INPUT->has('srt')) { $searchForm->setHiddenField('srt', $INPUT->str('srt')); @@ -421,7 +421,7 @@ class Search extends Ui ]; $activeOption = 'any'; foreach ($options as $key => $option) { - if ($INPUT->str('dta') === $option['after']) { + if ($INPUT->str('min') === $option['after']) { $activeOption = $key; break; } @@ -430,7 +430,7 @@ class Search extends Ui $searchForm->addTagOpen('div')->addClass('toggle')->attr('aria-haspopup', 'true'); // render current $currentWrapper = $searchForm->addTagOpen('div')->addClass('current'); - if ($INPUT->has('dtb') || $INPUT->has('dta')) { + if ($INPUT->has('max') || $INPUT->has('min')) { $currentWrapper->addClass('changed'); } $searchForm->addHTML($options[$activeOption]['label']); diff --git a/inc/Ui/SearchState.php b/inc/Ui/SearchState.php index beaac4e1c374f1ff0a377109ad6c406e5102889b..f45156d282e18594d9be8fdc4aa8ec801c1b389f 100644 --- a/inc/Ui/SearchState.php +++ b/inc/Ui/SearchState.php @@ -20,10 +20,10 @@ class SearchState $this->parsedQuery = $parsedQuery; if (!isset($parsedQuery['after'])) { - $this->parsedQuery['after'] = $INPUT->str('dta'); + $this->parsedQuery['after'] = $INPUT->str('min'); } if (!isset($parsedQuery['before'])) { - $this->parsedQuery['before'] = $INPUT->str('dtb'); + $this->parsedQuery['before'] = $INPUT->str('max'); } if (!isset($parsedQuery['sort'])) { $this->parsedQuery['sort'] = $INPUT->str('srt'); @@ -126,10 +126,10 @@ class SearchState ); $hrefAttributes = ['do' => 'search', 'sf' => '1', 'q' => $newQuery]; if ($parsedQuery['after']) { - $hrefAttributes['dta'] = $parsedQuery['after']; + $hrefAttributes['min'] = $parsedQuery['after']; } if ($parsedQuery['before']) { - $hrefAttributes['dtb'] = $parsedQuery['before']; + $hrefAttributes['max'] = $parsedQuery['before']; } if ($parsedQuery['sort']) { $hrefAttributes['srt'] = $parsedQuery['sort'];