From 2522be9fc34dbc33ee3b8a7d4e9b7a75c000db65 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 27 Dec 2017 11:53:27 +0100 Subject: [PATCH] Remove newposterwall feature --- Changelog | 1 + nntmux/Releases.php | 273 ----------------------- public/index.php | 1 - public/pages/newposterwall.php | 125 ----------- public/themes/Charisma/newposterwall.tpl | 90 -------- public/themes/Gamma/newposterwall.tpl | 92 -------- public/themes/Gentele/newposterwall.tpl | 96 -------- public/themes/Omicron/newposterwall.tpl | 90 -------- 8 files changed, 1 insertion(+), 767 deletions(-) delete mode 100644 public/pages/newposterwall.php delete mode 100755 public/themes/Charisma/newposterwall.tpl delete mode 100755 public/themes/Gamma/newposterwall.tpl delete mode 100755 public/themes/Gentele/newposterwall.tpl delete mode 100755 public/themes/Omicron/newposterwall.tpl diff --git a/Changelog b/Changelog index 81bbb0040..a9b6a517c 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2017-12-27 DariusIII + * Chg: Remove newposterwall feature * Chg: Move more functions from Releases to appropriate models * Chg: Move updateGrab, getById functions from Releases class to Release model (rename getById to getCatByRelId) * Chg: Move createGUID function to helpers.php diff --git a/nntmux/Releases.php b/nntmux/Releases.php index 0e614f58f..1efb3aa10 100755 --- a/nntmux/Releases.php +++ b/nntmux/Releases.php @@ -6,7 +6,6 @@ use nntmux\db\DB; use Carbon\Carbon; use App\Models\Release; use App\Models\Settings; -use App\Models\ReleaseNfo; use nntmux\utility\Utility; use Illuminate\Support\Facades\Cache; use App\Models\Category as CategoryModel; @@ -1312,276 +1311,4 @@ class Releases return $zipFile->file(); } - - /** - * Get all newest movies with coves for poster wall. - * - * - * @return array|bool - */ - public function getNewestMovies() - { - $sql = sprintf( - 'SELECT r.imdbid, r.guid, r.name, r.searchname, r.size, r.completion, - postdate, categories_id, comments, grabs, - m.cover - FROM releases PARTITION (movies) r - INNER JOIN movieinfo m USING (imdbid) - WHERE m.imdbid > 0 - AND m.cover = 1 - AND r.id in (select max(id) from releases where imdbid > 0 group by imdbid) - ORDER BY r.postdate DESC - LIMIT 24' - ); - - $releases = Cache::get(md5($sql)); - if ($releases !== null) { - return $releases; - } - - $releases = $this->pdo->query($sql); - $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG); - Cache::put(md5($sql), $releases, $expiresAt); - - return $releases; - } - - /** - * Get all newest xxx with covers for poster wall. - * - * - * @return array|bool - */ - public function getNewestXXX() - { - $sql = sprintf( - 'SELECT r.xxxinfo_id, r.guid, r.name, r.searchname, r.size, r.completion, - r.postdate, r.categories_id, r.comments, r.grabs, - xxx.cover, xxx.title - FROM releases PARTITION (xxx) r - INNER JOIN xxxinfo xxx ON r.xxxinfo_id = xxx.id - WHERE xxx.id > 0 - AND xxx.cover = 1 - AND r.id in (select max(id) from releases where xxxinfo_id > 0 group by xxxinfo_id) - ORDER BY r.postdate DESC - LIMIT 20' - ); - $releases = Cache::get(md5($sql)); - if ($releases !== null) { - return $releases; - } - - $releases = $this->pdo->query($sql); - $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG); - Cache::put(md5($sql), $releases, $expiresAt); - - return $releases; - } - - /** - * Get all newest console games with covers for poster wall. - * - * - * @return array|bool - */ - public function getNewestConsole() - { - $sql = sprintf( - 'SELECT r.consoleinfo_id, r.guid, r.name, r.searchname, r.size, r.completion, - r.postdate, r.categories_id, r.comments, r.grabs, - con.cover - FROM releases PARTITION (console) r - INNER JOIN consoleinfo con ON r.consoleinfo_id = con.id - WHERE con.id > 0 - AND con.cover > 0 - AND r.id IN (SELECT max(id) FROM releases WHERE consoleinfo_id > 0 GROUP BY consoleinfo_id) - ORDER BY r.postdate DESC - LIMIT 35' - ); - - $releases = Cache::get(md5($sql)); - if ($releases !== null) { - return $releases; - } - - $releases = $this->pdo->query($sql); - $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG); - Cache::put(md5($sql), $releases, $expiresAt); - - return $releases; - } - - /** - * Get all newest PC games with covers for poster wall. - * - * - * @return array|bool - */ - public function getNewestGames() - { - $sql = sprintf( - 'SELECT r.gamesinfo_id, r.guid, r.name, r.searchname, r.size, r.completion, - r.postdate, r.categories_id, r.comments, r.grabs, - gi.cover - FROM releases r - INNER JOIN gamesinfo gi ON r.gamesinfo_id = gi.id - WHERE r.categories_id = 4050 - AND gi.id > 0 - AND gi.cover > 0 - AND r.id in (select max(id) from releases where gamesinfo_id > 0 group by gamesinfo_id) - ORDER BY r.postdate DESC - LIMIT 24' - ); - - $releases = Cache::get(md5($sql)); - if ($releases !== null) { - return $releases; - } - - $releases = $this->pdo->query($sql); - $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG); - Cache::put(md5($sql), $releases, $expiresAt); - - return $releases; - } - - /** - * Get all newest music with covers for poster wall. - * - * - * @return array|bool - */ - public function getNewestMP3s() - { - $sql = sprintf( - sprintf('SELECT r.musicinfo_id, r.guid, r.name, r.searchname, r.size, r.completion, - r.postdate, r.categories_id, r.comments, r.grabs, - m.cover - FROM releases PARTITION (audio) r - INNER JOIN musicinfo m ON r.musicinfo_id = m.id - WHERE m.id > 0 - AND m.cover > 0 - OR r.categories_id != %d - AND r.id in (select max(id) from releases where musicinfo_id > 0 group by musicinfo_id) - ORDER BY r.postdate DESC - LIMIT 24', Category::MUSIC_AUDIOBOOK) - ); - - $releases = Cache::get(md5($sql)); - if ($releases !== null) { - return $releases; - } - - $releases = $this->pdo->query($sql); - $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG); - Cache::put(md5($sql), $releases, $expiresAt); - - return $releases; - } - - /** - * Get all newest books with covers for poster wall. - * - * - * @return array|bool - */ - public function getNewestBooks() - { - $sql = sprintf( - sprintf('SELECT r.bookinfo_id, r.guid, r.name, r.searchname, r.size, r.completion, - r.postdate, r.categories_id, r.comments, r.grabs, - b.url, b.cover, b.title as booktitle, b.author - FROM releases PARTITION (books) r - INNER JOIN bookinfo b ON r.bookinfo_id = b.id - WHERE b.id > 0 - OR r.categories_id = %d - AND b.cover > 0 - AND r.id in (select max(id) from releases where bookinfo_id > 0 group by bookinfo_id) - ORDER BY r.postdate DESC - LIMIT 24', Category::MUSIC_AUDIOBOOK) - ); - - $releases = Cache::get(md5($sql)); - if ($releases !== null) { - return $releases; - } - - $releases = $this->pdo->query($sql); - $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG); - Cache::put(md5($sql), $releases, $expiresAt); - - return $releases; - } - - /** - * Get all newest TV with covers for poster wall. - * - * - * @return array|bool - */ - public function getNewestTV() - { - $sql = sprintf( - 'SELECT r.videos_id, r.guid, r.name, r.searchname, r.size, r.completion, - r.postdate, r.categories_id, r.comments, r.grabs, - v.id AS tvid, v.title AS tvtitle, v.tvdb, v.trakt, v.tvrage, v.tvmaze, v.imdb, v.tmdb, - tvi.image - FROM releases PARTITION (tv) r - INNER JOIN videos v ON r.videos_id = v.id - INNER JOIN tv_info tvi ON r.videos_id = tvi.videos_id - WHERE v.id > 0 - AND v.type = 0 - AND tvi.image = 1 - AND r.id in (select max(id) from releases where videos_id > 0 group by videos_id) - ORDER BY r.postdate DESC - LIMIT 24' - ); - - $releases = Cache::get(md5($sql)); - if ($releases !== null) { - return $releases; - } - - $releases = $this->pdo->query($sql); - $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG); - Cache::put(md5($sql), $releases, $expiresAt); - - return $releases; - } - - /** - * Get all newest anime with covers for poster wall. - * - * - * @return array|bool - */ - public function getNewestAnime() - { - $sql = sprintf( - "SELECT r.anidbid, r.guid, r.name, r.searchname, r.size, r.completion, - r.postdate, r.categories_id, r.comments, r.grabs, at.title - FROM releases r - INNER JOIN anidb_titles at USING (anidbid) - INNER JOIN anidb_info ai USING (anidbid) - WHERE r.categories_id = 5070 - AND at.anidbid > 0 - AND at.lang = 'en' - AND ai.picture != '' - AND r.id IN (SELECT MAX(id) FROM releases WHERE anidbid > 0 GROUP BY anidbid) - GROUP BY r.id - ORDER BY r.postdate DESC - LIMIT 24" - ); - - $releases = Cache::get(md5($sql)); - if ($releases !== null) { - return $releases; - } - - $releases = $this->pdo->query($sql); - $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG); - Cache::put(md5($sql), $releases, $expiresAt); - - return $releases; - } } diff --git a/public/index.php b/public/index.php index 5447ba290..b1e208385 100644 --- a/public/index.php +++ b/public/index.php @@ -46,7 +46,6 @@ switch ($page->page) { case 'myshows': case 'mymovies': case 'mymoviesedit': - case 'newposterwall': case 'nfo': case 'nzbgetqueuedata': case 'post_edit': diff --git a/public/pages/newposterwall.php b/public/pages/newposterwall.php deleted file mode 100644 index 92d3e3b50..000000000 --- a/public/pages/newposterwall.php +++ /dev/null @@ -1,125 +0,0 @@ -show403(); -} - -$releases = new Releases(['Settings' => $page->settings]); -$contents = new Contents(['Settings' => $page->settings]); -$category = new Category(['Settings' => $page->settings]); -$error = false; - -// Array with all the possible poster wall types. -$startTypes = ['Books', 'Console', 'Movies', 'XXX', 'Audio', 'PC', 'TV', 'Anime'/*, 'Recent'*/]; -// Array that will contain the poster wall types (the above array minus whatever they have disabled in admin). -$types = []; -// Get the names of all enabled parent categories. -$categories = $category->getEnabledParentNames(); -// Loop through our possible ones and check if they are in the enabled categories. -if (count($categories) > 0) { - foreach ($categories as $pType) { - if (in_array($pType['title'], $startTypes)) { - $types[] = $pType['title']; - if ($pType['title'] == 'TV') { - $types[] = 'Anime'; - } - } - } -} else { - $error = 'No categories are enabled!'; -} - -if (count($types) === 0) { - $error = 'No categories enabled for the new poster wall. Possible choices are: '.implode(', ', $startTypes).'.'; -} - -if (! $error) { - - // Check if the user did not pass the required t parameter, set it to the first type. - if (! isset($_REQUEST['t'])) { - $_REQUEST['t'] = $types[0]; - } - - // Check if the user passed an invalid t parameter. - if (! in_array($_REQUEST['t'], $types)) { - $_REQUEST['t'] = $types[0]; - } - - $page->smarty->assign('types', $types); - $page->smarty->assign('type', $_REQUEST['t']); - - switch ($_REQUEST['t']) { - case 'Movies': - $getnewestmovies = $releases->getNewestMovies(); - $page->smarty->assign('newest', $getnewestmovies); - - $user = User::getById(User::currentUserId()); - $page->smarty->assign('cpapi', $user['cp_api']); - $page->smarty->assign('cpurl', $user['cp_url']); - $page->smarty->assign('goto', 'movies'); - break; - - case 'Console': - $getnewestconsole = $releases->getNewestConsole(); - $page->smarty->assign('newest', $getnewestconsole); - $page->smarty->assign('goto', 'console'); - break; - - case 'XXX': - $getnewestxxx = $releases->getNewestXXX(); - $page->smarty->assign('newest', $getnewestxxx); - $page->smarty->assign('goto', 'xxx'); - break; - - case 'PC': - $getnewestgame = $releases->getNewestGames(); - $page->smarty->assign('newest', $getnewestgame); - $page->smarty->assign('goto', 'games'); - break; - - case 'Audio': - $getnewestmp3 = $releases->getnewestMP3s(); - $page->smarty->assign('newest', $getnewestmp3); - $page->smarty->assign('goto', 'music'); - break; - - case 'Books': - $getnewestbooks = $releases->getNewestBooks(); - $page->smarty->assign('newest', $getnewestbooks); - $page->smarty->assign('goto', 'books'); - break; - - case 'TV': - $getnewesttv = $releases->getNewestTV(); - $page->smarty->assign('newest', $getnewesttv); - $page->smarty->assign('goto', 'series'); - break; - - case 'Anime': - $getnewestanime = $releases->getNewestAnime(); - $page->smarty->assign('newest', $getnewestanime); - $page->smarty->assign('goto', 'anime'); - break; - - case 'Recent': - $recent = $releases->getRecentlyAdded(); - $page->smarty->assign('newest', $recent); - $page->smarty->assign('goto', 'browse'); - break; - - default: - $error = 'ERROR: Invalid ?t parameter ('.$_REQUEST['t'].').'; - } -} -$page->title = 'New '.$_REQUEST['t'].' Releases'; -$page->meta_title = $_REQUEST['t'].' Poster Wall'; -$page->meta_keywords = 'view,new,releases,posters,wall'; -$page->meta_description = 'The newest '.$_REQUEST['t'].' releases'; -$page->smarty->assign('error', $error); -$page->content = $page->smarty->fetch('newposterwall.tpl'); -$page->render(); diff --git a/public/themes/Charisma/newposterwall.tpl b/public/themes/Charisma/newposterwall.tpl deleted file mode 100755 index a29f63551..000000000 --- a/public/themes/Charisma/newposterwall.tpl +++ /dev/null @@ -1,90 +0,0 @@ -
- {if $error} -

{$error}

- {else} -

- see more » - The newest releases for - - - -

-
-
- -
- {foreach $newest as $result} -
-
- - {if $type == 'Console'} - - {elseif $type == 'Movies'} - - {elseif $type == 'XXX'} - - {elseif $type == 'Audio'} - - {elseif $type == 'Books'} - - {elseif $type == 'PC'} - - {elseif $type == 'TV'} - - {elseif $type == 'Anime'} - - {/if} - -
-
-
- - - - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} -
-
- -
- {/foreach} -
-
-
- {/if} -
diff --git a/public/themes/Gamma/newposterwall.tpl b/public/themes/Gamma/newposterwall.tpl deleted file mode 100755 index 0485cb964..000000000 --- a/public/themes/Gamma/newposterwall.tpl +++ /dev/null @@ -1,92 +0,0 @@ -
- {if $error} -

{$error}

- {else} -

- see more » - The newest releases for - - - -

-
-
- -
- {foreach $newest as $result} -
-
- - {if $type == 'Console'} - - {elseif $type == 'Movies'} - - {elseif $type == 'XXX'} - - {elseif $type == 'Audio'} - - {elseif $type == 'Books'} - - {elseif $type == 'PC'} - - {elseif $type == 'TV'} - - {elseif $type == 'Anime'} - - {/if} - -
-
-
- - - - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} -
-
- -
- {/foreach} -
-
-
- {/if} -
diff --git a/public/themes/Gentele/newposterwall.tpl b/public/themes/Gentele/newposterwall.tpl deleted file mode 100755 index 3873c67f1..000000000 --- a/public/themes/Gentele/newposterwall.tpl +++ /dev/null @@ -1,96 +0,0 @@ -
- {if $error} -

{$error}

- {else} -

- see more » - The newest releases for - - - -

-
-
- -
- {foreach $newest as $result} -
-
- - {if $type == 'Console'} - - {elseif $type == 'Movies'} - - {elseif $type == 'XXX'} - - {elseif $type == 'Audio'} - - {elseif $type == 'Books'} - - {elseif $type == 'PC'} - - {elseif $type == 'TV'} - - {elseif $type == 'Anime'} - - {/if} - -
-
-
- - - - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} -
-
- -
- {/foreach} -
-
-
- {/if} -
diff --git a/public/themes/Omicron/newposterwall.tpl b/public/themes/Omicron/newposterwall.tpl deleted file mode 100755 index 90de45861..000000000 --- a/public/themes/Omicron/newposterwall.tpl +++ /dev/null @@ -1,90 +0,0 @@ -
- {if $error} -

{$error}

- {else} -

- see more » - The newest releases for - - - -

-
-
- -
- {foreach $newest as $result} -
-
- - {if $type == 'Console'} - - {elseif $type == 'Movies'} - - {elseif $type == 'XXX'} - - {elseif $type == 'Audio'} - - {elseif $type == 'Books'} - - {elseif $type == 'PC'} - - {elseif $type == 'TV'} - - {elseif $type == 'Anime'} - - {/if} - -
-
-
- - - - - {if isset($sabintegrated) && $sabintegrated !=""} - - {/if} -
-
- -
- {/foreach} -
-
-
- {/if} -