Skip to content
Snippets Groups Projects
Unverified Commit 422bbbc6 authored by Michael Große's avatar Michael Große
Browse files

refactor: rename dta and dtb parameters

They are now named min and max respectively, which is hopefully less
cryptic.
parent ec27794f
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -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']);
......
......@@ -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'];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment