diff --git a/Changelog b/Changelog index 94b29561c..372486861 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2019-04-11 DariusIII + * Chg: Update usage of $this->userdata in controllers 2019-04-10 DariusIII * Chg: Update laravel/framework (v5.8.10 => v5.8.11) * Chg: Reduce querying of users table in ProfileController, simplify role and permissions code checks diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php index 4844e9f16..01a2489d5 100644 --- a/app/Http/Controllers/BasePageController.php +++ b/app/Http/Controllers/BasePageController.php @@ -230,11 +230,11 @@ class BasePageController extends Controller */ protected function setUserPreferences(): void { - $this->userdata['categoryexclusions'] = User::getCategoryExclusionById(Auth::id()); + $this->userdata->categoryexclusions = User::getCategoryExclusionById(Auth::id()); // Change the theme to user's selected theme if they selected one, else use the admin one. if ((int) Settings::settingValue('site.main.userselstyle') === 1) { - $this->theme = $this->userdata['style'] ?? 'None'; + $this->theme = $this->userdata->style ?? 'None'; if ($this->theme === 'None') { $this->theme = Settings::settingValue('site.main.style'); } @@ -243,14 +243,14 @@ class BasePageController extends Controller } // Update last login every 15 mins. - if (now()->subHours(3) > $this->userdata['lastlogin']) { + if (now()->subHours(3) > $this->userdata->lastlogin) { event(new UserLoggedIn($this->userdata)); } $this->smarty->assign('userdata', $this->userdata); $this->smarty->assign('loggedin', 'true'); - if ($this->userdata['nzbvortex_api_key'] !== '' && $this->userdata['nzbvortex_server_url'] !== '') { + if ($this->userdata->nzbvortex_api_key !== '' && $this->userdata->nzbvortex_server_url !== '') { $this->smarty->assign('weHasVortex', true); } else { $this->smarty->assign('weHasVortex', false); @@ -278,7 +278,7 @@ class BasePageController extends Controller $role = User::ROLE_USER; if (! empty($this->userdata)) { - $role = $this->userdata['roles_id']; + $role = $this->userdata->roles_id; } $content = new Contents(); @@ -288,7 +288,7 @@ class BasePageController extends Controller $this->smarty->assign('recentforumpostslist', Forumpost::getPosts(Settings::settingValue('..showrecentforumposts'))); } - $parentcatlist = Category::getForMenu($this->userdata['categoryexclusions']); + $parentcatlist = Category::getForMenu($this->userdata->categoryexclusions); $this->smarty->assign('parentcatlist', $parentcatlist); $this->smarty->assign('catClass', Category::class); diff --git a/app/Http/Controllers/BooksController.php b/app/Http/Controllers/BooksController.php index 928cbd58f..30b823b47 100644 --- a/app/Http/Controllers/BooksController.php +++ b/app/Http/Controllers/BooksController.php @@ -53,7 +53,7 @@ class BooksController extends BasePageController $books = []; $page = $request->has('page') && is_numeric($request->input('page')) ? $request->input('page') : 1; $offset = ($page - 1) * config('nntmux.items_per_cover_page'); - $rslt = $book->getBookRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, $this->userdata['categoryexclusions']); + $rslt = $book->getBookRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, $this->userdata->categoryexclusions); $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_cover_page'), $page, $request->url(), $request->query()); $maxwords = 50; foreach ($results as $result) { diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index c4d88589c..d8f56038a 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -23,12 +23,12 @@ class BrowseController extends BasePageController $page = request()->has('page') && is_numeric(request()->input('page')) ? request()->input('page') : 1; $offset = ($page - 1) * config('nntmux.items_per_page'); - $rslt = $releases->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), $orderby, -1, $this->userdata['categoryexclusions'], -1); + $rslt = $releases->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), $orderby, -1, $this->userdata->categoryexclusions, -1); $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_page'), $page, request()->url(), request()->query()); $this->smarty->assign('catname', 'All'); - $this->smarty->assign('lastvisit', $this->userdata['lastlogin']); + $this->smarty->assign('lastvisit', $this->userdata->lastlogin); foreach ($results as $result) { $browse[] = $result; @@ -82,7 +82,7 @@ class BrowseController extends BasePageController $page = request()->has('page') && is_numeric(request()->input('page')) ? request()->input('page') : 1; $offset = ($page - 1) * config('nntmux.items_per_page'); - $rslt = $releases->getBrowseRange($page, $catarray, $offset, config('nntmux.items_per_page'), $orderby, -1, $this->userdata['categoryexclusions'], $grp); + $rslt = $releases->getBrowseRange($page, $catarray, $offset, config('nntmux.items_per_page'), $orderby, -1, $this->userdata->categoryexclusions, $grp); $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_page'), $page, request()->url(), request()->query()); $browse = []; @@ -93,7 +93,7 @@ class BrowseController extends BasePageController $this->smarty->assign('catname', $id); - $this->smarty->assign('lastvisit', $this->userdata['lastlogin']); + $this->smarty->assign('lastvisit', $this->userdata->lastlogin); $this->smarty->assign( [ @@ -151,7 +151,7 @@ class BrowseController extends BasePageController $group = $request->input('g'); $page = request()->has('page') && is_numeric(request()->input('page')) ? request()->input('page') : 1; $offset = ($page - 1) * config('nntmux.items_per_page'); - $rslt = $releases->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), '', -1, $this->userdata['categoryexclusions'], $group); + $rslt = $releases->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), '', -1, $this->userdata->categoryexclusions, $group); $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_page'), $page, request()->url(), request()->query()); $browse = []; @@ -191,7 +191,7 @@ class BrowseController extends BasePageController $tags = explode(',', $request->input('tags')); $page = request()->has('page') && is_numeric(request()->input('page')) ? request()->input('page') : 1; $offset = ($page - 1) * config('nntmux.items_per_page'); - $rslt = $releases->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), '', -1, $this->userdata['categoryexclusions'], -1, 0, $tags); + $rslt = $releases->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), '', -1, $this->userdata->categoryexclusions, -1, 0, $tags); $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_page'), $page, request()->url(), request()->query()); $browse = []; diff --git a/app/Http/Controllers/ConsoleController.php b/app/Http/Controllers/ConsoleController.php index b5043344a..bde4b45ad 100644 --- a/app/Http/Controllers/ConsoleController.php +++ b/app/Http/Controllers/ConsoleController.php @@ -57,7 +57,7 @@ class ConsoleController extends BasePageController $offset = ($page - 1) * config('nntmux.items_per_cover_page'); $consoles = []; - $rslt = $console->getConsoleRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, $this->userdata['categoryexclusions']); + $rslt = $console->getConsoleRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, $this->userdata->categoryexclusions); $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_cover_page'), $page, $request->url(), $request->query()); $maxwords = 50; diff --git a/app/Http/Controllers/ContentController.php b/app/Http/Controllers/ContentController.php index 02a72be92..fb963b833 100644 --- a/app/Http/Controllers/ContentController.php +++ b/app/Http/Controllers/ContentController.php @@ -20,7 +20,7 @@ class ContentController extends BasePageController $role = 0; if (! empty($this->userdata)) { - $role = $this->userdata['role']; + $role = $this->userdata->role; } /* The role column in the content table values are : diff --git a/app/Http/Controllers/DetailsController.php b/app/Http/Controllers/DetailsController.php index 96389b028..4cf6522ce 100644 --- a/app/Http/Controllers/DetailsController.php +++ b/app/Http/Controllers/DetailsController.php @@ -58,7 +58,7 @@ class DetailsController extends BasePageController $reAudio = $re->getAudio($data['id']); $reSubs = $re->getSubs($data['id']); $comments = ReleaseComment::getComments($data['id']); - $similars = $releases->searchSimilar($data['id'], $data['searchname'], $this->userdata['categoryexclusions']); + $similars = $releases->searchSimilar($data['id'], $data['searchname'], $this->userdata->categoryexclusions); $failed = DnzbFailure::getFailedCount($data['id']); $downloadedBy = UserDownload::query()->with('user')->where('releases_id', $data['id'])->get(['users_id']); diff --git a/app/Http/Controllers/GamesController.php b/app/Http/Controllers/GamesController.php index 1a9d145e5..e8f30d742 100644 --- a/app/Http/Controllers/GamesController.php +++ b/app/Http/Controllers/GamesController.php @@ -40,7 +40,7 @@ class GamesController extends BasePageController $ordering = $games->getGamesOrdering(); $orderby = request()->has('ob') && \in_array(request()->input('ob'), $ordering, false) ? request()->input('ob') : ''; $offset = ($page - 1) * config('nntmux.items_per_cover_page'); - $rslt = $games->getGamesRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, '', $this->userdata['categoryexclusions']); + $rslt = $games->getGamesRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, '', $this->userdata->categoryexclusions); $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_cover_page'), $page, $request->url(), $request->query()); $title = ($request->has('title') && ! empty($request->input('title'))) ? stripslashes($request->input('title')) : ''; diff --git a/app/Http/Controllers/GetNzbController.php b/app/Http/Controllers/GetNzbController.php index ff72d7b00..2611d2613 100644 --- a/app/Http/Controllers/GetNzbController.php +++ b/app/Http/Controllers/GetNzbController.php @@ -29,7 +29,7 @@ class GetNzbController extends BasePageController if (Auth::check()) { $uid = $this->userdata->id; $maxDownloads = $this->userdata->role->downloadrequests; - $rssToken = $this->userdata['api_token']; + $rssToken = $this->userdata->api_token; if ($this->userdata->hasRole('Disabled')) { Utility::showApiError(101); } diff --git a/app/Http/Controllers/MovieController.php b/app/Http/Controllers/MovieController.php index 1e63cea56..07dcf4d3f 100644 --- a/app/Http/Controllers/MovieController.php +++ b/app/Http/Controllers/MovieController.php @@ -79,10 +79,8 @@ class MovieController extends BasePageController $category = $cat !== null ? $cat['id'] : Category::MOVIE_ROOT; } - $cpapi = $this->userdata['cp_api']; - $cpurl = $this->userdata['cp_url']; - $this->smarty->assign('cpapi', $cpapi); - $this->smarty->assign('cpurl', $cpurl); + $this->smarty->assign('cpapi', $this->userdata->cp_api); + $this->smarty->assign('cpurl', $this->userdata->cp_url); $catarray = []; if ((int) $category !== -1) { @@ -100,7 +98,7 @@ class MovieController extends BasePageController $orderby = request()->has('ob') && \in_array(request()->input('ob'), $ordering, false) ? request()->input('ob') : ''; $movies = []; - $rslt = $movie->getMovieRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, -1, $this->userdata['categoryexclusions']); + $rslt = $movie->getMovieRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, -1, $this->userdata->categoryexclusions); $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_cover_page'), $page, $request->url(), $request->query()); foreach ($results as $result) { diff --git a/app/Http/Controllers/MusicController.php b/app/Http/Controllers/MusicController.php index 2d0800497..3b55e5a46 100644 --- a/app/Http/Controllers/MusicController.php +++ b/app/Http/Controllers/MusicController.php @@ -54,7 +54,7 @@ class MusicController extends BasePageController $orderby = request()->has('ob') && \in_array(request()->input('ob'), $ordering, false) ? request()->input('ob') : ''; $musics = []; - $rslt = $music->getMusicRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, $this->userdata['categoryexclusions']); + $rslt = $music->getMusicRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, $this->userdata->categoryexclusions); $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_cover_page'), $page, $request->url(), $request->query()); $artist = ($request->has('artist') && ! empty($request->input('artist'))) ? stripslashes($request->input('artist')) : ''; diff --git a/app/Http/Controllers/MyMoviesController.php b/app/Http/Controllers/MyMoviesController.php index d8156fcee..b0045dcc4 100644 --- a/app/Http/Controllers/MyMoviesController.php +++ b/app/Http/Controllers/MyMoviesController.php @@ -152,7 +152,7 @@ class MyMoviesController extends BasePageController $page = $request->has('page') && is_numeric($request->input('page')) ? $request->input('page') : 1; - $results = $mv->getMovieRange($page, $movie['categoryNames'], $offset, config('nntmux.items_per_cover_page'), $ordering, -1, $this->userdata['categoryexclusions']); + $results = $mv->getMovieRange($page, $movie['categoryNames'], $offset, config('nntmux.items_per_cover_page'), $ordering, -1, $this->userdata->categoryexclusions); $this->smarty->assign('covgroup', ''); @@ -160,7 +160,7 @@ class MyMoviesController extends BasePageController $this->smarty->assign('orderby'.$ordertype, WWW_TOP.'/mymovies/browse?ob='.$ordertype.'&offset=0'); } - $this->smarty->assign('lastvisit', $this->userdata['lastlogin']); + $this->smarty->assign('lastvisit', $this->userdata->lastlogin); $this->smarty->assign('results', $results); diff --git a/app/Http/Controllers/MyShowsController.php b/app/Http/Controllers/MyShowsController.php index ea1d1b4fc..5931780c5 100644 --- a/app/Http/Controllers/MyShowsController.php +++ b/app/Http/Controllers/MyShowsController.php @@ -183,9 +183,9 @@ class MyShowsController extends BasePageController $offset = ($page - 1) * config('nntmux.items_per_page'); $ordering = $releases->getBrowseOrdering(); $orderby = $request->has('ob') && \in_array($request->input('ob'), $ordering, false) ? $request->input('ob') : ''; - $browseCount = $releases->getShowsCount($shows, -1, $this->userdata['categoryexclusions']); + $browseCount = $releases->getShowsCount($shows, -1, $this->userdata->categoryexclusions); - $rslt = $releases->getShowsRange($shows ?? [], $offset, config('nntmux.items_per_page'), $orderby, -1, $this->userdata['categoryexclusions']); + $rslt = $releases->getShowsRange($shows ?? [], $offset, config('nntmux.items_per_page'), $orderby, -1, $this->userdata->categoryexclusions); $results = $this->paginate($rslt ?? [], $browseCount, config('nntmux.items_per_page'), $page, request()->url(), request()->query()); $this->smarty->assign('covgroup', ''); @@ -194,7 +194,7 @@ class MyShowsController extends BasePageController $this->smarty->assign('orderby'.$ordertype, WWW_TOP.'/myshows/browse?ob='.$ordertype.'&offset=0'); } - $this->smarty->assign('lastvisit', $this->userdata['lastlogin']); + $this->smarty->assign('lastvisit', $this->userdata->lastlogin); $this->smarty->assign(['results' => $results, 'resultsadd' => $rslt]); diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 43740c2b7..7701eee66 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -117,8 +117,8 @@ class RssController extends BasePageController $this->smarty->assign( [ - 'categorylist' => Category::getCategories(true, $this->userdata['categoryexclusions']), - 'parentcategorylist' => Category::getForMenu($this->userdata['categoryexclusions']), + 'categorylist' => Category::getCategories(true, $this->userdata->categoryexclusions), + 'parentcategorylist' => Category::getForMenu($this->userdata->categoryexclusions), ] ); diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index ffc98ee11..2e0737004 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -81,7 +81,7 @@ class SearchController extends BasePageController config('nntmux.items_per_page'), $orderBy, -1, - $this->userdata['categoryexclusions'] ?? [], + $this->userdata->categoryexclusions ?? [], 'basic', $categoryID, 0, @@ -92,7 +92,7 @@ class SearchController extends BasePageController $this->smarty->assign( [ - 'lastvisit' => $this->userdata['lastlogin'], + 'lastvisit' => $this->userdata->lastlogin, 'category' => $categoryID, ] ); @@ -157,7 +157,7 @@ class SearchController extends BasePageController config('nntmux.items_per_page'), $orderBy, -1, - $this->userdata['categoryexclusions'] ?? [], + $this->userdata->categoryexclusions ?? [], 'advanced', [$searchVars['searchadvcat'] === '' ? -1 : $searchVars['searchadvcat']] ); @@ -166,7 +166,7 @@ class SearchController extends BasePageController $this->smarty->assign( [ - 'lastvisit' => $this->userdata['lastlogin'], + 'lastvisit' => $this->userdata->lastlogin, ] ); }