diff --git a/Blacklight/Console.php b/Blacklight/Console.php index 6a218996b..1752d3685 100755 --- a/Blacklight/Console.php +++ b/Blacklight/Console.php @@ -148,76 +148,17 @@ class Console } /** + * @param $page * @param $cat - * @param $start - * @param $num - * @param $orderBy * @param array $excludedcats * - * @return array + * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|mixed * @throws \Exception */ - public function getConsoleRange($cat, $start, $num, $orderBy, array $excludedcats = []): array + public function getConsoleRange($page, $cat, array $excludedcats = []) { - $browseBy = $this->getBrowseBy(); - $catsrch = ''; - if (\count($cat) > 0 && (int) $cat[0] !== -1) { - $catsrch = Category::getCategorySearch($cat); - } - - $exccatlist = ''; - if (\count($excludedcats) > 0) { - $exccatlist = ' AND r.categories_id NOT IN ('.implode(',', $excludedcats).')'; - } - - $order = $this->getConsoleOrder($orderBy); - - $calcSql = sprintf( - " - SELECT SQL_CALC_FOUND_ROWS - con.id, - GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id - FROM consoleinfo con - LEFT JOIN releases r ON con.id = r.consoleinfo_id - WHERE r.nzbstatus = 1 - AND con.title != '' - AND con.cover = 1 - AND r.passwordstatus %s - %s %s %s - GROUP BY con.id - ORDER BY %s %s %s", - Releases::showPasswords(), - $browseBy, - $catsrch, - $exccatlist, - $order[0], - $order[1], - ($start === false ? '' : ' LIMIT '.$num.' OFFSET '.$start) - ); - - $cached = Cache::get(md5($calcSql)); - if ($cached !== null) { - $consoles = $cached; - } else { - $consoles = $this->pdo->queryCalc($calcSql); - $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_medium')); - Cache::put(md5($calcSql), $consoles, $expiresAt); - } - - $consoleIDs = $releaseIDs = false; - - if (\is_array($consoles['result'])) { - foreach ($consoles['result'] as $console => $id) { - $consoleIDs[] = $id['id']; - $releaseIDs[] = $id['grp_release_id']; - } - } - - $sql = sprintf( - " - SELECT - GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id, + $sql = Release::query()->selectRaw("GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id, GROUP_CONCAT(r.rarinnerfilecount ORDER BY r.postdate DESC SEPARATOR ',') as grp_rarinnerfilecount, GROUP_CONCAT(r.haspreview ORDER BY r.postdate DESC SEPARATOR ',') AS grp_haspreview, GROUP_CONCAT(r.passwordstatus ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_password, @@ -230,42 +171,45 @@ class Console GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, - GROUP_CONCAT(df.failed ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_failed, - con.*, - r.consoleinfo_id, - g.name AS group_name, - genres.title AS genre, - rn.releases_id AS nfoid - FROM releases r - LEFT OUTER JOIN groups g ON g.id = r.groups_id - LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id - LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id - INNER JOIN consoleinfo con ON con.id = r.consoleinfo_id - INNER JOIN genres ON con.genres_id = genres.id - WHERE con.id IN (%s) - AND r.id IN (%s) - %s - GROUP BY con.id - ORDER BY %s %s", - (\is_array($consoleIDs) ? implode(',', $consoleIDs) : -1), - (\is_array($releaseIDs) ? implode(',', $releaseIDs) : -1), - $catsrch, - $order[0], - $order[1] - ); + GROUP_CONCAT(df.failed ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_failed") + ->select( + [ + 'con.*', + 'releases.consoleinfo_id', + 'g.name as group_name', + 'gn.title as genre', + 'rn.releases_id as nfoid', + ] + ) + ->leftJoin('groups as g', 'g.id', '=', 'releases.groups_id') + ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'releases.id') + ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'releases.id') + ->join('consoleinfo as con', 'con.id', '=', 'releases.consoleinfo_id') + ->join('genres as gn', 'con.genres_id', '=', 'gn.id') + ->where('releases.nzbstatus', '=', 1) + ->where('con.title', '!=', '') + ->where('con.cover', '=', 1); + Releases::showPasswords($sql, true); + if (\count($excludedcats) > 0) { + $sql->whereNotIn('releases.categories_id', $excludedcats); + } - $return = Cache::get(md5($sql)); + if (\count($cat) > 0 && $cat[0] !== -1) { + Category::getCategorySearch($cat, $sql, true); + } + + $sql->groupBy('con.id') + ->orderBy('releases.postdate', 'desc'); + + $return = Cache::get(md5($page.implode('.', $cat).implode('.', $excludedcats))); if ($return !== null) { return $return; } - $return = $this->pdo->query($sql); - if (! empty($return)) { - $return[0]['_totalcount'] = $consoles['total'] ?? 0; - } + $return = $sql->paginate(config('nntmux.items_per_cover_page')); $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_long')); - Cache::put(md5($sql), $return, $expiresAt); + Cache::put(md5($page.implode('.', $cat).implode('.', $excludedcats)), $return, $expiresAt); return $return; } diff --git a/Blacklight/Games.php b/Blacklight/Games.php index d6c1b951c..219b90592 100755 --- a/Blacklight/Games.php +++ b/Blacklight/Games.php @@ -3,6 +3,7 @@ namespace Blacklight; use App\Models\Genre; +use App\Models\Release; use Blacklight\db\DB; use App\Models\Category; use App\Models\Settings; @@ -216,83 +217,17 @@ class Games } /** - * @param $cat - * @param $start - * @param $num - * @param string|array $orderBy - * @param string $maxAge - * @param array $excludedCats + * @param $page + * @param $cat + * @param array $excludedcats * - * @return array + * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|mixed * @throws \Exception */ - public function getGamesRange($cat, $start, $num, $orderBy = '', $maxAge = '', array $excludedCats = []): array + public function getGamesRange($page, $cat, array $excludedcats = []) { - $browseBy = $this->getBrowseBy(); - $catsrch = ''; - if (\count($cat) > 0 && $cat[0] !== -1) { - $catsrch = Category::getCategorySearch($cat); - } - - if ($maxAge > 0) { - $maxAge = sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxAge); - } - - $exccatlist = ''; - if (\count($excludedCats) > 0) { - $exccatlist = ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')'; - } - - $order = $this->getGamesOrder($orderBy); - - $gamesSql = - sprintf( - " - SELECT SQL_CALC_FOUND_ROWS gi.id, - GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id - FROM gamesinfo gi - LEFT JOIN releases r ON gi.id = r.gamesinfo_id - WHERE r.nzbstatus = 1 - AND gi.title != '' - AND gi.cover = 1 - AND r.passwordstatus %s - %s %s %s %s - GROUP BY gi.id - ORDER BY %s %s %s", - Releases::showPasswords(), - $browseBy, - $catsrch, - $maxAge, - $exccatlist, - $order[0], - $order[1], - ($start === false ? '' : ' LIMIT '.$num.' OFFSET '.$start) - ); - - $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_medium')); - $gamesCache = Cache::get(md5($gamesSql)); - if ($gamesCache !== null) { - $games = $gamesCache; - } else { - $games = $this->pdo->queryCalc($gamesSql); - Cache::put(md5($gamesSql), $games, $expiresAt); - } - - $gameIDs = $releaseIDs = false; - - if (\is_array($games['result'])) { - foreach ($games['result'] as $game => $id) { - $gameIDs[] = $id['id']; - $releaseIDs[] = $id['grp_release_id']; - } - } - - $returnSql = - sprintf( - " - SELECT - GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id, + $sql = Release::query()->selectRaw("GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id, GROUP_CONCAT(r.rarinnerfilecount ORDER BY r.postdate DESC SEPARATOR ',') as grp_rarinnerfilecount, GROUP_CONCAT(r.haspreview ORDER BY r.postdate DESC SEPARATOR ',') AS grp_haspreview, GROUP_CONCAT(r.passwordstatus ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_password, @@ -305,35 +240,45 @@ class Games GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, - GROUP_CONCAT(df.failed ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_failed, - gi.*, YEAR (gi.releasedate) as year, r.gamesinfo_id, g.name AS group_name, - rn.releases_id AS nfoid - FROM releases r - LEFT OUTER JOIN groups g ON g.id = r.groups_id - LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id - LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id - INNER JOIN gamesinfo gi ON gi.id = r.gamesinfo_id - WHERE gi.id IN (%s) - AND r.id IN (%s) - %s - GROUP BY gi.id - ORDER BY %s %s", - (\is_array($gameIDs) ? implode(',', $gameIDs) : -1), - (\is_array($releaseIDs) ? implode(',', $releaseIDs) : -1), - $catsrch, - $order[0], - $order[1] - ); - $return = Cache::get(md5($returnSql)); + GROUP_CONCAT(df.failed ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_failed") + ->select( + [ + 'gi.*', + 'releases.gamesinfo_id', + 'g.name as group_name', + 'gn.title as genre', + 'rn.releases_id as nfoid', + ] + ) + ->leftJoin('groups as g', 'g.id', '=', 'releases.groups_id') + ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'releases.id') + ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'releases.id') + ->join('gamesinfo as gi', 'gi.id', '=', 'releases.gamesinfo_id') + ->join('genres as gn', 'gi.genres_id', '=', 'gn.id') + ->where('releases.nzbstatus', '=', 1) + ->where('gi.title', '!=', '') + ->where('gi.cover', '=', 1); + Releases::showPasswords($sql, true); + if (\count($excludedcats) > 0) { + $sql->whereNotIn('releases.categories_id', $excludedcats); + } + + if (\count($cat) > 0 && $cat[0] !== -1) { + Category::getCategorySearch($cat, $sql, true); + } + + $sql->groupBy('gi.id') + ->orderBy('releases.postdate', 'desc'); + + $return = Cache::get(md5($page.implode('.', $cat).implode('.', $excludedcats))); if ($return !== null) { return $return; } - $return = $this->pdo->query($returnSql); - if (! empty($return)) { - $return[0]['_totalcount'] = $games['total'] ?? 0; - } - Cache::put(md5($returnSql), $return, $expiresAt); + $return = $sql->paginate(config('nntmux.items_per_cover_page')); + + $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_long')); + Cache::put(md5($page.implode('.', $cat).implode('.', $excludedcats)), $return, $expiresAt); return $return; } diff --git a/Changelog b/Changelog index de66d132c..91da818b0 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-04-11 DariusIII + * Chg: Add GamesController, adjust themes and classes * Chg: Update CartController * Chg: Update returned response in FailedReleasesController * Fix: Fix contact-us page diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php index a1ec6b94c..5d73a92c5 100644 --- a/app/Http/Controllers/CartController.php +++ b/app/Http/Controllers/CartController.php @@ -35,7 +35,7 @@ class CartController extends BasePageController } /** - * @param \Illuminate\Http\Request $request + * @param $id * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @throws \Exception diff --git a/app/Http/Controllers/ConsoleController.php b/app/Http/Controllers/ConsoleController.php index 31b3e2a4e..e3c1903ea 100644 --- a/app/Http/Controllers/ConsoleController.php +++ b/app/Http/Controllers/ConsoleController.php @@ -32,12 +32,10 @@ class ConsoleController extends BasePageController $this->smarty->assign('catlist', $ctmp); $this->smarty->assign('category', $category->title); - $offset = ($request->has('offset') && ctype_digit($request->input('offset'))) ? $request->input('offset') : 0; - $ordering = $console->getConsoleOrdering(); - $orderby = $request->has('ob') && \in_array($request->input('ob'), $ordering, false) ? $request->input('ob') : ''; + $page = \request()->has('page') ? \request()->input('page') : 1; $consoles = []; - $results = $console->getConsoleRange($catarray, $orderby, $this->userdata['categoryexclusions']); + $results = $console->getConsoleRange($page, $catarray, $this->userdata['categoryexclusions']); $maxwords = 50; foreach ($results as $result) { @@ -66,32 +64,17 @@ class ConsoleController extends BasePageController $this->smarty->assign('genres', $genres); $this->smarty->assign('genre', $genre); - $browseby_link = '&title='.$title.'&platform='.$platform; - - $this->smarty->assign('pagertotalitems', $results[0]['_totalcount'] ?? 0); - $this->smarty->assign('pageroffset', $offset); - $this->smarty->assign('pageritemsperpage', config('nntmux.items_per_cover_page')); - $this->smarty->assign('pagerquerybase', WWW_TOP.'/console?t='.$category.$browseby_link.'&ob='.$orderby.'&offset='); - $this->smarty->assign('pagerquerysuffix', '#results'); - - $thisr = $this->smarty->fetch('pager.tpl'); - $this->smarty->assign('pager', $thisr); - - if ((int) $category === -1) { + if ($category === -1) { $this->smarty->assign('catname', 'All'); } else { $cdata = Category::find($category); if ($cdata) { - $this->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title); + $this->smarty->assign('catname', array_first($cdata)->parent !== null ? array_first($cdata)->parent->title.' > '.array_first($cdata)->title : array_first($cdata)->title); } else { $this->show404(); } } - foreach ($ordering as $ordertype) { - $this->smarty->assign('orderby'.$ordertype, WWW_TOP.'/console?t='.$category.$browseby_link.'&ob='.$ordertype.'&offset=0'); - } - $this->smarty->assign('results', $consoles); $meta_title = 'Browse Console'; diff --git a/app/Http/Controllers/GamesController.php b/app/Http/Controllers/GamesController.php new file mode 100644 index 000000000..d1c93ebec --- /dev/null +++ b/app/Http/Controllers/GamesController.php @@ -0,0 +1,107 @@ +setPrefs(); + $games = new Games(['Settings' => $this->settings]); + $gen = new Genres(['Settings' => $this->settings]); + + $concats = Category::getChildren(Category::PC_ROOT); + $ctmp = []; + foreach ($concats as $ccat) { + $ctmp[$ccat['id']] = $ccat; + } + $category = Category::PC_GAMES; + if ($request->has('t') && array_key_exists($request->input('t'), $ctmp)) { + $category = $request->input('t') + 0; + } + + $catarray = []; + $catarray[] = $category; + + $this->smarty->assign('catlist', $ctmp); + $this->smarty->assign('category', $category); + + $page = \request()->has('page') ? \request()->input('page') : 1; + + $games2 = []; + $results = $games->getGamesRange($page, $catarray, $this->userdata['categoryexclusions']); + $maxwords = 50; + foreach ($results as $result) { + if (! empty($result['review'])) { + // remove "Overview" from start of review if present + if (0 === strpos($result['review'], 'Overview')) { + $result['review'] = substr($result['review'], 8); + } + $words = explode(' ', $result['review']); + if (\count($words) > $maxwords) { + $newwords = \array_slice($words, 0, $maxwords); + $result['review'] = implode(' ', $newwords).'...'; + } + } + $games2[] = $result; + } + + $title = ($request->has('title') && ! empty($request->input('title'))) ? stripslashes($request->input('title')) : ''; + $this->smarty->assign('title', $title); + + $genres = $gen->getGenres(Genres::GAME_TYPE, true); + $tmpgnr = []; + foreach ($genres as $gn) { + $tmpgnr[$gn['id']] = $gn['title']; + } + + $years = range(1903, date('Y') + 1); + rsort($years); + $year = ($request->has('year') && \in_array($request->input('year'), $years, false)) ? $request->input('year') : ''; + $this->smarty->assign('years', $years); + $this->smarty->assign('year', $year); + + $genre = ($request->has('genre') && array_key_exists($request->input('genre'), $tmpgnr)) ? $request->input('genre') : ''; + $this->smarty->assign('genres', $genres); + $this->smarty->assign('genre', $genre); + + if ((int) $category === -1) { + $this->smarty->assign('catname', 'All'); + } else { + $cdata = Category::find($category); + + if ($cdata) { + $this->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title); + } else { + $this->show404(); + } + } + + $this->smarty->assign('results', $games2); + + $meta_title = 'Browse Games'; + $meta_keywords = 'browse,nzb,games,description,details'; + $meta_description = 'Browse for Games'; + + $content = $this->smarty->fetch('games.tpl'); + $this->smarty->assign( + [ + 'content' => $content, + 'meta_title' => $meta_title, + 'meta_keywords' => $meta_keywords, + 'meta_description' => $meta_description, + ] + ); + $this->pagerender(); + } +} diff --git a/public/pages/games.php b/public/pages/games.php deleted file mode 100644 index d684fdddb..000000000 --- a/public/pages/games.php +++ /dev/null @@ -1,106 +0,0 @@ -show403(); -} - -$games = new Games(['Settings' => $page->settings]); -$gen = new Genres(['Settings' => $page->settings]); - -$concats = Category::getChildren(Category::PC_ROOT); -$ctmp = []; -foreach ($concats as $ccat) { - $ctmp[$ccat['id']] = $ccat; -} -$category = Category::PC_GAMES; -if (request()->has('t') && array_key_exists(request()->input('t'), $ctmp)) { - $category = request()->input('t') + 0; -} - -$catarray = []; -$catarray[] = $category; - -$page->smarty->assign('catlist', $ctmp); -$page->smarty->assign('category', $category); - -$offset = (request()->has('offset') && ctype_digit(request()->input('offset'))) ? request()->input('offset') : 0; -$ordering = $games->getGamesOrdering(); - -$orderby = request()->has('ob') && in_array(request()->input('ob'), $ordering, false) ? request()->input('ob') : ''; - -$games2 = []; -$results = $games->getGamesRange($catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, '', $page->userdata['categoryexclusions']); -$maxwords = 50; -foreach ($results as $result) { - if (! empty($result['review'])) { - // remove "Overview" from start of review if present - if (0 === strpos($result['review'], 'Overview')) { - $result['review'] = substr($result['review'], 8); - } - $words = explode(' ', $result['review']); - if (count($words) > $maxwords) { - $newwords = array_slice($words, 0, $maxwords); - $result['review'] = implode(' ', $newwords).'...'; - } - } - $games2[] = $result; -} - -$title = (request()->has('title') && ! empty(request()->input('title'))) ? stripslashes(request()->input('title')) : ''; -$page->smarty->assign('title', $title); - -$genres = $gen->getGenres(Genres::GAME_TYPE, true); -$tmpgnr = []; -foreach ($genres as $gn) { - $tmpgnr[$gn['id']] = $gn['title']; -} - -$years = range(1903, date('Y') + 1); -rsort($years); -$year = (request()->has('year') && in_array(request()->input('year'), $years, false)) ? request()->input('year') : ''; -$page->smarty->assign('years', $years); -$page->smarty->assign('year', $year); - -$genre = (request()->has('genre') && array_key_exists(request()->input('genre'), $tmpgnr)) ? request()->input('genre') : ''; -$page->smarty->assign('genres', $genres); -$page->smarty->assign('genre', $genre); - -$browseby_link = '&title='.$title.'&year='.$year; - -$page->smarty->assign('pagertotalitems', $results[0]['_totalcount'] ?? 0); -$page->smarty->assign('pageroffset', $offset); -$page->smarty->assign('pageritemsperpage', config('nntmux.items_per_cover_page')); -$page->smarty->assign('pagerquerybase', WWW_TOP.'/games?t='.$category.$browseby_link.'&ob='.$orderby.'&offset='); -$page->smarty->assign('pagerquerysuffix', '#results'); - -$pager = $page->smarty->fetch('pager.tpl'); -$page->smarty->assign('pager', $pager); - -if ((int) $category === -1) { - $page->smarty->assign('catname', 'All'); -} else { - $cdata = Category::find($category); - if ($cdata) { - $page->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title); - } else { - $page->show404(); - } -} - -foreach ($ordering as $ordertype) { - $page->smarty->assign('orderby'.$ordertype, WWW_TOP.'/games?t='.$category.$browseby_link.'&ob='.$ordertype.'&offset=0'); -} - -$page->smarty->assign('results', $games2); - -$page->meta_title = 'Browse Games'; -$page->meta_keywords = 'browse,nzb,games,description,details'; -$page->meta_description = 'Browse for Games'; - -$page->content = $page->smarty->fetch('games.tpl'); -$page->pagerender(); diff --git a/resources/views/themes/Charisma/console.tpl b/resources/views/themes/Charisma/console.tpl index 8355aed9c..fa21842f1 100755 --- a/resources/views/themes/Charisma/console.tpl +++ b/resources/views/themes/Charisma/console.tpl @@ -10,208 +10,250 @@ {include file='search-filter.tpl'}
-
-
-
-
-
-
-
- View: Covers | List
- Check all:
- With Selected: -
- - - {if isset($sabintegrated) && $sabintegrated !=""} +
+
+
+
+
+
+
+
+ View: Covers | List
+ Check all:
+ With Selected: +
- {/if} - {if isset($isadmin)} + class="nzb_multi_operations_download btn btn-sm btn-success" + value="Download NZBs"/> - - {/if} -
-
-
-
- {$pager} -
-
-
- {foreach $results as $result} - {assign var="msplits" value=","|explode:$result.grp_release_id} - {assign var="mguid" value=","|explode:$result.grp_release_guid} - {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} - {assign var="mgrp" value=","|explode:$result.grp_release_grpname} - {assign var="mname" value="#"|explode:$result.grp_release_name} - {assign var="mpostdate" value=","|explode:$result.grp_release_postdate} - {assign var="msize" value=","|explode:$result.grp_release_size} - {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} - {assign var="mcomments" value=","|explode:$result.grp_release_comments} - {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} - {assign var="mfailed" value=","|explode:$result.grp_release_failed} - {assign var="mpass" value=","|explode:$result.grp_release_password} - {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} - {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} - {foreach $msplits as $loop=>$m name="loop"} - {if $smarty.foreach.loop.first} -
-
-
-
- - {$result.title|escape:{if !empty($mfailed[$m@index])} {/if} - - {if $result.url != ""} - Amazon{/if} - {if $result.nfoid > 0} - NFO{/if} - Group - {if !empty($mfailed[$m@index])} - - {$mgrabs[$m@index]} Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} Failed Download{if {$mfailed[$m@index]} > 1}s{/if} {/if} -
-
-

{$result.title|escape:"htmlall"} -

- - - - -
- - {$msize[$m@index]|fsize_format:"MB"} - Posted {$mpostdate[$m@index]|timeago} - ago - {if isset($isadmin)} - - Edit{/if} -
- {if isset($result.genre) && $result.genre != ""} - Genre: - {$result.genre} -
- {/if} - {if isset($result.esrb) && $result.esrb != ""} - Rating: - {$result.esrb} -
- {/if} - {if isset($result.publisger) && $result.publisher != ""} - Publisher: - {$result.publisher} -
- {/if} - {if isset($result.releasedate) && $result.releasedate != ""} - Released: - {$result.releasedate|date_format} -
- {/if} - {if isset($result.review) && $result.review != ""} - Review: - {$result.review|escape:'htmlall'} -
- {/if} - -
-
-
+ class="nzb_multi_operations_cart btn btn-sm btn-info" + value="Send to my Download Basket"/> + {if isset($sabintegrated) && $sabintegrated !=""} + + {/if} + {if isset($isadmin)} + + + {/if}
- {/if} - {/foreach} - {/foreach} -
-
-
-
- View: Covers | List
- Check all:
- With Selected: -
- - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} - {if isset($isadmin)} - - - {/if} -
-
- {$pager} -
+
+
+
+
+
+ +
+
+
+
+
+
+
+ {if count($results) > 0} +
+ {$results->links()} +
+ {foreach $results as $result} + {assign var="msplits" value=","|explode:$result.grp_release_id} + {assign var="mguid" value=","|explode:$result.grp_release_guid} + {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} + {assign var="mgrp" value=","|explode:$result.grp_release_grpname} + {assign var="mname" value="#"|explode:$result.grp_release_name} + {assign var="mpostdate" value=","|explode:$result.grp_release_postdate} + {assign var="msize" value=","|explode:$result.grp_release_size} + {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} + {assign var="mcomments" value=","|explode:$result.grp_release_comments} + {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} + {assign var="mpass" value=","|explode:$result.grp_release_password} + {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} + {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} + {foreach $msplits as $loop=>$m name="loop"} + {if $smarty.foreach.loop.first} +
+
+
+
+ + {$result.title|escape:{if !empty($mfailed[$m@index])} + {/if} + + {if $result.url != ""} + Amazon{/if} + {if $result.nfoid > 0} + NFO{/if} + Group + {if !empty($mfailed[$m@index])} + + {$mgrabs[$m@index]} + Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} + Failed Download{if {$mfailed[$m@index]} > 1}s{/if} + {/if} +
+
+

{$result.title|escape:"htmlall"} +

+ + + + +
+ + {$msize[$m@index]|fsize_format:"MB"} + Posted {$mpostdate[$m@index]|timeago} + ago + {if isset($isadmin)} + + Edit{/if} +
+ {if isset($result.genre) && $result.genre != ""} + Genre: + {$result.genre} +
+ {/if} + {if isset($result.esrb) && $result.esrb != ""} + Rating: + {$result.esrb} +
+ {/if} + {if isset($result.publisger) && $result.publisher != ""} + Publisher: + {$result.publisher} +
+ {/if} + {if isset($result.releasedate) && $result.releasedate != ""} + Released: + {$result.releasedate|date_format} +
+ {/if} + {if isset($result.review) && $result.review != ""} + Review: + {$result.review|escape:'htmlall'} +
+ {/if} + +
+
+
+
+
+ {/if} + {/foreach} + {/foreach} + {else} + No console releases with covers available! + {/if} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ View: Covers | List
+ Check all:
+ With Selected: +
+ + + {if isset($sabintegrated) && $sabintegrated !=""} + + {/if} + {if isset($isadmin)} + + + {/if} +
+
+
+ {if count($results) > 0} +
+ {$results->links()} +
+ {/if} +
diff --git a/resources/views/themes/Charisma/games.tpl b/resources/views/themes/Charisma/games.tpl index 4ed5393b4..c0c4a5e5f 100755 --- a/resources/views/themes/Charisma/games.tpl +++ b/resources/views/themes/Charisma/games.tpl @@ -9,217 +9,272 @@
{include file='search-filter.tpl'} +
-
-
-
-
-
-
-
- View: Covers | List
- Check all:
- With Selected: -
- - - {if isset($sabintegrated) && $sabintegrated !=""} +
+
+
+
+
+
+
+
+ View: Covers | List
+ Check all:
+ With Selected: +
- {/if} - {if isset($isadmin)} + class="nzb_multi_operations_download btn btn-sm btn-success" + value="Download NZBs"/> - - {/if} -
-
-
-
- {$pager} -
-
-
- {foreach $results as $result} - {assign var="msplits" value=","|explode:$result.grp_release_id} - {assign var="mguid" value=","|explode:$result.grp_release_guid} - {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} - {assign var="mgrp" value=","|explode:$result.grp_release_grpname} - {assign var="mname" value="#"|explode:$result.grp_release_name} - {assign var="mpostdate" value=","|explode:$result.grp_release_postdate} - {assign var="msize" value=","|explode:$result.grp_release_size} - {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} - {assign var="mcomments" value=","|explode:$result.grp_release_comments} - {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} - {assign var="mfailed" value=","|explode:$result.grp_release_failed} - {assign var="mpass" value=","|explode:$result.grp_release_password} - {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} - {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} - {foreach $msplits as $loop=>$m name="loop"} - {if $smarty.foreach.loop.first} -
-
-
-
- - {$result.title|escape:{if !empty($mfailed[$m@index])} {/if} - - {if $result.classused == "GiantBomb"} - GiantBomb{/if} - {if $result.classused == "Steam"} - Steam{/if} - {if $result.nfoid > 0} - NFO{/if} - Group - {if !empty($mfailed[$m@index])} - - {$mgrabs[$m@index]} Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} Failed Download{if {$mfailed[$m@index]} > 1}s{/if} {/if} -
-
-

{$result.title|escape:"htmlall"} -

- - - - -
- - {$msize[$m@index]|fsize_format:"MB"} - Posted {$mpostdate[$m@index]|timeago} - ago - {if isset($isadmin)} - Edit{/if} -
- {if isset($result.genre) && $result.genre != ""} - Genre: - {$result.genre} -
- {/if} - {if isset($result.esrb) && $result.esrb != ""} - Rating: - {$result.esrb} -
- {/if} - {if isset($result.publisher) && $result.publisher != ""} - Publisher: - {$result.publisher} -
- {/if} - {if isset($result.releasedate) && $result.releasedate != ""} - Released: - {$result.releasedate|date_format} -
- {/if} - {if isset($result.review) && $result.review != ""} - Review: - {$result.review|stripslashes|escape:'htmlall'} -
- {/if} - -
-
-
+ class="nzb_multi_operations_cart btn btn-sm btn-info" + value="Send to my Download Basket"/> + {if isset($sabintegrated) && $sabintegrated !=""} + + {/if} + {if isset($isadmin)} + + + {/if}
- {/if} - {/foreach} - {/foreach} -
-
-
-
- View: Covers | List
- Check all:
- With Selected: -
- - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} - {if isset($isadmin)} - - - {/if} -
-
- {$pager} -
+ +
+
+
+
+
+
+
+ {if count($results) > 0} +
+ {$results->links()} +
+ {foreach $results as $result} + {assign var="msplits" value=","|explode:$result.grp_release_id} + {assign var="mguid" value=","|explode:$result.grp_release_guid} + {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} + {assign var="mgrp" value=","|explode:$result.grp_release_grpname} + {assign var="mname" value="#"|explode:$result.grp_release_name} + {assign var="mpostdate" value=","|explode:$result.grp_release_postdate} + {assign var="msize" value=","|explode:$result.grp_release_size} + {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} + {assign var="mcomments" value=","|explode:$result.grp_release_comments} + {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} + {assign var="mpass" value=","|explode:$result.grp_release_password} + {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} + {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} + {foreach $msplits as $loop=>$m name="loop"} + {if $smarty.foreach.loop.first} +
+
+
+
+ + {$result.title|escape:{if !empty($mfailed[$m@index])} + {/if} + + {if $result.classused == "GiantBomb"} + GiantBomb{/if} + {if $result.classused == "Steam"} + Steam{/if} + {if $result.nfoid > 0} + NFO{/if} + Group + {if !empty($mfailed[$m@index])} + + {$mgrabs[$m@index]} + Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} + Failed Download{if {$mfailed[$m@index]} > 1}s{/if} + {/if} +
+
+

{$result.title|escape:"htmlall"} +

+ + + + +
+ + {$msize[$m@index]|fsize_format:"MB"} + Posted {$mpostdate[$m@index]|timeago} + ago + {if isset($isadmin)} + Edit{/if} +
+ {if isset($result.genre) && $result.genre != ""} + Genre: + {$result.genre} +
+ {/if} + {if isset($result.esrb) && $result.esrb != ""} + Rating: + {$result.esrb} +
+ {/if} + {if isset($result.publisher) && $result.publisher != ""} + Publisher: + {$result.publisher} +
+ {/if} + {if isset($result.releasedate) && $result.releasedate != ""} + Released: + {$result.releasedate|date_format} +
+ {/if} + {if isset($result.review) && $result.review != ""} + Review: + {$result.review|stripslashes|escape:'htmlall'} +
+ {/if} +
+ {$mgrabs[$m@index]} + Grab{if $mgrabs[$m@index] != 1}s{/if} + {$mcomments[$m@index]} + Comment{if $mcomments[$m@index] != 1}s{/if} + + + + {if isset($sabintegrated) && $sabintegrated !=""} + + + + {/if} + {if !empty($mfailed[$m@index])} + + {$mgrabs[$m@index]} + Grab{if {$mgrabs[$m@index]} != 1}s{/if} + / {$mfailed[$m@index]} + Failed Download{if {$mfailed[$m@index]} > 1}s{/if} + {/if} +
+
+
+
+
+
+ {/if} + {/foreach} + {/foreach} + {else} + No games with covers available! + {/if} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ View: Covers | List
+ Check all: +
+ With Selected: +
+ + + {if isset($sabintegrated) && $sabintegrated !=""} + + {/if} + {if isset($isadmin)} + + + {/if} +
+
+
+ {if count($results) > 0} +
+ {$results->links()} +
+ {/if} +
+
+
+
+
+ diff --git a/resources/views/themes/Charisma/headermenu.tpl b/resources/views/themes/Charisma/headermenu.tpl index 399e34804..35bdc437a 100755 --- a/resources/views/themes/Charisma/headermenu.tpl +++ b/resources/views/themes/Charisma/headermenu.tpl @@ -90,7 +90,7 @@ {if $userdata.gameview == "1"} {foreach $parentcat.subcatlist as $subcat} {if $subcat.id == {$catClass::PC_GAMES}} -
  • {$subcat.title} +
  • {$subcat.title}
    • {else}
  • {$subcat.title} diff --git a/resources/views/themes/Gentele/console.tpl b/resources/views/themes/Gentele/console.tpl index 1d0d58c7a..0555df40c 100755 --- a/resources/views/themes/Gentele/console.tpl +++ b/resources/views/themes/Gentele/console.tpl @@ -10,235 +10,250 @@ {include file='search-filter.tpl'}
    • -
    -
    -
    -
    -
    -
    -
    - View: Covers | List
    - With Selected: -
    - - - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} - {if isset($isadmin)} +
    +
    +
    +
    +
    +
    +
    +
    + View: Covers | List
    + Check all:
    + With Selected: +
    + class="nzb_multi_operations_download btn btn-sm btn-success" + value="Download NZBs"/> - {/if} -
    -
    -
    -
    - {$pager} -
    -
    -
    - {foreach $results as $result} - {assign var="msplits" value=","|explode:$result.grp_release_id} - {assign var="mguid" value=","|explode:$result.grp_release_guid} - {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} - {assign var="mgrp" value=","|explode:$result.grp_release_grpname} - {assign var="mname" value="#"|explode:$result.grp_release_name} - {assign var="mpostdate" value=","|explode:$result.grp_release_postdate} - {assign var="msize" value=","|explode:$result.grp_release_size} - {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} - {assign var="mcomments" value=","|explode:$result.grp_release_comments} - {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} - {assign var="mfailed" value=","|explode:$result.grp_release_failed} - {assign var="mpass" value=","|explode:$result.grp_release_password} - {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} - {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} - {foreach $msplits as $loop=>$m name="loop"} - {if $smarty.foreach.loop.first} -
    -
    -
    -
    - - {$result.title|escape:{if !empty($mfailed[$m@index])} - {/if} - - {if $result.url != ""} - Amazon{/if} - {if $result.nfoid > 0} - NFO{/if} - Group - {if !empty($mfailed[$m@index])} - - {$mgrabs[$m@index]} - Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} - Failed Download{if {$mfailed[$m@index]} > 1}s{/if} - {/if} -
    -
    -

    {$result.title|escape:"htmlall"} -

    - - - - -
    - - {$msize[$m@index]|fsize_format:"MB"} - Posted {$mpostdate[$m@index]|timeago} - ago - {if isset($isadmin)} - Edit{/if} -
    - {if isset($result.genre) && $result.genre != ""} - Genre: - {$result.genre} -
    - {/if} - {if isset($result.esrb) && $result.esrb != ""} - Rating: - {$result.esrb} -
    - {/if} - {if isset($result.publisger) && $result.publisher != ""} - Publisher: - {$result.publisher} -
    - {/if} - {if isset($result.releasedate) && $result.releasedate != ""} - Released: - {$result.releasedate|date_format} -
    - {/if} - {if isset($result.review) && $result.review != ""} - Review: - {$result.review|escape:'htmlall'} -
    - {/if} -
    - {$mgrabs[$m@index]} - Grab{if $mgrabs[$m@index] != 1}s{/if} - {$mcomments[$m@index]} - Comment{if $mcomments[$m@index] != 1}s{/if} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} - {if !empty($mfailed[$m@index])} - - {$mgrabs[$m@index]} - Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} - Failed Download{if {$mfailed[$m@index]} > 1}s{/if} - {/if} -
    -
    -
    -
    + class="nzb_multi_operations_cart btn btn-sm btn-info" + value="Send to my Download Basket"/> + {if isset($sabintegrated) && $sabintegrated !=""} + + {/if} + {if isset($isadmin)} + + + {/if}
    - {/if} - {/foreach} - {/foreach} -
    -
    -
    -
    - View: Covers | List
    - With Selected: -
    - - - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} - {if isset($isadmin)} - - - {/if} -
    -
    - {$pager} -
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    + {if count($results) > 0} +
    + {$results->links()} +
    + {foreach $results as $result} + {assign var="msplits" value=","|explode:$result.grp_release_id} + {assign var="mguid" value=","|explode:$result.grp_release_guid} + {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} + {assign var="mgrp" value=","|explode:$result.grp_release_grpname} + {assign var="mname" value="#"|explode:$result.grp_release_name} + {assign var="mpostdate" value=","|explode:$result.grp_release_postdate} + {assign var="msize" value=","|explode:$result.grp_release_size} + {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} + {assign var="mcomments" value=","|explode:$result.grp_release_comments} + {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} + {assign var="mpass" value=","|explode:$result.grp_release_password} + {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} + {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} + {foreach $msplits as $loop=>$m name="loop"} + {if $smarty.foreach.loop.first} +
    +
    +
    +
    + + {$result.title|escape:{if !empty($mfailed[$m@index])} + {/if} + + {if $result.url != ""} + Amazon{/if} + {if $result.nfoid > 0} + NFO{/if} + Group + {if !empty($mfailed[$m@index])} + + {$mgrabs[$m@index]} + Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} + Failed Download{if {$mfailed[$m@index]} > 1}s{/if} + {/if} +
    +
    +

    {$result.title|escape:"htmlall"} +

    + + + + +
    + + {$msize[$m@index]|fsize_format:"MB"} + Posted {$mpostdate[$m@index]|timeago} + ago + {if isset($isadmin)} + + Edit{/if} +
    + {if isset($result.genre) && $result.genre != ""} + Genre: + {$result.genre} +
    + {/if} + {if isset($result.esrb) && $result.esrb != ""} + Rating: + {$result.esrb} +
    + {/if} + {if isset($result.publisger) && $result.publisher != ""} + Publisher: + {$result.publisher} +
    + {/if} + {if isset($result.releasedate) && $result.releasedate != ""} + Released: + {$result.releasedate|date_format} +
    + {/if} + {if isset($result.review) && $result.review != ""} + Review: + {$result.review|escape:'htmlall'} +
    + {/if} + +
    +
    +
    +
    +
    + {/if} + {/foreach} + {/foreach} + {else} + No console releases with covers available! + {/if} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + View: Covers | List
    + Check all:
    + With Selected: +
    + + + {if isset($sabintegrated) && $sabintegrated !=""} + + {/if} + {if isset($isadmin)} + + + {/if} +
    +
    +
    + {if count($results) > 0} +
    + {$results->links()} +
    + {/if} +
    diff --git a/resources/views/themes/Gentele/games.tpl b/resources/views/themes/Gentele/games.tpl index 64738e249..c0c4a5e5f 100755 --- a/resources/views/themes/Gentele/games.tpl +++ b/resources/views/themes/Gentele/games.tpl @@ -12,244 +12,269 @@
    -
    -
    -
    -
    -
    -
    -
    - View: Covers | List
    - With Selected: -
    - - - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} - {if isset($isadmin)} +
    +
    +
    +
    +
    +
    +
    +
    + View: Covers | List
    + Check all:
    + With Selected: +
    + class="nzb_multi_operations_download btn btn-sm btn-success" + value="Download NZBs"/> - {/if} -
    -
    -
    -
    - {$pager} -
    -
    -
    - {foreach $results as $result} - {assign var="msplits" value=","|explode:$result.grp_release_id} - {assign var="mguid" value=","|explode:$result.grp_release_guid} - {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} - {assign var="mgrp" value=","|explode:$result.grp_release_grpname} - {assign var="mname" value="#"|explode:$result.grp_release_name} - {assign var="mpostdate" value=","|explode:$result.grp_release_postdate} - {assign var="msize" value=","|explode:$result.grp_release_size} - {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} - {assign var="mcomments" value=","|explode:$result.grp_release_comments} - {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} - {assign var="mfailed" value=","|explode:$result.grp_release_failed} - {assign var="mpass" value=","|explode:$result.grp_release_password} - {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} - {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} - {foreach $msplits as $loop=>$m name="loop"} - {if $smarty.foreach.loop.first} -
    -
    -
    -
    - - {$result.title|escape:{if !empty($mfailed[$m@index])} - {/if} - - {if $result.classused == "GiantBomb"} - GiantBomb{/if} - {if $result.classused == "Steam"} - Steam{/if} - {if $result.nfoid > 0} - NFO{/if} - Group - {if !empty($mfailed[$m@index])} - - {$mgrabs[$m@index]} - Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} - Failed Download{if {$mfailed[$m@index]} > 1}s{/if} - {/if} -
    -
    -

    {$result.title|escape:"htmlall"} -

    - - - - -
    - - {$msize[$m@index]|fsize_format:"MB"} - Posted {$mpostdate[$m@index]|timeago} - ago - {if isset($isadmin)} - Edit{/if} -
    - {if isset($result.genre) && $result.genre != ""} - Genre: - {$result.genre} -
    - {/if} - {if isset($result.esrb) && $result.esrb != ""} - Rating: - {$result.esrb} -
    - {/if} - {if isset($result.publisher) && $result.publisher != ""} - Publisher: - {$result.publisher} -
    - {/if} - {if isset($result.releasedate) && $result.releasedate != ""} - Released: - {$result.releasedate|date_format} -
    - {/if} - {if isset($result.review) && $result.review != ""} - Review: - {$result.review|stripslashes|escape:'htmlall'} -
    - {/if} -
    - {$mgrabs[$m@index]} - Grab{if $mgrabs[$m@index] != 1}s{/if} - {$mcomments[$m@index]} - Comment{if $mcomments[$m@index] != 1}s{/if} - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} - {if !empty($mfailed[$m@index])} - - {$mgrabs[$m@index]} - Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} - Failed Download{if {$mfailed[$m@index]} > 1}s{/if} - {/if} -
    -
    -
    -
    + class="nzb_multi_operations_cart btn btn-sm btn-info" + value="Send to my Download Basket"/> + {if isset($sabintegrated) && $sabintegrated !=""} + + {/if} + {if isset($isadmin)} + + + {/if}
    - {/if} - {/foreach} - {/foreach} -
    -
    -
    -
    - View: Covers | List
    - With Selected: -
    - - - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} - {if isset($isadmin)} - - - {/if} -
    -
    - {$pager} -
    + +
    +
    +
    +
    +
    +
    +
    + {if count($results) > 0} +
    + {$results->links()} +
    + {foreach $results as $result} + {assign var="msplits" value=","|explode:$result.grp_release_id} + {assign var="mguid" value=","|explode:$result.grp_release_guid} + {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} + {assign var="mgrp" value=","|explode:$result.grp_release_grpname} + {assign var="mname" value="#"|explode:$result.grp_release_name} + {assign var="mpostdate" value=","|explode:$result.grp_release_postdate} + {assign var="msize" value=","|explode:$result.grp_release_size} + {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} + {assign var="mcomments" value=","|explode:$result.grp_release_comments} + {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} + {assign var="mpass" value=","|explode:$result.grp_release_password} + {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} + {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} + {foreach $msplits as $loop=>$m name="loop"} + {if $smarty.foreach.loop.first} +
    +
    +
    +
    + + {$result.title|escape:{if !empty($mfailed[$m@index])} + {/if} + + {if $result.classused == "GiantBomb"} + GiantBomb{/if} + {if $result.classused == "Steam"} + Steam{/if} + {if $result.nfoid > 0} + NFO{/if} + Group + {if !empty($mfailed[$m@index])} + + {$mgrabs[$m@index]} + Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} + Failed Download{if {$mfailed[$m@index]} > 1}s{/if} + {/if} +
    +
    +

    {$result.title|escape:"htmlall"} +

    + + + + +
    + + {$msize[$m@index]|fsize_format:"MB"} + Posted {$mpostdate[$m@index]|timeago} + ago + {if isset($isadmin)} + Edit{/if} +
    + {if isset($result.genre) && $result.genre != ""} + Genre: + {$result.genre} +
    + {/if} + {if isset($result.esrb) && $result.esrb != ""} + Rating: + {$result.esrb} +
    + {/if} + {if isset($result.publisher) && $result.publisher != ""} + Publisher: + {$result.publisher} +
    + {/if} + {if isset($result.releasedate) && $result.releasedate != ""} + Released: + {$result.releasedate|date_format} +
    + {/if} + {if isset($result.review) && $result.review != ""} + Review: + {$result.review|stripslashes|escape:'htmlall'} +
    + {/if} +
    + {$mgrabs[$m@index]} + Grab{if $mgrabs[$m@index] != 1}s{/if} + {$mcomments[$m@index]} + Comment{if $mcomments[$m@index] != 1}s{/if} + + + + {if isset($sabintegrated) && $sabintegrated !=""} + + + + {/if} + {if !empty($mfailed[$m@index])} + + {$mgrabs[$m@index]} + Grab{if {$mgrabs[$m@index]} != 1}s{/if} + / {$mfailed[$m@index]} + Failed Download{if {$mfailed[$m@index]} > 1}s{/if} + {/if} +
    +
    +
    +
    +
    +
    + {/if} + {/foreach} + {/foreach} + {else} + No games with covers available! + {/if} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + View: Covers | List
    + Check all: +
    + With Selected: +
    + + + {if isset($sabintegrated) && $sabintegrated !=""} + + {/if} + {if isset($isadmin)} + + + {/if} +
    +
    +
    + {if count($results) > 0} +
    + {$results->links()} +
    + {/if} +
    +
    +
    +
    +
    + diff --git a/resources/views/themes/Gentele/headermenu.tpl b/resources/views/themes/Gentele/headermenu.tpl index 78666f225..524f1ad24 100755 --- a/resources/views/themes/Gentele/headermenu.tpl +++ b/resources/views/themes/Gentele/headermenu.tpl @@ -99,7 +99,7 @@ {foreach $parentcat.subcatlist as $subcat} {if $subcat.id == {$catClass::PC_GAMES}}
  • - {$subcat.title} + {$subcat.title}
    • {else}
  • diff --git a/resources/views/themes/Omicron/console.tpl b/resources/views/themes/Omicron/console.tpl index 675d34b06..fa21842f1 100755 --- a/resources/views/themes/Omicron/console.tpl +++ b/resources/views/themes/Omicron/console.tpl @@ -10,209 +10,250 @@ {include file='search-filter.tpl'}
    • -
    -
    -
    -
    -
    -
    -
    - View: Covers | List
    - Check all:
    - With Selected: -
    - - - {if isset($sabintegrated) && $sabintegrated !=""} +
    +
    +
    +
    +
    +
    +
    +
    + View: Covers | List
    + Check all:
    + With Selected: +
    - {/if} - {if isset($isadmin)} + class="nzb_multi_operations_download btn btn-sm btn-success" + value="Download NZBs"/> - - {/if} -
    -
    -
    -
    - {$pager} -
    -
    -
    - {foreach $results as $result} - {assign var="msplits" value=","|explode:$result.grp_release_id} - {assign var="mguid" value=","|explode:$result.grp_release_guid} - {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} - {assign var="mgrp" value=","|explode:$result.grp_release_grpname} - {assign var="mname" value="#"|explode:$result.grp_release_name} - {assign var="mpostdate" value=","|explode:$result.grp_release_postdate} - {assign var="msize" value=","|explode:$result.grp_release_size} - {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} - {assign var="mcomments" value=","|explode:$result.grp_release_comments} - {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} - {assign var="mfailed" value=","|explode:$result.grp_release_failed} - {assign var="mpass" value=","|explode:$result.grp_release_password} - {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} - {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} - {foreach $msplits as $loop=>$m name="loop"} - {if $smarty.foreach.loop.first} -
    -
    -
    -
    - - {$result.title|escape:{if !empty($mfailed[$m@index])} {/if} - - {if $result.url != ""} - Amazon{/if} - {if $result.nfoid > 0} - NFO{/if} - Group - {if !empty($mfailed[$m@index])} - - {$mgrabs[$m@index]} Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} Failed Download{if {$mfailed[$m@index]} > 1}s{/if} {/if} -
    -
    -

    {$result.title|escape:"htmlall"} -

    - - - - -
    - - {$msize[$m@index]|fsize_format:"MB"} - Posted {$mpostdate[$m@index]|timeago} - ago - {if isset($isadmin)} - Edit{/if} -
    - {if isset($result.genre) && $result.genre != ""} - Genre: - {$result.genre} -
    - {/if} - {if isset($result.esrb) && $result.esrb != ""} - Rating: - {$result.esrb} -
    - {/if} - {if isset($result.publisger) && $result.publisher != ""} - Publisher: - {$result.publisher} -
    - {/if} - {if isset($result.releasedate) && $result.releasedate != ""} - Released: - {$result.releasedate|date_format} -
    - {/if} - {if isset($result.review) && $result.review != ""} - Review: - {$result.review|escape:'htmlall'} -
    - {/if} -
    - {$mgrabs[$m@index]} - Grab{if $mgrabs[$m@index] != 1}s{/if} - {$mcomments[$m@index]} - Comment{if $mcomments[$m@index] != 1}s{/if} - - - - {if isset($sabintegrated) && $sabintegrated !=""} - - - - {/if} - {if !empty($mfailed[$m@index])} - - {$mgrabs[$m@index]} Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} Failed Download{if {$mfailed[$m@index]} > 1}s{/if} {/if} -
    -
    -
    -
    + class="nzb_multi_operations_cart btn btn-sm btn-info" + value="Send to my Download Basket"/> + {if isset($sabintegrated) && $sabintegrated !=""} + + {/if} + {if isset($isadmin)} + + + {/if}
    - {/if} - {/foreach} - {/foreach} -
    -
    -
    -
    - View: Covers | List
    - Check all:
    - With Selected: -
    - - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} - {if isset($isadmin)} - - - {/if} -
    -
    - {$pager} -
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    + {if count($results) > 0} +
    + {$results->links()} +
    + {foreach $results as $result} + {assign var="msplits" value=","|explode:$result.grp_release_id} + {assign var="mguid" value=","|explode:$result.grp_release_guid} + {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} + {assign var="mgrp" value=","|explode:$result.grp_release_grpname} + {assign var="mname" value="#"|explode:$result.grp_release_name} + {assign var="mpostdate" value=","|explode:$result.grp_release_postdate} + {assign var="msize" value=","|explode:$result.grp_release_size} + {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} + {assign var="mcomments" value=","|explode:$result.grp_release_comments} + {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} + {assign var="mpass" value=","|explode:$result.grp_release_password} + {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} + {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} + {foreach $msplits as $loop=>$m name="loop"} + {if $smarty.foreach.loop.first} +
    +
    +
    +
    + + {$result.title|escape:{if !empty($mfailed[$m@index])} + {/if} + + {if $result.url != ""} + Amazon{/if} + {if $result.nfoid > 0} + NFO{/if} + Group + {if !empty($mfailed[$m@index])} + + {$mgrabs[$m@index]} + Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} + Failed Download{if {$mfailed[$m@index]} > 1}s{/if} + {/if} +
    +
    +

    {$result.title|escape:"htmlall"} +

    + + + + +
    + + {$msize[$m@index]|fsize_format:"MB"} + Posted {$mpostdate[$m@index]|timeago} + ago + {if isset($isadmin)} + + Edit{/if} +
    + {if isset($result.genre) && $result.genre != ""} + Genre: + {$result.genre} +
    + {/if} + {if isset($result.esrb) && $result.esrb != ""} + Rating: + {$result.esrb} +
    + {/if} + {if isset($result.publisger) && $result.publisher != ""} + Publisher: + {$result.publisher} +
    + {/if} + {if isset($result.releasedate) && $result.releasedate != ""} + Released: + {$result.releasedate|date_format} +
    + {/if} + {if isset($result.review) && $result.review != ""} + Review: + {$result.review|escape:'htmlall'} +
    + {/if} + +
    +
    +
    +
    +
    + {/if} + {/foreach} + {/foreach} + {else} + No console releases with covers available! + {/if} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + View: Covers | List
    + Check all:
    + With Selected: +
    + + + {if isset($sabintegrated) && $sabintegrated !=""} + + {/if} + {if isset($isadmin)} + + + {/if} +
    +
    +
    + {if count($results) > 0} +
    + {$results->links()} +
    + {/if} +
    diff --git a/resources/views/themes/Omicron/games.tpl b/resources/views/themes/Omicron/games.tpl index e534fe77a..c0c4a5e5f 100755 --- a/resources/views/themes/Omicron/games.tpl +++ b/resources/views/themes/Omicron/games.tpl @@ -12,218 +12,269 @@
    -
    -
    -
    -
    -
    -
    -
    - View: Covers | List
    - Check all:
    - With Selected: -
    - - - {if isset($sabintegrated) && $sabintegrated !=""} +
    +
    +
    +
    +
    +
    +
    +
    + View: Covers | List
    + Check all:
    + With Selected: +
    - {/if} - {if isset($isadmin)} + class="nzb_multi_operations_download btn btn-sm btn-success" + value="Download NZBs"/> - - {/if} -
    -
    -
    -
    - {$pager} -
    -
    -
    - {foreach $results as $result} - {assign var="msplits" value=","|explode:$result.grp_release_id} - {assign var="mguid" value=","|explode:$result.grp_release_guid} - {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} - {assign var="mgrp" value=","|explode:$result.grp_release_grpname} - {assign var="mname" value="#"|explode:$result.grp_release_name} - {assign var="mpostdate" value=","|explode:$result.grp_release_postdate} - {assign var="msize" value=","|explode:$result.grp_release_size} - {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} - {assign var="mcomments" value=","|explode:$result.grp_release_comments} - {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} - {assign var="mfailed" value=","|explode:$result.grp_release_failed} - {assign var="mpass" value=","|explode:$result.grp_release_password} - {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} - {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} - {foreach $msplits as $loop=>$m name="loop"} - {if $smarty.foreach.loop.first} -
    -
    -
    -
    - - {$result.title|escape:{if !empty($mfailed[$m@index])} {/if} - - {if $result.classused == "GiantBomb"} - GiantBomb{/if} - {if $result.classused == "Steam"} - Steam{/if} - {if $result.nfoid > 0} - NFO{/if} - Group - {if !empty($mfailed[$m@index])} - - {$mgrabs[$m@index]} Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} Failed Download{if {$mfailed[$m@index]} > 1}s{/if} {/if} -
    -
    -

    {$result.title|escape:"htmlall"} -

    - - - - -
    - - {$msize[$m@index]|fsize_format:"MB"} - Posted {$mpostdate[$m@index]|timeago} - ago - {if isset($isadmin)} - Edit{/if} -
    - {if isset($result.genre) && $result.genre != ""} - Genre: - {$result.genre} -
    - {/if} - {if isset($result.esrb) && $result.esrb != ""} - Rating: - {$result.esrb} -
    - {/if} - {if isset($result.publisher) && $result.publisher != ""} - Publisher: - {$result.publisher} -
    - {/if} - {if isset($result.releasedate) && $result.releasedate != ""} - Released: - {$result.releasedate|date_format} -
    - {/if} - {if isset($result.review) && $result.review != ""} - Review: - {$result.review|stripslashes|escape:'htmlall'} -
    - {/if} -
    - {$mgrabs[$m@index]} - Grab{if $mgrabs[$m@index] != 1}s{/if} - {$mcomments[$m@index]} - Comment{if $mcomments[$m@index] != 1}s{/if} - - - - {if isset($sabintegrated) && $sabintegrated !=""} - - - - {/if} - {if !empty($mfailed[$m@index])} - - {$mgrabs[$m@index]} Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} Failed Download{if {$mfailed[$m@index]} > 1}s{/if} {/if} -
    -
    -
    -
    + class="nzb_multi_operations_cart btn btn-sm btn-info" + value="Send to my Download Basket"/> + {if isset($sabintegrated) && $sabintegrated !=""} + + {/if} + {if isset($isadmin)} + + + {/if}
    - {/if} - {/foreach} - {/foreach} -
    -
    -
    -
    - View: Covers | List
    - Check all:
    - With Selected: -
    - - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} - {if isset($isadmin)} - - - {/if} -
    -
    - {$pager} -
    + +
    +
    +
    +
    +
    +
    +
    + {if count($results) > 0} +
    + {$results->links()} +
    + {foreach $results as $result} + {assign var="msplits" value=","|explode:$result.grp_release_id} + {assign var="mguid" value=","|explode:$result.grp_release_guid} + {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} + {assign var="mgrp" value=","|explode:$result.grp_release_grpname} + {assign var="mname" value="#"|explode:$result.grp_release_name} + {assign var="mpostdate" value=","|explode:$result.grp_release_postdate} + {assign var="msize" value=","|explode:$result.grp_release_size} + {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} + {assign var="mcomments" value=","|explode:$result.grp_release_comments} + {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} + {assign var="mpass" value=","|explode:$result.grp_release_password} + {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} + {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} + {foreach $msplits as $loop=>$m name="loop"} + {if $smarty.foreach.loop.first} +
    +
    +
    +
    + + {$result.title|escape:{if !empty($mfailed[$m@index])} + {/if} + + {if $result.classused == "GiantBomb"} + GiantBomb{/if} + {if $result.classused == "Steam"} + Steam{/if} + {if $result.nfoid > 0} + NFO{/if} + Group + {if !empty($mfailed[$m@index])} + + {$mgrabs[$m@index]} + Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} + Failed Download{if {$mfailed[$m@index]} > 1}s{/if} + {/if} +
    +
    +

    {$result.title|escape:"htmlall"} +

    + + + + +
    + + {$msize[$m@index]|fsize_format:"MB"} + Posted {$mpostdate[$m@index]|timeago} + ago + {if isset($isadmin)} + Edit{/if} +
    + {if isset($result.genre) && $result.genre != ""} + Genre: + {$result.genre} +
    + {/if} + {if isset($result.esrb) && $result.esrb != ""} + Rating: + {$result.esrb} +
    + {/if} + {if isset($result.publisher) && $result.publisher != ""} + Publisher: + {$result.publisher} +
    + {/if} + {if isset($result.releasedate) && $result.releasedate != ""} + Released: + {$result.releasedate|date_format} +
    + {/if} + {if isset($result.review) && $result.review != ""} + Review: + {$result.review|stripslashes|escape:'htmlall'} +
    + {/if} +
    + {$mgrabs[$m@index]} + Grab{if $mgrabs[$m@index] != 1}s{/if} + {$mcomments[$m@index]} + Comment{if $mcomments[$m@index] != 1}s{/if} + + + + {if isset($sabintegrated) && $sabintegrated !=""} + + + + {/if} + {if !empty($mfailed[$m@index])} + + {$mgrabs[$m@index]} + Grab{if {$mgrabs[$m@index]} != 1}s{/if} + / {$mfailed[$m@index]} + Failed Download{if {$mfailed[$m@index]} > 1}s{/if} + {/if} +
    +
    +
    +
    +
    +
    + {/if} + {/foreach} + {/foreach} + {else} + No games with covers available! + {/if} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + View: Covers | List
    + Check all: +
    + With Selected: +
    + + + {if isset($sabintegrated) && $sabintegrated !=""} + + {/if} + {if isset($isadmin)} + + + {/if} +
    +
    +
    + {if count($results) > 0} +
    + {$results->links()} +
    + {/if} +
    +
    +
    +
    +
    + diff --git a/resources/views/themes/Omicron/headermenu.tpl b/resources/views/themes/Omicron/headermenu.tpl index 69540cae7..b89e770aa 100755 --- a/resources/views/themes/Omicron/headermenu.tpl +++ b/resources/views/themes/Omicron/headermenu.tpl @@ -90,7 +90,7 @@ {if $userdata.gameview == "1"} {foreach $parentcat.subcatlist as $subcat} {if $subcat.id == {$catClass::PC_GAMES}} -
  • {$subcat.title} +
  • {$subcat.title}
    • {else}
  • {$subcat.title} diff --git a/routes/web.php b/routes/web.php index 5fc122b52..c4c414a2e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -80,9 +80,7 @@ Route::get('failed', 'FailedReleasesController@show'); Route::post('failed', 'FailedReleasesController@show'); -Route::get('/games', function () { - redirect('/games'); -})->middleware('auth'); +Route::get('games', 'GamesController@show'); Route::get('/movies', function () { redirect('/movies');