diff --git a/Changelog b/Changelog index fb75659be..969d660ed 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-05-12 DariusIII + * Chg: Use function to call paginator * Chg: Update Adult and Music pages * Chg: Update music cover pages * Fix: Fix games covers page diff --git a/app/Http/Controllers/AdultController.php b/app/Http/Controllers/AdultController.php index cb77fcd06..fd6f67ea6 100644 --- a/app/Http/Controllers/AdultController.php +++ b/app/Http/Controllers/AdultController.php @@ -51,7 +51,7 @@ class AdultController extends BasePageController $page = $request->has('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 = new LengthAwarePaginator($rslt, $rslt['_totalcount'], config('nntmux.items_per_cover_page'), $page, ['path' => $request->url()]); + $results = $this->paginate($rslt, $rslt['_totalcount'], config('nntmux.items_per_cover_page'), $page, $request->url()); foreach ($results as $result) { if (! empty($result->id)) { $result->genre = makeFieldLinks((array) $result, 'genre', 'movies'); diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php index 3dde5ebe9..f7865124b 100644 --- a/app/Http/Controllers/BasePageController.php +++ b/app/Http/Controllers/BasePageController.php @@ -13,6 +13,7 @@ use App\Models\Settings; use Blacklight\Contents; use App\Models\Forumpost; use App\Models\RoleExcludedCategory; +use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Facades\Auth; class BasePageController extends Controller @@ -92,6 +93,19 @@ class BasePageController extends Controller $this->smarty->assign('serverroot', url('/')); } + /** + * @param $query + * @param $totalcount + * @param $items + * @param $page + * @param $path + * @return \Illuminate\Pagination\LengthAwarePaginator + */ + public function paginate($query, $totalcount, $items, $page, $path) + { + return new LengthAwarePaginator($query, $totalcount, $items, $page, ['path' => $path]); + } + /** * @throws \Exception */ diff --git a/app/Http/Controllers/BooksController.php b/app/Http/Controllers/BooksController.php index 7a3aa14a4..dbed56c32 100644 --- a/app/Http/Controllers/BooksController.php +++ b/app/Http/Controllers/BooksController.php @@ -54,7 +54,7 @@ class BooksController extends BasePageController $page = $request->has('page') ? $request->input('page') : 1; $offset = ($page - 1) * config('nntmux.items_per_cover_page'); $rslt = $book->getBookRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, $this->userdata['categoryexclusions']); - $results = new LengthAwarePaginator($rslt, $rslt['_totalcount'], config('nntmux.items_per_cover_page'), $page, ['path' => $request->url()]); + $results = $this->paginate($rslt, $rslt['_totalcount'], config('nntmux.items_per_cover_page'), $page, $request->url()); $maxwords = 50; foreach ($results as $result) { if (! empty($result->overview)) { diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index 176f12c9c..f5ebaa220 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -29,7 +29,7 @@ class BrowseController extends BasePageController $offset = ($page - 1) * config('nntmux.items_per_page'); $rslt = $releases->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), $orderby, -1, $this->userdata['categoryexclusions'], -1); - $results = new LengthAwarePaginator($rslt, $rslt['_totalcount'], config('nntmux.items_per_page'), $page, ['path' => \request()->url()]); + $results = $this->paginate($rslt, $rslt['_totalcount'], config('nntmux.items_per_page'), $page, request()->url()); $this->smarty->assign('catname', 'All'); @@ -86,7 +86,7 @@ class BrowseController extends BasePageController $offset = ($page - 1) * config('nntmux.items_per_page'); $rslt = $releases->getBrowseRange($page, $catarray, $offset, config('nntmux.items_per_page'), $orderby, -1, $this->userdata['categoryexclusions'], $grp); - $results = new LengthAwarePaginator($rslt, $rslt['_totalcount'], config('nntmux.items_per_page'), $page, ['path' => \request()->url()]); + $results = $this->paginate($rslt, $rslt['_totalcount'], config('nntmux.items_per_page'), $page, request()->url()); $this->smarty->assign('catname', $id); @@ -148,7 +148,7 @@ class BrowseController extends BasePageController $page = \request()->has('page') ? \request()->input('page') : 1; $offset = ($page - 1) * config('nntmux.items_per_page'); $rslt = $releases->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), '', -1, $this->userdata['categoryexclusions'], $group); - $results = new LengthAwarePaginator($rslt, $rslt['_totalcount'], config('nntmux.items_per_page'), $page, ['path' => \request()->url()]); + $results = $this->paginate($rslt, $rslt['_totalcount'], config('nntmux.items_per_page'), $page, request()->url()); $this->smarty->assign('results', $results); $meta_title = 'Browse Groups'; $meta_keywords = 'browse,nzb,description,details'; diff --git a/app/Http/Controllers/ConsoleController.php b/app/Http/Controllers/ConsoleController.php index eaa9fcf4f..186cfef58 100644 --- a/app/Http/Controllers/ConsoleController.php +++ b/app/Http/Controllers/ConsoleController.php @@ -54,7 +54,7 @@ class ConsoleController extends BasePageController $consoles = []; $rslt = $console->getConsoleRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, $this->userdata['categoryexclusions']); - $results = new LengthAwarePaginator($rslt, $rslt['_totalcount'], config('nntmux.items_per_cover_page'), $page, ['path' => $request->url()]); + $results = $this->paginate($rslt, $rslt['_totalcount'], config('nntmux.items_per_cover_page'), $page, $request->url()); $maxwords = 50; foreach ($results as $result) { diff --git a/app/Http/Controllers/GamesController.php b/app/Http/Controllers/GamesController.php index 17aac9fc8..528417a40 100644 --- a/app/Http/Controllers/GamesController.php +++ b/app/Http/Controllers/GamesController.php @@ -42,7 +42,7 @@ class GamesController extends BasePageController $orderby = request()->has('ob') && \in_array(request()->input('ob'), $ordering, false) ? request()->input('ob') : ''; $offset = ($page - 1) * config('nntmux.items_per_cover_page'); $rslt = $games->getGamesRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, '', $this->userdata['categoryexclusions']); - $results = new LengthAwarePaginator($rslt, $rslt['_totalcount'][0]->total, config('nntmux.items_per_cover_page'), $page, ['path' => $request->url()]); + $results = $this->paginate($rslt, $rslt['_totalcount'][0]->total, config('nntmux.items_per_cover_page'), $page, $request->url()); $title = ($request->has('title') && ! empty($request->input('title'))) ? stripslashes($request->input('title')) : ''; $this->smarty->assign('title', $title); diff --git a/app/Http/Controllers/MovieController.php b/app/Http/Controllers/MovieController.php index e6966c026..7c144d9a1 100644 --- a/app/Http/Controllers/MovieController.php +++ b/app/Http/Controllers/MovieController.php @@ -109,7 +109,7 @@ class MovieController extends BasePageController $movies = []; $rslt = $movie->getMovieRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, -1, $this->userdata['categoryexclusions']); - $results = new LengthAwarePaginator($rslt, $rslt['_totalcount'], config('nntmux.items_per_cover_page'), $page, ['path' => $request->url()]); + $results = $this->paginate($rslt, $rslt['_totalcount'], config('nntmux.items_per_cover_page'), $page, $request->url()); foreach ($results as $result) { if (! empty($result->id)) { diff --git a/app/Http/Controllers/MusicController.php b/app/Http/Controllers/MusicController.php index 4e5e80a9c..cb69fcc55 100644 --- a/app/Http/Controllers/MusicController.php +++ b/app/Http/Controllers/MusicController.php @@ -56,7 +56,7 @@ class MusicController extends BasePageController $musics = []; $rslt = $music->getMusicRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, $this->userdata['categoryexclusions']); - $results = new LengthAwarePaginator($rslt, $rslt['_totalcount'][0]->total, config('nntmux.items_per_cover_page'), $page, ['path' => $request->url()]); + $results = $this->paginate($rslt, $rslt['_totalcount'][0]->total, config('nntmux.items_per_cover_page'), $page, $request->url()); $artist = ($request->has('artist') && ! empty($request->input('artist'))) ? stripslashes($request->input('artist')) : ''; $this->smarty->assign('artist', $artist);