diff --git a/Blacklight/Releases.php b/Blacklight/Releases.php index 8a081f769..ba57f156d 100644 --- a/Blacklight/Releases.php +++ b/Blacklight/Releases.php @@ -539,11 +539,11 @@ class Releases extends Release * * * @param array $searchArr - * @param int|string $groupName - * @param int $sizeFrom - * @param int $sizeTo - * @param int $daysNew - * @param int $daysOld + * @param $groupName + * @param $sizeFrom + * @param $sizeTo + * @param $daysNew + * @param $daysOld * @param int $offset * @param int $limit * @param string|array $orderBy @@ -559,7 +559,7 @@ class Releases extends Release * @throws \Foolz\SphinxQL\Exception\DatabaseException * @throws \Foolz\SphinxQL\Exception\SphinxQLException */ - public function search($searchArr, $groupName = -1, $sizeFrom = -1, $sizeTo = -1, $daysNew = -1, $daysOld = -1, $offset = 0, $limit = 1000, $orderBy = '', $maxAge = -1, array $excludedCats = [], $type = 'basic', array $cat = [-1], $minSize = 0, array $tags = []) + public function search($searchArr, $groupName, $sizeFrom, $sizeTo, $daysNew, $daysOld, $offset = 0, $limit = 1000, $orderBy = '', $maxAge = -1, array $excludedCats = [], $type = 'basic', array $cat = [-1], $minSize = 0, array $tags = []) { $sizeRange = [ 1 => 1, diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 1938637a3..2395188e3 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -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()); diff --git a/resources/views/themes/Gentele/viewnzb.tpl b/resources/views/themes/Gentele/viewnzb.tpl index fd4b11a60..92f8e7406 100755 --- a/resources/views/themes/Gentele/viewnzb.tpl +++ b/resources/views/themes/Gentele/viewnzb.tpl @@ -566,7 +566,7 @@ Poster {$release.fromname|escape:"htmlall"} + href="{{url("/search?searchadvr=&searchadvsubject=&searchadvposter={$release.fromname|escape:"htmlall"}&searchadvfilename=&searchadvdaysnew=&searchadvdaysold=&searchadvgroups=-1&searchadvcat=-1&searchadvsizefrom=-1&searchadvsizeto=-1&searchadvhasnfo=0&searchadvhascomments=0&search_type=adv")}}">{$release.fromname|escape:"htmlall"} diff --git a/resources/views/themes/admin/predb.tpl b/resources/views/themes/admin/predb.tpl index f4eb6256c..1c00b9872 100755 --- a/resources/views/themes/admin/predb.tpl +++ b/resources/views/themes/admin/predb.tpl @@ -46,7 +46,9 @@ {$result.requestid}