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

Update advanced search

Browse Source
This commit is contained in:
DariusIII
2026-05-15 16:08:49 +02:00
parent b33bfd2bd8
commit 828b2cab38
3 changed files with 67 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/SearchController.php
+21 -10
View File
@@ -54,7 +54,7 @@ class SearchController extends BasePageController
$category = [0];
$lastvisit = $this->userdata->lastlogin;
if ($searchType === 'basic' && $request->missing('searchadvr') && ($request->has('id') || $request->has('subject') || $request->has('search'))) {
if ($searchType === 'basic' && ($request->filled('id') || $request->filled('subject') || $request->filled('search'))) {
$searchString = [];
switch (true) {
case $request->filled('subject'):
@@ -73,13 +73,7 @@ class SearchController extends BasePageController
$searchString['searchname'] = '';
}
$categoryID = [-1];
if ($request->has('t')) {
$t = $request->input('t');
if ($t !== null && $t !== '') {
$categoryID = array_map('intval', explode(',', (string) $t));
}
}
$categoryID = $this->resolveCategoryIdsFromRequest($request);
$orderByUrls = [];
foreach ($this->releaseBrowseService->getBrowseOrdering() as $orderType) {
@@ -172,12 +166,15 @@ class SearchController extends BasePageController
}
}
if ($searchType !== 'basic' && $request->missing('id') && $request->missing('subject') && $request->anyFilled(['searchadvr', 'searchadvsubject', 'searchadvfilename', 'searchadvposter', 'minage', 'maxage', 'group', 'minsize', 'maxsize', 'search'])) {
if ($searchType !== 'basic' && $request->missing('id') && $request->missing('subject') && $request->anyFilled(['searchadvr', 'searchadvsubject', 'searchadvfilename', 'searchadvposter', 'search'])) {
$orderByString = '';
foreach ($searchVars as $searchVarKey => $searchVar) {
$orderByString .= "&$searchVarKey=".htmlentities($searchVar, ENT_QUOTES | ENT_HTML5);
}
$orderByString = ltrim($orderByString, '&');
if ($request->filled('t')) {
$orderByString .= '&t='.urlencode((string) $request->input('t'));
}
$orderByUrls = [];
foreach ($ordering as $orderType) {
@@ -204,7 +201,7 @@ class SearchController extends BasePageController
-1,
$this->userdata->categoryexclusions ?? [],
'advanced',
[$searchVars['searchadvcat'] === '' ? -1 : $searchVars['searchadvcat']]
$this->resolveCategoryIdsFromRequest($request)
);
$results = $this->paginate($rslt ?? [], $rslt[0]->_totalrows ?? 0, config('nntmux.items_per_page'), $page, $request->url(), $request->query());
@@ -236,4 +233,18 @@ class SearchController extends BasePageController
return view('search.index', $this->viewData);
}
/**
* @return array<int>
*/
private function resolveCategoryIdsFromRequest(Request $request): array
{
$raw = $request->input('t', $request->input('searchadvcat', ''));
if ($raw === null || $raw === '' || $raw === '-1') {
return [-1];
}
return array_map('intval', explode(',', (string) $raw));
}
}