diff --git a/app/Http/Controllers/AdultController.php b/app/Http/Controllers/AdultController.php index cd5f51ce1..45a6c16bf 100644 --- a/app/Http/Controllers/AdultController.php +++ b/app/Http/Controllers/AdultController.php @@ -39,18 +39,10 @@ class AdultController extends BasePageController $ordering = $adult->getXXXOrdering(); $orderby = $request->has('ob') && \in_array($request->input('ob'), $ordering, false) ? $request->input('ob') : ''; - $movies = []; $page = $request->has('page') && is_numeric($request->input('page')) ? $request->input('page') : 1; - $offset = ($page - 1) * config('nntmux.items_per_cover_page'); - $rslt = $adult->getXXXRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, -1, $this->userdata['categoryexclusions']); - $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_cover_page'), $page, $request->url(), $request->query()); - foreach ($results as $result) { - $result->genre = makeFieldLinks((array) $result, 'genre', 'xxx'); - $result->actors = makeFieldLinks((array) $result, 'actors', 'xxx'); - $result->director = makeFieldLinks((array) $result, 'director', 'xxx'); - - $movies[] = $result; - } + $offset = ($page - 1) * config('nntmux.items_per_page'); + $rslt = $adult->getXXXRange($page, $catarray, $offset, config('nntmux.items_per_page'), $orderby, -1, $this->userdata['categoryexclusions']); + $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_page'), $page, $request->url(), $request->query()); $title = ($request->has('title') && ! empty($request->input('title'))) ? stripslashes($request->input('title')) : ''; @@ -90,9 +82,8 @@ class AdultController extends BasePageController 'director' => $director, 'genres' => $genres, 'genre' => $genre, - 'resultsadd' => $movies, 'results' => $results, - 'covgroup' => 'xxx', + 'lastvisit' => $this->userdata['lastlogin'] ?? null, 'meta_title' => 'Browse XXX', 'meta_keywords' => 'browse,xxx,nzb,description,details', 'meta_description' => 'Browse for XXX Movies', diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index a6772d9f9..3bc9320e2 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -85,8 +85,6 @@ class BrowseController extends BasePageController $covgroup = 'console'; } elseif ($cdata->root_categories_id === Category::MOVIE_ROOT) { $covgroup = 'movies'; - } elseif ($cdata->root_categories_id === Category::XXX_ROOT) { - $covgroup = 'xxx'; } elseif ($cdata->root_categories_id === Category::PC_ROOT) { $covgroup = 'games'; } elseif ($cdata->root_categories_id === Category::MUSIC_ROOT) { diff --git a/resources/views/xxx/index.blade.php b/resources/views/xxx/index.blade.php index 3c9dc9dad..181b74caa 100644 --- a/resources/views/xxx/index.blade.php +++ b/resources/views/xxx/index.blade.php @@ -85,76 +85,100 @@ @if(count($results) > 0)
-

+

{{ $catname ?? 'All' }} XXX

- + {{ $results->total() }} results found
- -
- @foreach($resultsadd as $result) -
- - @if(!empty($result->cover)) - {{ $result->title ?? $result->searchname }} - @else -
- -
- @endif - @if(!empty($result->failed) && $result->failed > 0) -
- - Failed - -
- @endif -
-

- {{ $result->title ?? $result->searchname }} -

- @if(!empty($result->releasedate)) -

{{ date('Y', strtotime($result->releasedate)) }}

- @elseif(!empty($result->year)) -

{{ $result->year }}

- @endif - @if(!empty($result->genre)) -
- {!! $result->genre !!} + +
+ + + + + + + + + + + + @foreach($results as $result) + + + + + + + + @endforeach + +
NameAction
+
+
+ + {{ $result->searchname }} + + @if(!empty($result->failed) && $result->failed > 0) + + Failed + + @endif +
+ @if(!empty($result->genre)) + + + {!! makeFieldLinks((array) $result, 'genre', 'xxx') !!} + + @endif + @if(!empty($result->actors)) + + + {!! makeFieldLinks((array) $result, 'actors', 'xxx') !!} + + @endif + @if(!empty($result->director)) + + + {!! makeFieldLinks((array) $result, 'director', 'xxx') !!} + + @endif +
+
- @endif - @if(!empty($result->director)) -
- {!! $result->director !!} +
+ - @endif - - - - - @endforeach +
-
+
{{ $results->links() }}
@else