diff --git a/Changelog b/Changelog index 4488b389f..03ae0e3a4 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-03-06 DariusIII + * Chg: Update admin area pages * Chg: Move BasePage, AdminPage and Page to Blacklight\http * Chg: Update BasePage class * Chg: Add cache and templates_c folders to storage/framework/smarty folder diff --git a/public/admin/ajax.php b/public/admin/ajax.php index 886a51fe5..8a8ba8770 100644 --- a/public/admin/ajax.php +++ b/public/admin/ajax.php @@ -3,6 +3,7 @@ use App\Models\Group; use Blacklight\db\DB; +use Blacklight\http\AdminPage; use Blacklight\Regexes; use Blacklight\Sharing; use Blacklight\Binaries; @@ -14,6 +15,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; // Make sure the user is an admin and logged in. $pdo = new DB(); +$page = new AdminPage(); if (! request()->has('action')) { exit(); diff --git a/public/admin/ajax_binaryblacklist-list.php b/public/admin/ajax_binaryblacklist-list.php index 7267803b5..a3883a381 100644 --- a/public/admin/ajax_binaryblacklist-list.php +++ b/public/admin/ajax_binaryblacklist-list.php @@ -3,7 +3,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Binaries; - +use Blacklight\http\AdminPage; // login check $page = new AdminPage; diff --git a/public/admin/ajax_group-edit.php b/public/admin/ajax_group-edit.php index c9be3529a..0bb0bdf82 100644 --- a/public/admin/ajax_group-edit.php +++ b/public/admin/ajax_group-edit.php @@ -3,7 +3,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Group; - +use Blacklight\http\AdminPage; $page = new AdminPage; diff --git a/public/admin/ajax_regex-list.php b/public/admin/ajax_regex-list.php index a9465fcb7..fb0aa9339 100644 --- a/public/admin/ajax_regex-list.php +++ b/public/admin/ajax_regex-list.php @@ -2,7 +2,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\ReleaseRegex; // login check diff --git a/public/admin/ajax_regex.php b/public/admin/ajax_regex.php index bfe4cc29b..2e6628cda 100644 --- a/public/admin/ajax_regex.php +++ b/public/admin/ajax_regex.php @@ -2,7 +2,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Regexes; use Blacklight\Binaries; diff --git a/public/admin/ajax_sharing_settings.php b/public/admin/ajax_sharing_settings.php index b92d1d08c..cc5ac9f94 100644 --- a/public/admin/ajax_sharing_settings.php +++ b/public/admin/ajax_sharing_settings.php @@ -4,6 +4,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\db\DB; +use Blacklight\http\AdminPage; use Blacklight\Sharing; use App\Models\ReleaseComment; diff --git a/public/admin/anidb-delete.php b/public/admin/anidb-delete.php index d8360643a..665833c34 100644 --- a/public/admin/anidb-delete.php +++ b/public/admin/anidb-delete.php @@ -4,9 +4,6 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\AniDB; - - - if (request()->has('id')) { $AniDB = new AniDB(); $AniDB->deleteTitle(request()->input('id')); diff --git a/public/admin/anidb-edit.php b/public/admin/anidb-edit.php index 15b3fc78b..79cc5d951 100644 --- a/public/admin/anidb-edit.php +++ b/public/admin/anidb-edit.php @@ -3,10 +3,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\AniDB; - - +use Blacklight\http\AdminPage; $AniDB = new AniDB(['Settings' => $page->pdo]); +$page = new AdminPage(); $id = 0; // Set the current action. diff --git a/public/admin/anidb-list.php b/public/admin/anidb-list.php index d594d7f99..92f9b7474 100644 --- a/public/admin/anidb-list.php +++ b/public/admin/anidb-list.php @@ -3,12 +3,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\AniDB; - - - +use Blacklight\http\AdminPage; $AniDB = new AniDB(); - +$page = new AdminPage(); $page->title = 'AniDB List'; $aname = ''; diff --git a/public/admin/anidb-remove.php b/public/admin/anidb-remove.php index 9a1b47872..459ac1a75 100644 --- a/public/admin/anidb-remove.php +++ b/public/admin/anidb-remove.php @@ -3,10 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Release; +use Blacklight\http\AdminPage; - - - +$page = new AdminPage(); $success = false; if (request()->has('id')) { diff --git a/public/admin/binaryblacklist-edit.php b/public/admin/binaryblacklist-edit.php index 38102ffd8..13a3bc9f5 100644 --- a/public/admin/binaryblacklist-edit.php +++ b/public/admin/binaryblacklist-edit.php @@ -4,9 +4,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Category; use Blacklight\Binaries; +use Blacklight\http\AdminPage; - - +$page = new AdminPage(); $bin = new Binaries(['Settings' => $page->pdo]); $error = ''; $regex = ['id' => '', 'groupname' => '', 'regex' => '', 'description' => '', 'msgcol' => 1, 'status' => 1, 'optype' => 1]; diff --git a/public/admin/binaryblacklist-list.php b/public/admin/binaryblacklist-list.php index 14c015e31..8c666c39d 100644 --- a/public/admin/binaryblacklist-list.php +++ b/public/admin/binaryblacklist-list.php @@ -3,9 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Binaries; +use Blacklight\http\AdminPage; - - +$page = new AdminPage(); $bin = new Binaries(); diff --git a/public/admin/book-edit.php b/public/admin/book-edit.php index 3d911f9eb..a46c8a260 100644 --- a/public/admin/book-edit.php +++ b/public/admin/book-edit.php @@ -5,9 +5,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Books; use Blacklight\Genres; +use Blacklight\http\AdminPage; use Illuminate\Support\Carbon; - +$page = new AdminPage(); $book = new Books(); $gen = new Genres(); $id = 0; @@ -24,30 +25,30 @@ if (request()->has('id')) { } switch ($action) { - case 'submit': - $coverLoc = WWW_DIR.'covers/book/'.$id.'.jpg'; + case 'submit': + $coverLoc = WWW_DIR.'covers/book/'.$id.'.jpg'; - if ($_FILES['cover']['size'] > 0) { - $tmpName = $_FILES['cover']['tmp_name']; - $file_info = getimagesize($tmpName); - if (! empty($file_info)) { - move_uploaded_file($_FILES['cover']['tmp_name'], $coverLoc); - } - } + if ($_FILES['cover']['size'] > 0) { + $tmpName = $_FILES['cover']['tmp_name']; + $file_info = getimagesize($tmpName); + if (! empty($file_info)) { + move_uploaded_file($_FILES['cover']['tmp_name'], $coverLoc); + } + } - request()->merge(['cover' => file_exists($coverLoc) ? 1 : 0]); - request()->merge(['publishdate' => (empty(request()->input('publishdate')) || ! strtotime(request()->input('publishdate'))) ? $con['publishdate'] : Carbon::parse(request()->input('publishdate'))->timestamp]); - $book->update($id, request()->input('title'), request()->input('asin'), request()->input('url'), request()->input('author'), request()->input('publisher'), request()->input('publishdate'), request()->input('cover')); + request()->merge(['cover' => file_exists($coverLoc) ? 1 : 0]); + request()->merge(['publishdate' => (empty(request()->input('publishdate')) || ! strtotime(request()->input('publishdate'))) ? $con['publishdate'] : Carbon::parse(request()->input('publishdate'))->timestamp]); + $book->update($id, request()->input('title'), request()->input('asin'), request()->input('url'), request()->input('author'), request()->input('publisher'), request()->input('publishdate'), request()->input('cover')); - header('Location:'.WWW_TOP.'/book-list.php'); - die(); - break; - case 'view': - default: - $page->title = 'Book Edit'; - $page->smarty->assign('book', $b); - break; - } + header('Location:'.WWW_TOP.'/book-list.php'); + die(); + break; + case 'view': + default: + $page->title = 'Book Edit'; + $page->smarty->assign('book', $b); + break; + } } $page->content = $page->smarty->fetch('book-edit.tpl'); diff --git a/public/admin/book-list.php b/public/admin/book-list.php index eadf3f62e..981c024c4 100644 --- a/public/admin/book-list.php +++ b/public/admin/book-list.php @@ -4,10 +4,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Books; +use Blacklight\http\AdminPage; use Blacklight\utility\Utility; - - +$page = new AdminPage(); $book = new Books(); $page->title = 'Book List'; @@ -17,11 +17,11 @@ $bookCount = Utility::getCount('bookinfo'); $offset = request()->input('offset') ?? 0; $page->smarty->assign([ - 'pagertotalitems' => $bookCount, - 'pagerquerysuffix' => '#results', - 'pageroffset' => $offset, - 'pageritemsperpage' => config('nntmux.items_per_page'), - 'pagerquerybase' => WWW_TOP.'/book-list.php?offset=', + 'pagertotalitems' => $bookCount, + 'pagerquerysuffix' => '#results', + 'pageroffset' => $offset, + 'pageritemsperpage' => config('nntmux.items_per_page'), + 'pagerquerybase' => WWW_TOP.'/book-list.php?offset=', ]); $pager = $page->smarty->fetch('pager.tpl'); diff --git a/public/admin/category-edit.php b/public/admin/category-edit.php index 101970c9a..df45c7f84 100644 --- a/public/admin/category-edit.php +++ b/public/admin/category-edit.php @@ -1,11 +1,11 @@ title = 'Category List'; $categorylist = Category::getFlat(); diff --git a/public/admin/category_regexes-edit.php b/public/admin/category_regexes-edit.php index 72a27a4cf..038aad47f 100644 --- a/public/admin/category_regexes-edit.php +++ b/public/admin/category_regexes-edit.php @@ -2,11 +2,11 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Regexes; use App\Models\Category; - +$page = new AdminPage(); $regexes = new Regexes(['Settings' => $page->pdo, 'Table_Name' => 'category_regexes']); // Set the current action. diff --git a/public/admin/category_regexes-list.php b/public/admin/category_regexes-list.php index 4a6a3fdd6..d2233718f 100644 --- a/public/admin/category_regexes-list.php +++ b/public/admin/category_regexes-list.php @@ -2,10 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Regexes; - +$page = new AdminPage(); $regexes = new Regexes(['Settings' => $page->pdo, 'Table_Name' => 'category_regexes']); $page->title = 'Category Regex List'; diff --git a/public/admin/collection_regexes-edit.php b/public/admin/collection_regexes-edit.php index 523fc21a9..d4b6f24ea 100644 --- a/public/admin/collection_regexes-edit.php +++ b/public/admin/collection_regexes-edit.php @@ -2,11 +2,11 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Regexes; use App\Models\Category; - +$page = new AdminPage(); $regexes = new Regexes(['Settings' => $page->pdo, 'Table_Name' => 'collection_regexes']); $error = ''; $regex = ['id' => '', 'regex' => '', 'description' => '', 'group_regex' => '', 'ordinal' => '', 'status' => 1]; diff --git a/public/admin/collection_regexes-list.php b/public/admin/collection_regexes-list.php index a4b2270ec..2c2638aa9 100644 --- a/public/admin/collection_regexes-list.php +++ b/public/admin/collection_regexes-list.php @@ -2,10 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Regexes; - +$page = new AdminPage(); $regexes = new Regexes(['Settings' => $page->pdo, 'Table_Name' => 'collection_regexes']); $page->title = 'Collections Regex List'; diff --git a/public/admin/collection_regexes-test.php b/public/admin/collection_regexes-test.php index 13e73f3ea..2967b95ba 100644 --- a/public/admin/collection_regexes-test.php +++ b/public/admin/collection_regexes-test.php @@ -2,11 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Regexes; - - +$page = new AdminPage(); $page->title = 'Collections Regex Test'; $group = trim(request()->has('group') && ! empty(request()->input('group')) ? request()->input('group') : ''); diff --git a/public/admin/comments-delete.php b/public/admin/comments-delete.php index 4ce29b636..2defcd658 100644 --- a/public/admin/comments-delete.php +++ b/public/admin/comments-delete.php @@ -6,7 +6,6 @@ use App\Models\ReleaseComment; require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - if (request()->has('id')) { ReleaseComment::deleteComment(request()->input('id')); } diff --git a/public/admin/comments-list.php b/public/admin/comments-list.php index 1415e6a97..f99abac19 100644 --- a/public/admin/comments-list.php +++ b/public/admin/comments-list.php @@ -1,12 +1,12 @@ title = 'Comments List'; $commentcount = ReleaseComment::getCommentCount(); diff --git a/public/admin/console-edit.php b/public/admin/console-edit.php index 6be3991d4..5ce2250ca 100644 --- a/public/admin/console-edit.php +++ b/public/admin/console-edit.php @@ -5,9 +5,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Genres; use Blacklight\Console; +use Blacklight\http\AdminPage; use Illuminate\Support\Carbon; - +$page = new AdminPage(); $console = new Console(['Settings' => $page->pdo]); $gen = new Genres(); $id = 0; diff --git a/public/admin/console-list.php b/public/admin/console-list.php index 02c381b07..269fec919 100644 --- a/public/admin/console-list.php +++ b/public/admin/console-list.php @@ -4,9 +4,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Console; +use Blacklight\http\AdminPage; use Blacklight\utility\Utility; - +$page = new AdminPage(); $con = new Console(['Settings' => $page->pdo]); $page->title = 'Console List'; diff --git a/public/admin/content-add.php b/public/admin/content-add.php index a4e23f1ae..edb43654e 100644 --- a/public/admin/content-add.php +++ b/public/admin/content-add.php @@ -4,8 +4,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\User; use Blacklight\Contents; +use Blacklight\http\AdminPage; - +$page = new AdminPage(); $contents = new Contents(); $id = 0; diff --git a/public/admin/content-delete.php b/public/admin/content-delete.php index c26625380..fe0562ac8 100644 --- a/public/admin/content-delete.php +++ b/public/admin/content-delete.php @@ -4,9 +4,6 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Contents; - - - if (request()->has('id')) { $contents = new Contents(); $contents->delete(request()->input('id')); diff --git a/public/admin/content-list.php b/public/admin/content-list.php index a9325cb37..f70c099c1 100644 --- a/public/admin/content-list.php +++ b/public/admin/content-list.php @@ -3,8 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Contents; +use Blacklight\http\AdminPage; - +$page = new AdminPage(); $contents = new Contents(); $contentlist = $contents->getAll(); diff --git a/public/admin/failrel-list.php b/public/admin/failrel-list.php index 6a80411ed..f05242e24 100644 --- a/public/admin/failrel-list.php +++ b/public/admin/failrel-list.php @@ -4,9 +4,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Release; use App\Models\DnzbFailure; +use Blacklight\http\AdminPage; - - +$page = new AdminPage(); $page->title = 'Failed Releases List'; diff --git a/public/admin/forum-delete.php b/public/admin/forum-delete.php index 68c074dc1..b580eb164 100644 --- a/public/admin/forum-delete.php +++ b/public/admin/forum-delete.php @@ -2,11 +2,9 @@ use App\Models\Forumpost; - require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - if (request()->has('id')) { Forumpost::deletePost(request()->input('id')); } diff --git a/public/admin/game-edit.php b/public/admin/game-edit.php index e7a969a3a..7dacc72a0 100644 --- a/public/admin/game-edit.php +++ b/public/admin/game-edit.php @@ -5,9 +5,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Games; use Blacklight\Genres; +use Blacklight\http\AdminPage; use Illuminate\Support\Carbon; - +$page = new AdminPage(); $games = new Games(['Settings' => $page->pdo]); $gen = new Genres(['Settings' => $page->pdo]); $id = 0; diff --git a/public/admin/game-list.php b/public/admin/game-list.php index 631ecb652..e7efd3d79 100644 --- a/public/admin/game-list.php +++ b/public/admin/game-list.php @@ -3,9 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Games; +use Blacklight\http\AdminPage; - - +$page = new AdminPage(); $game = new Games(['Settings' => $page->pdo]); $page->title = 'Game List'; diff --git a/public/admin/group-bulk.php b/public/admin/group-bulk.php index c18d3d96e..62a9df7ba 100644 --- a/public/admin/group-bulk.php +++ b/public/admin/group-bulk.php @@ -3,9 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Group; +use Blacklight\http\AdminPage; - - +$page = new AdminPage(); // set the current action $action = request()->input('action') ?? 'view'; diff --git a/public/admin/group-edit.php b/public/admin/group-edit.php index ae9fae3fd..1f4b58c4c 100644 --- a/public/admin/group-edit.php +++ b/public/admin/group-edit.php @@ -3,8 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Group; +use Blacklight\http\AdminPage; - +$page = new AdminPage(); $id = 0; diff --git a/public/admin/group-list-active.php b/public/admin/group-list-active.php index 71f2da068..bff6cbb13 100644 --- a/public/admin/group-list-active.php +++ b/public/admin/group-list-active.php @@ -3,9 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Group; +use Blacklight\http\AdminPage; - - +$page = new AdminPage(); $gname = ''; if (! empty(request()->input('groupname'))) { diff --git a/public/admin/group-list-inactive.php b/public/admin/group-list-inactive.php index 870e164b8..306baff90 100644 --- a/public/admin/group-list-inactive.php +++ b/public/admin/group-list-inactive.php @@ -3,9 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Group; +use Blacklight\http\AdminPage; - - +$page = new AdminPage(); $gname = ''; if (! empty(request()->input('groupname'))) { diff --git a/public/admin/group-list.php b/public/admin/group-list.php index 300f07c6e..744807b3f 100644 --- a/public/admin/group-list.php +++ b/public/admin/group-list.php @@ -3,9 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Group; +use Blacklight\http\AdminPage; - - +$page = new AdminPage(); $groupName = request()->input('groupname') ?? ''; $offset = request()->input('offset') ?? 0; diff --git a/public/admin/menu-delete.php b/public/admin/menu-delete.php index e74c7b085..19d1fcd08 100644 --- a/public/admin/menu-delete.php +++ b/public/admin/menu-delete.php @@ -4,9 +4,6 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Menu; - - - if (request()->has('id')) { Menu::deleteMenu(request()->input('id')); } diff --git a/public/admin/menu-edit.php b/public/admin/menu-edit.php index 5ee1ad064..0c860d789 100644 --- a/public/admin/menu-edit.php +++ b/public/admin/menu-edit.php @@ -4,8 +4,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Menu; use App\Models\UserRole; +use Blacklight\http\AdminPage; - +$page = new AdminPage(); $id = 0; diff --git a/public/admin/menu-list.php b/public/admin/menu-list.php index 3bbee8d2f..5ee08470b 100644 --- a/public/admin/menu-list.php +++ b/public/admin/menu-list.php @@ -1,11 +1,11 @@ title = 'Menu List'; diff --git a/public/admin/movie-add.php b/public/admin/movie-add.php index 7bd7925a3..e62389c84 100644 --- a/public/admin/movie-add.php +++ b/public/admin/movie-add.php @@ -2,10 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Movie; - +$page = new AdminPage(); $movie = new Movie(['Settings' => $page->pdo]); $id = 0; diff --git a/public/admin/movie-edit.php b/public/admin/movie-edit.php index 7e345c100..81bd8d6b6 100644 --- a/public/admin/movie-edit.php +++ b/public/admin/movie-edit.php @@ -2,9 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Movie; +$page = new AdminPage(); $movie = new Movie(); $id = 0; @@ -21,53 +22,53 @@ if (request()->has('id')) { } switch ($action) { - case 'submit': - $coverLoc = WWW_DIR.'covers/movies/'.$id.'-cover.jpg'; - $backdropLoc = WWW_DIR.'covers/movies/'.$id.'-backdrop.jpg'; + case 'submit': + $coverLoc = WWW_DIR.'covers/movies/'.$id.'-cover.jpg'; + $backdropLoc = WWW_DIR.'covers/movies/'.$id.'-backdrop.jpg'; - if ($_FILES['cover']['size'] > 0) { - $tmpName = $_FILES['cover']['tmp_name']; - $file_info = getimagesize($tmpName); - if (! empty($file_info)) { - move_uploaded_file($_FILES['cover']['tmp_name'], $coverLoc); - } - } + if ($_FILES['cover']['size'] > 0) { + $tmpName = $_FILES['cover']['tmp_name']; + $file_info = getimagesize($tmpName); + if (! empty($file_info)) { + move_uploaded_file($_FILES['cover']['tmp_name'], $coverLoc); + } + } - if ($_FILES['backdrop']['size'] > 0) { - $tmpName = $_FILES['backdrop']['tmp_name']; - $file_info = getimagesize($tmpName); - if (! empty($file_info)) { - move_uploaded_file($_FILES['backdrop']['tmp_name'], $backdropLoc); - } - } + if ($_FILES['backdrop']['size'] > 0) { + $tmpName = $_FILES['backdrop']['tmp_name']; + $file_info = getimagesize($tmpName); + if (! empty($file_info)) { + move_uploaded_file($_FILES['backdrop']['tmp_name'], $backdropLoc); + } + } - request()->merge(['cover' => file_exists($coverLoc) ? 1 : 0]); - request()->merge(['backdrop' => file_exists($backdropLoc) ? 1 : 0]); + request()->merge(['cover' => file_exists($coverLoc) ? 1 : 0]); + request()->merge(['backdrop' => file_exists($backdropLoc) ? 1 : 0]); - $movie->update([ - 'actors' => request()->input('actors'), - 'backdrop' => request()->input('backdrop'), - 'cover' => request()->input('cover'), - 'director' => request()->input('director'), - 'genre' => request()->input('genre'), - 'imdbid' => $id, - 'language' => request()->input('language'), - 'plot' => request()->input('plot'), - 'rating' => request()->input('rating'), - 'tagline' => request()->input('tagline'), - 'title' => request()->input('title'), - 'year' => request()->input('year'), - ]); + $movie->update([ + 'actors' => request()->input('actors'), + 'backdrop' => request()->input('backdrop'), + 'cover' => request()->input('cover'), + 'director' => request()->input('director'), + 'genre' => request()->input('genre'), + 'imdbid' => $id, + 'language' => request()->input('language'), + 'plot' => request()->input('plot'), + 'rating' => request()->input('rating'), + 'tagline' => request()->input('tagline'), + 'title' => request()->input('title'), + 'year' => request()->input('year'), + ]); - header('Location:'.WWW_TOP.'/movie-list.php'); - die(); - break; - case 'view': - default: - $page->title = 'Movie Edit'; - $page->smarty->assign('movie', $mov); - break; - } + header('Location:'.WWW_TOP.'/movie-list.php'); + die(); + break; + case 'view': + default: + $page->title = 'Movie Edit'; + $page->smarty->assign('movie', $mov); + break; + } } $page->content = $page->smarty->fetch('movie-edit.tpl'); diff --git a/public/admin/movie-list.php b/public/admin/movie-list.php index 6158a8f35..da39813d8 100644 --- a/public/admin/movie-list.php +++ b/public/admin/movie-list.php @@ -2,10 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Movie; use Blacklight\utility\Utility; - +$page = new AdminPage(); $movie = new Movie(['Settings' => $page->pdo]); diff --git a/public/admin/music-edit.php b/public/admin/music-edit.php index 29e1914f3..f57a342f4 100644 --- a/public/admin/music-edit.php +++ b/public/admin/music-edit.php @@ -2,12 +2,12 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Music; use Blacklight\Genres; use Illuminate\Support\Carbon; - +$page = new AdminPage(); $music = new Music(); $gen = new Genres(); $id = 0; @@ -24,33 +24,33 @@ if (request()->has('id')) { } switch ($action) { - case 'submit': - $coverLoc = WWW_DIR.'covers/music/'.$id.'.jpg'; + case 'submit': + $coverLoc = WWW_DIR.'covers/music/'.$id.'.jpg'; - if ($_FILES['cover']['size'] > 0) { - $tmpName = $_FILES['cover']['tmp_name']; - $file_info = getimagesize($tmpName); - if (! empty($file_info)) { - move_uploaded_file($_FILES['cover']['tmp_name'], $coverLoc); - } - } + if ($_FILES['cover']['size'] > 0) { + $tmpName = $_FILES['cover']['tmp_name']; + $file_info = getimagesize($tmpName); + if (! empty($file_info)) { + move_uploaded_file($_FILES['cover']['tmp_name'], $coverLoc); + } + } - request()->merge(['cover' => file_exists($coverLoc) ? 1 : 0]); - request()->merge(['salesrank' => (empty(request()->input('salesrank')) || ! ctype_digit(request()->input('salesrank'))) ? 'null' : request()->input('salesrank')]); - request()->merge(['releasedate' => (empty(request()->input('releasedate')) || ! strtotime(request()->input('releasedate'))) ? $mus['releasedate'] : Carbon::parse(request()->input('releasedate'))->timestamp]); + request()->merge(['cover' => file_exists($coverLoc) ? 1 : 0]); + request()->merge(['salesrank' => (empty(request()->input('salesrank')) || ! ctype_digit(request()->input('salesrank'))) ? 'null' : request()->input('salesrank')]); + request()->merge(['releasedate' => (empty(request()->input('releasedate')) || ! strtotime(request()->input('releasedate'))) ? $mus['releasedate'] : Carbon::parse(request()->input('releasedate'))->timestamp]); - $music->update($id, request()->input('title'), request()->input('asin'), request()->input('url'), request()->input('salesrank'), request()->input('artist'), request()->input('publisher'), request()->input('releasedate'), request()->input('year'), request()->input('tracks'), request()->input('cover'), request()->input('genre')); + $music->update($id, request()->input('title'), request()->input('asin'), request()->input('url'), request()->input('salesrank'), request()->input('artist'), request()->input('publisher'), request()->input('releasedate'), request()->input('year'), request()->input('tracks'), request()->input('cover'), request()->input('genre')); - header('Location:'.WWW_TOP.'/music-list.php'); - die(); - break; - case 'view': - default: - $page->title = 'Music Edit'; - $page->smarty->assign('music', $mus); - $page->smarty->assign('genres', $gen->getGenres(Genres::MUSIC_TYPE)); - break; - } + header('Location:'.WWW_TOP.'/music-list.php'); + die(); + break; + case 'view': + default: + $page->title = 'Music Edit'; + $page->smarty->assign('music', $mus); + $page->smarty->assign('genres', $gen->getGenres(Genres::MUSIC_TYPE)); + break; + } } $page->content = $page->smarty->fetch('music-edit.tpl'); diff --git a/public/admin/music-list.php b/public/admin/music-list.php index fae5e0513..1a4f058b7 100644 --- a/public/admin/music-list.php +++ b/public/admin/music-list.php @@ -2,11 +2,11 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Music; use Blacklight\utility\Utility; - +$page = new AdminPage(); $music = new Music(); diff --git a/public/admin/nzb-export.php b/public/admin/nzb-export.php index 8c3ac6bc6..8440f3fe7 100644 --- a/public/admin/nzb-export.php +++ b/public/admin/nzb-export.php @@ -2,7 +2,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Releases; use Blacklight\NZBExport; @@ -11,7 +11,7 @@ if (\Blacklight\utility\Utility::isCLI()) { PHP_EOL); } - +$page = new AdminPage(); $rel = new Releases(['Settings' => $page->pdo]); if ($page->isPostBack()) { diff --git a/public/admin/nzb-import.php b/public/admin/nzb-import.php index c4fa3b339..c818e91d4 100644 --- a/public/admin/nzb-import.php +++ b/public/admin/nzb-import.php @@ -7,10 +7,10 @@ if (PHP_SAPI === 'cli') { require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\NZBImport; - +$page = new AdminPage(); $filesToProcess = []; if ($page->isPostBack()) { diff --git a/public/admin/opcachestats.php b/public/admin/opcachestats.php index 46c9cb490..b577dd05f 100644 --- a/public/admin/opcachestats.php +++ b/public/admin/opcachestats.php @@ -3,11 +3,11 @@ /* #newznab-tmux */ - +use Blacklight\http\AdminPage; require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +$page = new AdminPage(); $NNURL = $page->serverurl; /* #newznab-tmux */ diff --git a/public/admin/poster-delete.php b/public/admin/poster-delete.php index bdf0c78e2..5f703ab09 100644 --- a/public/admin/poster-delete.php +++ b/public/admin/poster-delete.php @@ -4,9 +4,6 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\MultigroupPoster; - - - if (request()->has('id')) { MultigroupPoster::query()->where('id', '=', request()->input('id'))->delete(); } diff --git a/public/admin/posters-edit.php b/public/admin/posters-edit.php index d04f7818a..2237aa162 100644 --- a/public/admin/posters-edit.php +++ b/public/admin/posters-edit.php @@ -4,9 +4,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\MultigroupPoster; +use Blacklight\http\AdminPage; use Blacklight\processing\ProcessReleasesMultiGroup; - +$page = new AdminPage(); $relPosters = new ProcessReleasesMultiGroup(['Settings' => $page->pdo]); // Set the current action. diff --git a/public/admin/posters-list.php b/public/admin/posters-list.php index 1b691ed7c..474d58d95 100644 --- a/public/admin/posters-list.php +++ b/public/admin/posters-list.php @@ -3,9 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\MultigroupPoster; +use Blacklight\http\AdminPage; - - +$page = new AdminPage(); $posters = MultigroupPoster::all('id', 'poster')->sortBy('poster'); diff --git a/public/admin/predb.php b/public/admin/predb.php index 3cced6ca2..38c74b691 100644 --- a/public/admin/predb.php +++ b/public/admin/predb.php @@ -1,11 +1,11 @@ has('offset') && ctype_digit(request()->input('offset'))) ? request()->input('offset') : 0; diff --git a/public/admin/release-delete.php b/public/admin/release-delete.php index 15e9a6167..5cb8e905d 100644 --- a/public/admin/release-delete.php +++ b/public/admin/release-delete.php @@ -5,8 +5,6 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Releases; - - if (request()->has('id')) { $releases = new Releases(['Settings' => $page->pdo]); $releases->deleteMultiple(request()->input('id')); diff --git a/public/admin/release-edit.php b/public/admin/release-edit.php index b48a64482..c9010aec0 100644 --- a/public/admin/release-edit.php +++ b/public/admin/release-edit.php @@ -5,9 +5,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Release; use App\Models\Category; +use Blacklight\http\AdminPage; use Blacklight\Releases; - +$page = new AdminPage(); $releases = new Releases(['Settings' => $page->pdo]); $id = 0; diff --git a/public/admin/release-files.php b/public/admin/release-files.php index 6fa5955ff..ee4ccf71e 100644 --- a/public/admin/release-files.php +++ b/public/admin/release-files.php @@ -2,7 +2,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\NZB; use App\Models\User; use Blacklight\db\DB; diff --git a/public/admin/release-list.php b/public/admin/release-list.php index ad29b0d73..69b1a4770 100644 --- a/public/admin/release-list.php +++ b/public/admin/release-list.php @@ -3,9 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Release; +use Blacklight\http\AdminPage; - - +$page = new AdminPage(); $page->title = 'Release List'; diff --git a/public/admin/release_naming_regexes-edit.php b/public/admin/release_naming_regexes-edit.php index 7f22a4955..fc5c57e02 100644 --- a/public/admin/release_naming_regexes-edit.php +++ b/public/admin/release_naming_regexes-edit.php @@ -2,11 +2,11 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Regexes; use App\Models\Category; - +$page = new AdminPage(); $regexes = new Regexes(['Settings' => $page->pdo, 'Table_Name' => 'release_naming_regexes']); // Set the current action. diff --git a/public/admin/release_naming_regexes-list.php b/public/admin/release_naming_regexes-list.php index 5afcb3e19..06e62f0c1 100644 --- a/public/admin/release_naming_regexes-list.php +++ b/public/admin/release_naming_regexes-list.php @@ -2,10 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Regexes; - +$page = new AdminPage(); $regexes = new Regexes(['Settings' => $page->pdo, 'Table_Name' => 'release_naming_regexes']); $page->title = 'Release Naming Regex List'; diff --git a/public/admin/release_naming_regexes-test.php b/public/admin/release_naming_regexes-test.php index a05e71b57..797a2c49a 100644 --- a/public/admin/release_naming_regexes-test.php +++ b/public/admin/release_naming_regexes-test.php @@ -2,11 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Regexes; - - +$page = new AdminPage(); $page->title = 'Release Naming Regex Test'; $group = trim(request()->has('group') && ! empty(request()->input('group')) ? request()->input('group') : ''); diff --git a/public/admin/role-delete.php b/public/admin/role-delete.php index 694c9e1f4..141881897 100644 --- a/public/admin/role-delete.php +++ b/public/admin/role-delete.php @@ -4,9 +4,6 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\UserRole; - - - if (request()->has('id')) { UserRole::deleteRole(request()->input('id')); } diff --git a/public/admin/role-edit.php b/public/admin/role-edit.php index ec66d2001..a65acda03 100644 --- a/public/admin/role-edit.php +++ b/public/admin/role-edit.php @@ -5,10 +5,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Category; use App\Models\UserRole; use App\Models\RoleExcludedCategory; +use Blacklight\http\AdminPage; - - - +$page = new AdminPage(); // Get the user roles. $userRoles = UserRole::getRoles(); $roles = []; diff --git a/public/admin/role-list.php b/public/admin/role-list.php index 076841d06..83b4b9faf 100644 --- a/public/admin/role-list.php +++ b/public/admin/role-list.php @@ -3,9 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\UserRole; +use Blacklight\http\AdminPage; - - +$page = new AdminPage(); $page->title = 'User Role List'; diff --git a/public/admin/sharing.php b/public/admin/sharing.php index 0877e3d5b..8282a1abf 100644 --- a/public/admin/sharing.php +++ b/public/admin/sharing.php @@ -3,8 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\db\DB; +use Blacklight\http\AdminPage; - +$page = new AdminPage(); $page->title = 'Sharing Settings'; diff --git a/public/admin/show-delete.php b/public/admin/show-delete.php index daed4bd78..4f8b8bffe 100755 --- a/public/admin/show-delete.php +++ b/public/admin/show-delete.php @@ -6,7 +6,6 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; require_once NN_WWW.'pages/smartyTV.php'; - if (request()->has('id')) { (new smartyTV(['Settings' => $page->pdo]))->delete(request()->input('id')); } diff --git a/public/admin/show-edit.php b/public/admin/show-edit.php index efa743dde..789e0a667 100755 --- a/public/admin/show-edit.php +++ b/public/admin/show-edit.php @@ -1,12 +1,12 @@ $page->pdo]); switch (request()->input('action') ?? 'view') { diff --git a/public/admin/show-list.php b/public/admin/show-list.php index 8bc6cfa40..1b0622457 100755 --- a/public/admin/show-list.php +++ b/public/admin/show-list.php @@ -1,11 +1,11 @@ title = 'TV Shows List'; diff --git a/public/admin/show-remove.php b/public/admin/show-remove.php index d40ab7a65..28d9581b7 100755 --- a/public/admin/show-remove.php +++ b/public/admin/show-remove.php @@ -3,9 +3,9 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Release; +use Blacklight\http\AdminPage; - - +$page = new AdminPage(); $success = false; diff --git a/public/admin/site-edit.php b/public/admin/site-edit.php index 2aa9da707..24dd75ecb 100644 --- a/public/admin/site-edit.php +++ b/public/admin/site-edit.php @@ -2,14 +2,14 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Sites; use Blacklight\SABnzbd; use App\Models\Category; use App\Models\Settings; use Blacklight\utility\Utility; -use App\Models\Category as CategoryModel; +$page = new AdminPage(); $sites = new Sites(); $id = 0; @@ -134,7 +134,7 @@ $page->smarty->assign('lookup_reqids_names', ['Disabled', 'Lookup Request IDs', $page->smarty->assign('coversPath', NN_COVERS); // return a list of audiobooks, mags, ebooks, technical and foreign books -$result = CategoryModel::query()->whereIn('id', [Category::MUSIC_AUDIOBOOK, Category::BOOKS_MAGAZINES, Category::BOOKS_TECHNICAL, Category::BOOKS_FOREIGN])->get(['id', 'title']); +$result = Category::query()->whereIn('id', [Category::MUSIC_AUDIOBOOK, Category::BOOKS_MAGAZINES, Category::BOOKS_TECHNICAL, Category::BOOKS_FOREIGN])->get(['id', 'title']); // setup the display lists for these categories, this could have been static, but then if names changed they would be wrong $book_reqids_ids = []; diff --git a/public/admin/site-stats.php b/public/admin/site-stats.php index d4b22cb08..156e99658 100644 --- a/public/admin/site-stats.php +++ b/public/admin/site-stats.php @@ -6,9 +6,9 @@ use App\Models\User; use App\Models\Release; use App\Models\Category; use App\Models\UserRole; +use Blacklight\http\AdminPage; - - +$page = new AdminPage(); $page->title = 'Site Stats'; diff --git a/public/admin/tmux-edit.php b/public/admin/tmux-edit.php index 367209ce2..0adb6e3eb 100644 --- a/public/admin/tmux-edit.php +++ b/public/admin/tmux-edit.php @@ -2,10 +2,11 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +use Blacklight\http\AdminPage; use Blacklight\Tmux; use App\Models\Settings; +$page = new AdminPage(); $tmux = new Tmux(); $id = 0; diff --git a/public/admin/user-delete.php b/public/admin/user-delete.php index 7e70c8deb..3098d4fcd 100644 --- a/public/admin/user-delete.php +++ b/public/admin/user-delete.php @@ -4,9 +4,6 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\User; - - - if (request()->has('id')) { User::deleteUser(request()->input('id')); } diff --git a/public/admin/user-edit.php b/public/admin/user-edit.php index 366b98aa4..d03c6116b 100644 --- a/public/admin/user-edit.php +++ b/public/admin/user-edit.php @@ -7,9 +7,10 @@ use App\Models\UserRole; use App\Models\Invitation; use App\Mail\AccountChange; +use Blacklight\http\AdminPage; use Illuminate\Support\Facades\Mail; - +$page = new AdminPage(); $user = [ 'id' => '', diff --git a/public/admin/user-list.php b/public/admin/user-list.php index 71b33ef73..9d70aaed3 100644 --- a/public/admin/user-list.php +++ b/public/admin/user-list.php @@ -2,11 +2,11 @@ use App\Models\User; use App\Models\UserRole; - +use Blacklight\http\AdminPage; require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; - +$page = new AdminPage(); $page->title = 'User List';