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

refactor(search): shorten get parameters

parent 340f849a
No related branches found
No related tags found
No related merge requests found
......@@ -65,7 +65,7 @@ class Search extends AbstractAction {
{
global $INPUT, $QUERY;
$this->pageLookupResults = ft_pageLookup($QUERY, true, useHeading('navigation'));
$this->fullTextResults = ft_pageSearch($QUERY, $highlight, $INPUT->str('sort'));
$this->fullTextResults = ft_pageSearch($QUERY, $highlight, $INPUT->str('srt'));
$this->highlight = $highlight;
}
......@@ -78,7 +78,7 @@ class Search extends AbstractAction {
{
global $conf, $INPUT, $QUERY, $ID;
if ($INPUT->bool('searchPageForm')) {
if ($INPUT->bool('sf')) {
return;
}
......
......@@ -68,15 +68,15 @@ class Search extends Ui
$searchForm = (new Form())->attrs(['method' => 'get'])->addClass('search-results-form');
$searchForm->setHiddenField('do', 'search');
$searchForm->setHiddenField('id', $ID);
$searchForm->setHiddenField('searchPageForm', '1');
if ($INPUT->has('after')) {
$searchForm->setHiddenField('after', $INPUT->str('after'));
$searchForm->setHiddenField('sf', '1');
if ($INPUT->has('dta')) {
$searchForm->setHiddenField('dta', $INPUT->str('dta'));
}
if ($INPUT->has('before')) {
$searchForm->setHiddenField('before', $INPUT->str('before'));
if ($INPUT->has('dtb')) {
$searchForm->setHiddenField('dtb', $INPUT->str('dtb'));
}
if ($INPUT->has('sort')) {
$searchForm->setHiddenField('sort', $INPUT->str('sort'));
if ($INPUT->has('srt')) {
$searchForm->setHiddenField('srt', $INPUT->str('srt'));
}
$searchForm->addFieldsetOpen()->addClass('search-results-form__fieldset');
$searchForm->addTextInput('q')->val($query)->useInput(false);
......@@ -107,7 +107,7 @@ class Search extends Ui
];
$activeOption = 'hits';
if ($INPUT->str('sort') === 'mtime') {
if ($INPUT->str('srt') === 'mtime') {
$activeOption = 'mtime';
}
......@@ -410,7 +410,7 @@ class Search extends Ui
];
$activeOption = 'any';
foreach ($options as $key => $option) {
if ($INPUT->str('after') === $option['after']) {
if ($INPUT->str('dta') === $option['after']) {
$activeOption = $key;
break;
}
......@@ -419,7 +419,7 @@ class Search extends Ui
$searchForm->addTagOpen('div')->addClass('search-tool js-search-tool');
// render current
$currentWrapper = $searchForm->addTagOpen('div')->addClass('search-tool__current js-current');
if ($INPUT->has('before') || $INPUT->has('after')) {
if ($INPUT->has('dtb') || $INPUT->has('dta')) {
$currentWrapper->addClass('search-tool__current--changed');
}
$searchForm->addHTML($options[$activeOption]['label']);
......
......@@ -16,9 +16,9 @@ class SearchState
global $INPUT;
$this->parsedQuery = $parsedQuery;
$this->parsedQuery['after'] = $INPUT->str('after');
$this->parsedQuery['before'] = $INPUT->str('before');
$this->parsedQuery['sort'] = $INPUT->str('sort');
$this->parsedQuery['after'] = $INPUT->str('dta');
$this->parsedQuery['before'] = $INPUT->str('dtb');
$this->parsedQuery['sort'] = $INPUT->str('srt');
}
/**
......@@ -98,15 +98,15 @@ class SearchState
$parsedQuery['ns'],
$parsedQuery['notns']
);
$hrefAttributes = ['do' => 'search', 'searchPageForm' => '1', 'q' => $newQuery];
$hrefAttributes = ['do' => 'search', 'sf' => '1', 'q' => $newQuery];
if ($parsedQuery['after']) {
$hrefAttributes['after'] = $parsedQuery['after'];
$hrefAttributes['dta'] = $parsedQuery['after'];
}
if ($parsedQuery['before']) {
$hrefAttributes['before'] = $parsedQuery['before'];
$hrefAttributes['dtb'] = $parsedQuery['before'];
}
if ($parsedQuery['sort']) {
$hrefAttributes['sort'] = $parsedQuery['sort'];
$hrefAttributes['srt'] = $parsedQuery['sort'];
}
$searchForm->addTagOpen('a')
->attrs([
......
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