starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert most of the advanced search changes

Browse Source
This commit is contained in:
DariusIII
2020-07-26 22:07:50 +02:00
parent 1211230173
commit ea668d1dce
4 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/SearchController.php
+9 -13
View File
@@ -113,9 +113,7 @@ class SearchController extends BasePageController
];
foreach ($searchVars as $searchVarKey => $searchVar) {
if ($request->filled($searchVarKey)) {
$searchVars[$searchVarKey] = (string) $request->input($searchVarKey);
}
$searchVars[$searchVarKey] = ($request->has($searchVarKey) ? (string) $request->input($searchVarKey) : '');
}
$searchVars['selectedgroup'] = $searchVars['searchadvgroups'];
@@ -129,9 +127,7 @@ class SearchController extends BasePageController
if ($searchType !== 'basic' && $request->missing('id') && $request->missing('subject') && $request->anyFilled(['searchadvr', 'searchadvsubject', 'searchadvfilename', 'searchadvposter'])) {
$orderByString = '';
foreach ($searchVars as $searchVarKey => $searchVar) {
if ($request->filled($searchVarKey)) {
$orderByString .= "&$searchVarKey=".htmlentities($searchVar, ENT_QUOTES | ENT_HTML5);
}
$orderByString .= "&$searchVarKey=".htmlentities($searchVar, ENT_QUOTES | ENT_HTML5);
}
$orderByString = ltrim($orderByString, '&');
@@ -143,10 +139,10 @@ class SearchController extends BasePageController
}
$searchArr = [
'searchname' => $searchVars['searchadvr'],
'name' => $searchVars['searchadvsubject'],
'fromname' => $searchVars['searchadvposter'],
'filename' => $searchVars['searchadvfilename'],
'searchname' => $searchVars['searchadvr'] === '' ? -1 : $searchVars['searchadvr'],
'name' => $searchVars['searchadvsubject'] === '' ? -1 : $searchVars['searchadvsubject'],
'fromname' => $searchVars['searchadvposter'] === '' ? -1 : $searchVars['searchadvposter'],
'filename' => $searchVars['searchadvfilename'] === '' ? -1 : $searchVars['searchadvfilename'],
];
$rslt = $releases->search(
@@ -154,15 +150,15 @@ class SearchController extends BasePageController
$searchVars['searchadvgroups'],
$searchVars['searchadvsizefrom'],
$searchVars['searchadvsizeto'],
$searchVars['searchadvdaysnew'],
$searchVars['searchadvdaysold'],
($searchVars['searchadvdaysnew'] === '' ? -1 : $searchVars['searchadvdaysnew']),
($searchVars['searchadvdaysold'] === '' ? -1 : $searchVars['searchadvdaysold']),
$offset,
config('nntmux.items_per_page'),
$orderBy,
-1,
$this->userdata->categoryexclusions ?? [],
'advanced',
[$searchVars['searchadvcat']]
[$searchVars['searchadvcat'] === '' ? -1 : $searchVars['searchadvcat']]
);
$results = $this->paginate($rslt ?? [], $rslt[0]->_totalrows ?? 0, config('nntmux.items_per_page'), $page, request()->url(), request()->query());