From 60f2544dc13e4e592fef176ad8dd6da9155923b5 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Tue, 6 Mar 2018 12:26:58 +0100 Subject: [PATCH] Move BasePage, AdminPage and Page to Blacklight\http --- .../pages => Blacklight/http}/AdminPage.php | 1 + .../pages => Blacklight/http}/BasePage.php | 1 + {public/pages => Blacklight/http}/Page.php | 2 ++ Changelog | 1 + public/admin/ajax.php | 2 +- public/admin/ajax_binaryblacklist-list.php | 1 + public/admin/ajax_group-edit.php | 1 + public/admin/ajax_regex-list.php | 1 + public/admin/ajax_regex.php | 1 + public/admin/ajax_sharing_settings.php | 1 + public/admin/anidb-delete.php | 3 +- public/admin/anidb-edit.php | 3 +- public/admin/anidb-list.php | 3 +- public/admin/anidb-remove.php | 3 +- public/admin/binaryblacklist-edit.php | 3 +- public/admin/binaryblacklist-list.php | 3 +- public/admin/book-edit.php | 3 +- public/admin/book-list.php | 3 +- public/admin/category-edit.php | 31 ++++++++++++------- public/admin/category-list.php | 3 +- public/admin/category_regexes-edit.php | 3 +- public/admin/category_regexes-list.php | 3 +- public/admin/collection_regexes-edit.php | 5 +-- public/admin/collection_regexes-list.php | 3 +- public/admin/collection_regexes-test.php | 3 +- public/admin/comments-delete.php | 3 +- public/admin/comments-list.php | 3 +- public/admin/console-edit.php | 3 +- public/admin/console-list.php | 3 +- public/admin/content-add.php | 3 +- public/admin/content-delete.php | 3 +- public/admin/content-list.php | 3 +- public/admin/failrel-list.php | 3 +- public/admin/forum-delete.php | 3 +- public/admin/game-edit.php | 3 +- public/admin/game-list.php | 3 +- public/admin/group-bulk.php | 3 +- public/admin/group-edit.php | 3 +- public/admin/group-list-active.php | 3 +- public/admin/group-list-inactive.php | 3 +- public/admin/group-list.php | 3 +- public/admin/index.php | 2 ++ public/admin/menu-delete.php | 3 +- public/admin/menu-edit.php | 3 +- public/admin/menu-list.php | 3 +- public/admin/movie-add.php | 3 +- public/admin/movie-edit.php | 3 +- public/admin/movie-list.php | 3 +- public/admin/music-edit.php | 3 +- public/admin/music-list.php | 3 +- public/admin/nzb-export.php | 3 +- public/admin/nzb-import.php | 3 +- public/admin/opcachestats.php | 5 ++- public/admin/poster-delete.php | 3 +- public/admin/posters-edit.php | 3 +- public/admin/posters-list.php | 3 +- public/admin/predb.php | 3 +- public/admin/release-delete.php | 3 +- public/admin/release-edit.php | 3 +- public/admin/release-files.php | 1 + public/admin/release-list.php | 3 +- public/admin/release_naming_regexes-edit.php | 3 +- public/admin/release_naming_regexes-list.php | 3 +- public/admin/release_naming_regexes-test.php | 3 +- public/admin/role-delete.php | 3 +- public/admin/role-edit.php | 3 +- public/admin/role-list.php | 3 +- public/admin/sharing.php | 3 +- public/admin/show-delete.php | 4 ++- public/admin/show-edit.php | 3 +- public/admin/show-list.php | 3 +- public/admin/show-remove.php | 3 +- public/admin/site-edit.php | 3 +- public/admin/site-stats.php | 3 +- public/admin/tmux-edit.php | 3 +- public/admin/user-delete.php | 3 +- public/admin/user-edit.php | 3 +- public/admin/user-list.php | 3 +- public/index.php | 2 ++ public/pages/ajax_mediainfo.php | 1 - public/pages/ajax_resetusergrabs-admin.php | 1 + public/pages/btc_payment.php | 1 + 82 files changed, 171 insertions(+), 80 deletions(-) rename {public/pages => Blacklight/http}/AdminPage.php (97%) rename {public/pages => Blacklight/http}/BasePage.php (99%) rename {public/pages => Blacklight/http}/Page.php (98%) diff --git a/public/pages/AdminPage.php b/Blacklight/http/AdminPage.php similarity index 97% rename from public/pages/AdminPage.php rename to Blacklight/http/AdminPage.php index 2e3b4fd23..f0b4ccc62 100644 --- a/public/pages/AdminPage.php +++ b/Blacklight/http/AdminPage.php @@ -1,4 +1,5 @@ has('action')) { diff --git a/public/admin/ajax_binaryblacklist-list.php b/public/admin/ajax_binaryblacklist-list.php index ac94b71d9..7267803b5 100644 --- a/public/admin/ajax_binaryblacklist-list.php +++ b/public/admin/ajax_binaryblacklist-list.php @@ -4,6 +4,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Binaries; + // login check $page = new AdminPage; $bin = new Binaries(); diff --git a/public/admin/ajax_group-edit.php b/public/admin/ajax_group-edit.php index 8c5099553..c9be3529a 100644 --- a/public/admin/ajax_group-edit.php +++ b/public/admin/ajax_group-edit.php @@ -4,6 +4,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Group; + $page = new AdminPage; // session_write_close(); allows the admin to use the site while the ajax request is being processed. diff --git a/public/admin/ajax_regex-list.php b/public/admin/ajax_regex-list.php index b2ba83226..a9465fcb7 100644 --- a/public/admin/ajax_regex-list.php +++ b/public/admin/ajax_regex-list.php @@ -2,6 +2,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + use Blacklight\ReleaseRegex; // login check diff --git a/public/admin/ajax_regex.php b/public/admin/ajax_regex.php index aa36e5334..bfe4cc29b 100644 --- a/public/admin/ajax_regex.php +++ b/public/admin/ajax_regex.php @@ -2,6 +2,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + use Blacklight\Regexes; use Blacklight\Binaries; diff --git a/public/admin/ajax_sharing_settings.php b/public/admin/ajax_sharing_settings.php index 4c4ab92f0..b92d1d08c 100644 --- a/public/admin/ajax_sharing_settings.php +++ b/public/admin/ajax_sharing_settings.php @@ -3,6 +3,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\db\DB; + use Blacklight\Sharing; use App\Models\ReleaseComment; diff --git a/public/admin/anidb-delete.php b/public/admin/anidb-delete.php index 14f004a15..d8360643a 100644 --- a/public/admin/anidb-delete.php +++ b/public/admin/anidb-delete.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\AniDB; -$page = new AdminPage(); + + if (request()->has('id')) { $AniDB = new AniDB(); diff --git a/public/admin/anidb-edit.php b/public/admin/anidb-edit.php index 80b3b77ba..15b3fc78b 100644 --- a/public/admin/anidb-edit.php +++ b/public/admin/anidb-edit.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\AniDB; -$page = new AdminPage(); + + $AniDB = new AniDB(['Settings' => $page->pdo]); $id = 0; diff --git a/public/admin/anidb-list.php b/public/admin/anidb-list.php index 6a2b4d0f7..d594d7f99 100644 --- a/public/admin/anidb-list.php +++ b/public/admin/anidb-list.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\AniDB; -$page = new AdminPage(); + + $AniDB = new AniDB(); diff --git a/public/admin/anidb-remove.php b/public/admin/anidb-remove.php index 582f81592..9a1b47872 100644 --- a/public/admin/anidb-remove.php +++ b/public/admin/anidb-remove.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Release; -$page = new AdminPage(); + + $success = false; diff --git a/public/admin/binaryblacklist-edit.php b/public/admin/binaryblacklist-edit.php index 9898d468f..38102ffd8 100644 --- a/public/admin/binaryblacklist-edit.php +++ b/public/admin/binaryblacklist-edit.php @@ -5,7 +5,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Category; use Blacklight\Binaries; -$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 0351ee310..14c015e31 100644 --- a/public/admin/binaryblacklist-list.php +++ b/public/admin/binaryblacklist-list.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Binaries; -$page = new AdminPage(); + + $bin = new Binaries(); diff --git a/public/admin/book-edit.php b/public/admin/book-edit.php index 4e01df029..3d911f9eb 100644 --- a/public/admin/book-edit.php +++ b/public/admin/book-edit.php @@ -4,9 +4,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Books; use Blacklight\Genres; + use Illuminate\Support\Carbon; -$page = new AdminPage(); + $book = new Books(); $gen = new Genres(); $id = 0; diff --git a/public/admin/book-list.php b/public/admin/book-list.php index f641d7a66..eadf3f62e 100644 --- a/public/admin/book-list.php +++ b/public/admin/book-list.php @@ -3,9 +3,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Books; + use Blacklight\utility\Utility; -$page = new AdminPage(); + $book = new Books(); diff --git a/public/admin/category-edit.php b/public/admin/category-edit.php index 753e0daad..101970c9a 100644 --- a/public/admin/category-edit.php +++ b/public/admin/category-edit.php @@ -2,9 +2,10 @@ use App\Models\Category; + require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; -$page = new AdminPage(); + $id = 0; // set the current action @@ -12,19 +13,25 @@ $action = request()->input('action') ?? 'view'; switch ($action) { case 'submit': - $ret = Category::updateCategory(request()->input('id'), request()->input('status'), request()->input('description'), - request()->input('disablepreview'), request()->input('minsizetoformrelease'), request()->input('maxsizetoformrelease')); - header('Location:'.WWW_TOP.'/category-list.php'); - break; + $ret = Category::updateCategory( + request()->input('id'), + request()->input('status'), + request()->input('description'), + request()->input('disablepreview'), + request()->input('minsizetoformrelease'), + request()->input('maxsizetoformrelease') + ); + header('Location:'.WWW_TOP.'/category-list.php'); + break; case 'view': default: - if (request()->has('id')) { - $page->title = 'Category Edit'; - $id = request()->input('id'); - $cat = Category::find($id); - $page->smarty->assign('category', $cat); - } - break; + if (request()->has('id')) { + $page->title = 'Category Edit'; + $id = request()->input('id'); + $cat = Category::find($id); + $page->smarty->assign('category', $cat); + } + break; } $page->smarty->assign('status_ids', [Category::STATUS_ACTIVE, Category::STATUS_INACTIVE]); diff --git a/public/admin/category-list.php b/public/admin/category-list.php index 53cbfc601..3fa7991d5 100644 --- a/public/admin/category-list.php +++ b/public/admin/category-list.php @@ -2,9 +2,10 @@ use App\Models\Category; + require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; -$page = new AdminPage(); + $page->title = 'Category List'; diff --git a/public/admin/category_regexes-edit.php b/public/admin/category_regexes-edit.php index 24d868519..72a27a4cf 100644 --- a/public/admin/category_regexes-edit.php +++ b/public/admin/category_regexes-edit.php @@ -2,10 +2,11 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + 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 5c29aa1cc..4a6a3fdd6 100644 --- a/public/admin/category_regexes-list.php +++ b/public/admin/category_regexes-list.php @@ -2,9 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + 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 88fbe0546..523fc21a9 100644 --- a/public/admin/collection_regexes-edit.php +++ b/public/admin/collection_regexes-edit.php @@ -2,10 +2,11 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + 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]; @@ -23,7 +24,7 @@ switch (request()->input('action') ?? 'view') { } if (request()->input('description') === '') { - request()->input('description') = ''; + request()->merge(['description' => '']); } if (! is_numeric(request()->input('ordinal')) || request()->input('ordinal') < 0) { diff --git a/public/admin/collection_regexes-list.php b/public/admin/collection_regexes-list.php index b6605c183..a4b2270ec 100644 --- a/public/admin/collection_regexes-list.php +++ b/public/admin/collection_regexes-list.php @@ -2,9 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + 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 815079fda..13e73f3ea 100644 --- a/public/admin/collection_regexes-test.php +++ b/public/admin/collection_regexes-test.php @@ -2,9 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + use Blacklight\Regexes; -$page = new AdminPage(); + $page->title = 'Collections Regex Test'; diff --git a/public/admin/comments-delete.php b/public/admin/comments-delete.php index 4f37bbbd0..4ce29b636 100644 --- a/public/admin/comments-delete.php +++ b/public/admin/comments-delete.php @@ -2,9 +2,10 @@ use App\Models\ReleaseComment; + require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; -$page = new AdminPage(); + if (request()->has('id')) { ReleaseComment::deleteComment(request()->input('id')); diff --git a/public/admin/comments-list.php b/public/admin/comments-list.php index d7e6ad989..1415e6a97 100644 --- a/public/admin/comments-list.php +++ b/public/admin/comments-list.php @@ -2,9 +2,10 @@ use App\Models\ReleaseComment; + require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; -$page = new AdminPage(); + $page->title = 'Comments List'; diff --git a/public/admin/console-edit.php b/public/admin/console-edit.php index 22d315232..6be3991d4 100644 --- a/public/admin/console-edit.php +++ b/public/admin/console-edit.php @@ -4,9 +4,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Genres; use Blacklight\Console; + 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 cab851d26..02c381b07 100644 --- a/public/admin/console-list.php +++ b/public/admin/console-list.php @@ -3,9 +3,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Console; + 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 13b267297..a4e23f1ae 100644 --- a/public/admin/content-add.php +++ b/public/admin/content-add.php @@ -5,7 +5,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\User; use Blacklight\Contents; -$page = new AdminPage(); + + $contents = new Contents(); $id = 0; diff --git a/public/admin/content-delete.php b/public/admin/content-delete.php index 2191365d0..c26625380 100644 --- a/public/admin/content-delete.php +++ b/public/admin/content-delete.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Contents; -$page = new AdminPage(); + + if (request()->has('id')) { $contents = new Contents(); diff --git a/public/admin/content-list.php b/public/admin/content-list.php index 5e723a595..a9325cb37 100644 --- a/public/admin/content-list.php +++ b/public/admin/content-list.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Contents; -$page = new AdminPage(); + + $contents = new Contents(); $contentlist = $contents->getAll(); $page->smarty->assign('contentlist', $contentlist); diff --git a/public/admin/failrel-list.php b/public/admin/failrel-list.php index 95cebc9c3..6a80411ed 100644 --- a/public/admin/failrel-list.php +++ b/public/admin/failrel-list.php @@ -5,7 +5,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Release; use App\Models\DnzbFailure; -$page = new AdminPage(); + + $page->title = 'Failed Releases List'; diff --git a/public/admin/forum-delete.php b/public/admin/forum-delete.php index 3bd9c99b7..68c074dc1 100644 --- a/public/admin/forum-delete.php +++ b/public/admin/forum-delete.php @@ -2,9 +2,10 @@ use App\Models\Forumpost; + require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; -$page = new AdminPage(); + if (request()->has('id')) { Forumpost::deletePost(request()->input('id')); diff --git a/public/admin/game-edit.php b/public/admin/game-edit.php index 176995c96..e7a969a3a 100644 --- a/public/admin/game-edit.php +++ b/public/admin/game-edit.php @@ -4,9 +4,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Games; use Blacklight\Genres; + 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 6dc4f5827..631ecb652 100644 --- a/public/admin/game-list.php +++ b/public/admin/game-list.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\Games; -$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 0628fadc5..c18d3d96e 100644 --- a/public/admin/group-bulk.php +++ b/public/admin/group-bulk.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Group; -$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 0f2f6aacd..ae9fae3fd 100644 --- a/public/admin/group-edit.php +++ b/public/admin/group-edit.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Group; -$page = new AdminPage(); + + $id = 0; // Set the current action. diff --git a/public/admin/group-list-active.php b/public/admin/group-list-active.php index b59d209b9..71f2da068 100644 --- a/public/admin/group-list-active.php +++ b/public/admin/group-list-active.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Group; -$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 b1dc6d132..870e164b8 100644 --- a/public/admin/group-list-inactive.php +++ b/public/admin/group-list-inactive.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Group; -$page = new AdminPage(); + + $gname = ''; if (! empty(request()->input('groupname'))) { diff --git a/public/admin/group-list.php b/public/admin/group-list.php index 2760b86ef..300f07c6e 100644 --- a/public/admin/group-list.php +++ b/public/admin/group-list.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Group; -$page = new AdminPage(); + + $groupName = request()->input('groupname') ?? ''; $offset = request()->input('offset') ?? 0; diff --git a/public/admin/index.php b/public/admin/index.php index c9dc42ca7..427b2a0bf 100644 --- a/public/admin/index.php +++ b/public/admin/index.php @@ -1,5 +1,7 @@ has('id')) { Menu::deleteMenu(request()->input('id')); diff --git a/public/admin/menu-edit.php b/public/admin/menu-edit.php index 36564f926..5ee1ad064 100644 --- a/public/admin/menu-edit.php +++ b/public/admin/menu-edit.php @@ -5,7 +5,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Menu; use App\Models\UserRole; -$page = new AdminPage(); + + $id = 0; // Get the user roles. diff --git a/public/admin/menu-list.php b/public/admin/menu-list.php index d46d9d875..3bbee8d2f 100644 --- a/public/admin/menu-list.php +++ b/public/admin/menu-list.php @@ -2,9 +2,10 @@ use App\Models\Menu; + require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; -$page = new AdminPage(); + $page->title = 'Menu List'; diff --git a/public/admin/movie-add.php b/public/admin/movie-add.php index 53715ad1a..7bd7925a3 100644 --- a/public/admin/movie-add.php +++ b/public/admin/movie-add.php @@ -2,9 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + 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 abe1f2211..7e345c100 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\Movie; -$page = new AdminPage(); + $movie = new Movie(); $id = 0; diff --git a/public/admin/movie-list.php b/public/admin/movie-list.php index 57925505a..6158a8f35 100644 --- a/public/admin/movie-list.php +++ b/public/admin/movie-list.php @@ -2,10 +2,11 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + use Blacklight\Movie; use Blacklight\utility\Utility; -$page = new AdminPage(); + $movie = new Movie(['Settings' => $page->pdo]); $page->title = 'Movie List'; diff --git a/public/admin/music-edit.php b/public/admin/music-edit.php index 6ac1ca30e..29e1914f3 100644 --- a/public/admin/music-edit.php +++ b/public/admin/music-edit.php @@ -2,11 +2,12 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + use Blacklight\Music; use Blacklight\Genres; use Illuminate\Support\Carbon; -$page = new AdminPage(); + $music = new Music(); $gen = new Genres(); $id = 0; diff --git a/public/admin/music-list.php b/public/admin/music-list.php index 9ec315a86..fae5e0513 100644 --- a/public/admin/music-list.php +++ b/public/admin/music-list.php @@ -2,10 +2,11 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + 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 f68fdab90..8c3ac6bc6 100644 --- a/public/admin/nzb-export.php +++ b/public/admin/nzb-export.php @@ -2,6 +2,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + use Blacklight\Releases; use Blacklight\NZBExport; @@ -10,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 fa372bbc0..c4fa3b339 100644 --- a/public/admin/nzb-import.php +++ b/public/admin/nzb-import.php @@ -7,9 +7,10 @@ if (PHP_SAPI === 'cli') { require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + use Blacklight\NZBImport; -$page = new AdminPage(); + $filesToProcess = []; if ($page->isPostBack()) { diff --git a/public/admin/opcachestats.php b/public/admin/opcachestats.php index efe79dce2..46c9cb490 100644 --- a/public/admin/opcachestats.php +++ b/public/admin/opcachestats.php @@ -2,9 +2,12 @@ // #newznab-tmux : Denotes modifications done for newznab-tmux integration. /* #newznab-tmux */ + + + 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 79a5fe755..bdf0c78e2 100644 --- a/public/admin/poster-delete.php +++ b/public/admin/poster-delete.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\MultigroupPoster; -$page = new AdminPage(); + + 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 abd346f95..d04f7818a 100644 --- a/public/admin/posters-edit.php +++ b/public/admin/posters-edit.php @@ -3,9 +3,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\MultigroupPoster; + 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 13a06ddd9..1b691ed7c 100644 --- a/public/admin/posters-list.php +++ b/public/admin/posters-list.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\MultigroupPoster; -$page = new AdminPage(); + + $posters = MultigroupPoster::all('id', 'poster')->sortBy('poster'); diff --git a/public/admin/predb.php b/public/admin/predb.php index 66420cf51..3cced6ca2 100644 --- a/public/admin/predb.php +++ b/public/admin/predb.php @@ -2,9 +2,10 @@ use App\Models\Predb; + require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; -$page = new AdminPage(); + $offset = (request()->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 8d6ccd7e6..15e9a6167 100644 --- a/public/admin/release-delete.php +++ b/public/admin/release-delete.php @@ -2,9 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + use Blacklight\Releases; -$page = new AdminPage(); + if (request()->has('id')) { $releases = new Releases(['Settings' => $page->pdo]); diff --git a/public/admin/release-edit.php b/public/admin/release-edit.php index 936adb597..b48a64482 100644 --- a/public/admin/release-edit.php +++ b/public/admin/release-edit.php @@ -4,9 +4,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Release; use App\Models\Category; + 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 0606134ae..6fa5955ff 100644 --- a/public/admin/release-files.php +++ b/public/admin/release-files.php @@ -2,6 +2,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + 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 e67dc46c7..ad29b0d73 100644 --- a/public/admin/release-list.php +++ b/public/admin/release-list.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Release; -$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 a117f4e4a..7f22a4955 100644 --- a/public/admin/release_naming_regexes-edit.php +++ b/public/admin/release_naming_regexes-edit.php @@ -2,10 +2,11 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + 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 753d5e378..5afcb3e19 100644 --- a/public/admin/release_naming_regexes-list.php +++ b/public/admin/release_naming_regexes-list.php @@ -2,9 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + 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 372ec3f9f..a05e71b57 100644 --- a/public/admin/release_naming_regexes-test.php +++ b/public/admin/release_naming_regexes-test.php @@ -2,9 +2,10 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + use Blacklight\Regexes; -$page = new AdminPage(); + $page->title = 'Release Naming Regex Test'; diff --git a/public/admin/role-delete.php b/public/admin/role-delete.php index dcd185ae2..694c9e1f4 100644 --- a/public/admin/role-delete.php +++ b/public/admin/role-delete.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\UserRole; -$page = new AdminPage(); + + if (request()->has('id')) { UserRole::deleteRole(request()->input('id')); diff --git a/public/admin/role-edit.php b/public/admin/role-edit.php index fbdbb0eae..ec66d2001 100644 --- a/public/admin/role-edit.php +++ b/public/admin/role-edit.php @@ -6,7 +6,8 @@ use App\Models\Category; use App\Models\UserRole; use App\Models\RoleExcludedCategory; -$page = new AdminPage(); + + // Get the user roles. $userRoles = UserRole::getRoles(); diff --git a/public/admin/role-list.php b/public/admin/role-list.php index 00a83f69d..076841d06 100644 --- a/public/admin/role-list.php +++ b/public/admin/role-list.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\UserRole; -$page = new AdminPage(); + + $page->title = 'User Role List'; diff --git a/public/admin/sharing.php b/public/admin/sharing.php index 7457b46dd..0877e3d5b 100644 --- a/public/admin/sharing.php +++ b/public/admin/sharing.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use Blacklight\db\DB; -$page = new AdminPage(); + + $page->title = 'Sharing Settings'; $db = new DB(); diff --git a/public/admin/show-delete.php b/public/admin/show-delete.php index de41df608..daed4bd78 100755 --- a/public/admin/show-delete.php +++ b/public/admin/show-delete.php @@ -1,9 +1,11 @@ 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 2af1635da..efa743dde 100755 --- a/public/admin/show-edit.php +++ b/public/admin/show-edit.php @@ -2,10 +2,11 @@ use App\Models\Video; + require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; require_once NN_WWW.'pages/smartyTV.php'; -$page = new AdminPage(); + $tv = new smartyTV(['Settings' => $page->pdo]); switch (request()->input('action') ?? 'view') { diff --git a/public/admin/show-list.php b/public/admin/show-list.php index 32838858b..8bc6cfa40 100755 --- a/public/admin/show-list.php +++ b/public/admin/show-list.php @@ -2,9 +2,10 @@ use App\Models\Video; + require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; -$page = new AdminPage(); + $page->title = 'TV Shows List'; diff --git a/public/admin/show-remove.php b/public/admin/show-remove.php index 73ebe65d0..d40ab7a65 100755 --- a/public/admin/show-remove.php +++ b/public/admin/show-remove.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\Release; -$page = new AdminPage(); + + $success = false; diff --git a/public/admin/site-edit.php b/public/admin/site-edit.php index 9e0539ede..2aa9da707 100644 --- a/public/admin/site-edit.php +++ b/public/admin/site-edit.php @@ -2,6 +2,7 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; + use Blacklight\Sites; use Blacklight\SABnzbd; use App\Models\Category; @@ -9,7 +10,7 @@ use App\Models\Settings; use Blacklight\utility\Utility; use App\Models\Category as CategoryModel; -$page = new AdminPage(); + $sites = new Sites(); $id = 0; diff --git a/public/admin/site-stats.php b/public/admin/site-stats.php index b0bf9dbd8..d4b22cb08 100644 --- a/public/admin/site-stats.php +++ b/public/admin/site-stats.php @@ -7,7 +7,8 @@ use App\Models\Release; use App\Models\Category; use App\Models\UserRole; -$page = new AdminPage(); + + $page->title = 'Site Stats'; diff --git a/public/admin/tmux-edit.php b/public/admin/tmux-edit.php index b41a0f556..367209ce2 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\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 701cb9d06..7e70c8deb 100644 --- a/public/admin/user-delete.php +++ b/public/admin/user-delete.php @@ -4,7 +4,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; use App\Models\User; -$page = new AdminPage(); + + if (request()->has('id')) { User::deleteUser(request()->input('id')); diff --git a/public/admin/user-edit.php b/public/admin/user-edit.php index 01ff5b50a..366b98aa4 100644 --- a/public/admin/user-edit.php +++ b/public/admin/user-edit.php @@ -6,9 +6,10 @@ use App\Models\User; use App\Models\UserRole; use App\Models\Invitation; use App\Mail\AccountChange; + 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 03bcf5a5e..71b33ef73 100644 --- a/public/admin/user-list.php +++ b/public/admin/user-list.php @@ -3,9 +3,10 @@ use App\Models\User; use App\Models\UserRole; + require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; -$page = new AdminPage(); + $page->title = 'User List'; diff --git a/public/index.php b/public/index.php index f501f5a5d..909ca3c6c 100644 --- a/public/index.php +++ b/public/index.php @@ -1,5 +1,7 @@ show403(); } - if (! request()->has('id')) { $page->show404(); } diff --git a/public/pages/ajax_resetusergrabs-admin.php b/public/pages/ajax_resetusergrabs-admin.php index 0442978de..cc522289f 100644 --- a/public/pages/ajax_resetusergrabs-admin.php +++ b/public/pages/ajax_resetusergrabs-admin.php @@ -2,6 +2,7 @@ use App\Models\UserRequest; use App\Models\UserDownload; +use Blacklight\http\AdminPage; $page = new AdminPage(); diff --git a/public/pages/btc_payment.php b/public/pages/btc_payment.php index ee89832ba..37c37f9b5 100644 --- a/public/pages/btc_payment.php +++ b/public/pages/btc_payment.php @@ -2,6 +2,7 @@ use App\Models\User; use App\Models\UserRole; +use Blacklight\http\Page; use Blacklight\libraries\Geary; $page = new Page();