From 673cd1c1b32f1878f0fbd7601f9ea84bbe15785f Mon Sep 17 00:00:00 2001 From: DariusIII Date: Tue, 12 Mar 2019 15:01:38 +0100 Subject: [PATCH] Update classes --- app/Http/Controllers/AdultController.php | 2 +- app/Http/Controllers/BooksController.php | 2 +- app/Http/Controllers/BrowseController.php | 14 +++++++------- app/Http/Controllers/ConsoleController.php | 2 +- app/Http/Controllers/MovieController.php | 2 +- app/Http/Controllers/MusicController.php | 2 +- app/Http/Controllers/ProfileController.php | 2 -- app/Models/RootCategory.php | 7 ++++++- app/Models/User.php | 2 +- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/AdultController.php b/app/Http/Controllers/AdultController.php index c6a880cbe..f90764ee3 100644 --- a/app/Http/Controllers/AdultController.php +++ b/app/Http/Controllers/AdultController.php @@ -33,7 +33,7 @@ class AdultController extends BasePageController if ($id && \in_array($id, Arr::pluck($mtmp, 'title'), false)) { $cat = Category::query() ->where('title', $id) - ->where('parentid', '=', Category::XXX_ROOT) + ->where('root_categories_id', '=', Category::XXX_ROOT) ->first(['id']); $category = $cat !== null ? $cat['id'] : Category::XXX_ROOT; } diff --git a/app/Http/Controllers/BooksController.php b/app/Http/Controllers/BooksController.php index 1da8b68d8..928cbd58f 100644 --- a/app/Http/Controllers/BooksController.php +++ b/app/Http/Controllers/BooksController.php @@ -35,7 +35,7 @@ class BooksController extends BasePageController if ($id && \in_array($id, Arr::pluck($btmp, 'title'), false)) { $cat = Category::query() ->where('title', $id) - ->where('parentid', '=', Category::BOOKS_ROOT) + ->where('root_categories_id', '=', Category::BOOKS_ROOT) ->first(['id']); $category = $cat !== null ? $cat['id'] : Category::BOOKS_ROOT; } diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index d807bbff3..d604b3874 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -63,7 +63,7 @@ class BrowseController extends BasePageController $query = Category::query(); if ($id !== 'All') { - $query->where('title', $id)->where('parentid', $parentId['id']); + $query->where('title', $id)->where('root_categories_id', $parentId['id']); } else { $query->where('id', $parentId['id']); } @@ -107,17 +107,17 @@ class BrowseController extends BasePageController } elseif ($category !== -1 && $grp === -1) { $cdata = Category::find($category['id']); if ($cdata !== null) { - if ($cdata->parentid === Category::GAME_ROOT || $cdata->id === Category::GAME_ROOT) { + if ($cdata->root_categories_id === Category::GAME_ROOT || $cdata->id === Category::GAME_ROOT) { $covgroup = 'console'; - } elseif ($cdata->parentid === Category::MOVIE_ROOT || $cdata->id === Category::MOVIE_ROOT) { + } elseif ($cdata->root_categories_id === Category::MOVIE_ROOT || $cdata->id === Category::MOVIE_ROOT) { $covgroup = 'movies'; - } elseif ($cdata->parentid === Category::XXX_ROOT || $cdata->id === Category::XXX_ROOT) { + } elseif ($cdata->root_categories_id === Category::XXX_ROOT || $cdata->id === Category::XXX_ROOT) { $covgroup = 'xxx'; - } elseif ($cdata->parentid === Category::PC_ROOT || $cdata->id === Category::PC_GAMES) { + } elseif ($cdata->root_categories_id === Category::PC_ROOT || $cdata->id === Category::PC_GAMES) { $covgroup = 'games'; - } elseif ($cdata->parentid === Category::MUSIC_ROOT || $cdata->id === Category::MUSIC_ROOT) { + } elseif ($cdata->root_categories_id === Category::MUSIC_ROOT || $cdata->id === Category::MUSIC_ROOT) { $covgroup = 'music'; - } elseif ($cdata->parentid === Category::BOOKS_ROOT || $cdata->id === Category::BOOKS_ROOT) { + } elseif ($cdata->root_categories_id === Category::BOOKS_ROOT || $cdata->id === Category::BOOKS_ROOT) { $covgroup = 'books'; } } diff --git a/app/Http/Controllers/ConsoleController.php b/app/Http/Controllers/ConsoleController.php index 4a1b4fe86..b5043344a 100644 --- a/app/Http/Controllers/ConsoleController.php +++ b/app/Http/Controllers/ConsoleController.php @@ -39,7 +39,7 @@ class ConsoleController extends BasePageController if ($id && \in_array($id, Arr::pluck($ctmp, 'title'), false)) { $cat = Category::query() ->where('title', $id) - ->where('parentid', '=', Category::GAME_ROOT) + ->where('root_categories_id', '=', Category::GAME_ROOT) ->first(['id']); $category = $cat !== null ? $cat['id'] : Category::GAME_ROOT; } diff --git a/app/Http/Controllers/MovieController.php b/app/Http/Controllers/MovieController.php index 8f49a0993..1e63cea56 100644 --- a/app/Http/Controllers/MovieController.php +++ b/app/Http/Controllers/MovieController.php @@ -74,7 +74,7 @@ class MovieController extends BasePageController $category = $request->has('imdb') ? -1 : Category::MOVIE_ROOT; if ($id && \in_array($id, Arr::pluck($mtmp, 'title'), false)) { $cat = Category::query() - ->where(['title'=> $id, 'parentid' => Category::MOVIE_ROOT]) + ->where(['title'=> $id, 'root_categories_id' => Category::MOVIE_ROOT]) ->first(['id']); $category = $cat !== null ? $cat['id'] : Category::MOVIE_ROOT; } diff --git a/app/Http/Controllers/MusicController.php b/app/Http/Controllers/MusicController.php index 4d6a48222..2d0800497 100644 --- a/app/Http/Controllers/MusicController.php +++ b/app/Http/Controllers/MusicController.php @@ -36,7 +36,7 @@ class MusicController extends BasePageController if ($id && \in_array($id, Arr::pluck($mtmp, 'title'), false)) { $cat = Category::query() ->where('title', $id) - ->where('parentid', '=', Category::MUSIC_ROOT) + ->where('root_categories_id', '=', Category::MUSIC_ROOT) ->first(['id']); $category = $cat !== null ? $cat['id'] : Category::MUSIC_ROOT; } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 4f971bb3c..9e8fdb5b1 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -333,8 +333,6 @@ class ProfileController extends BasePageController $this->smarty->assign('yesno_ids', [1, 0]); $this->smarty->assign('yesno_names', ['Yes', 'No']); - $this->smarty->assign('catlist', Category::getForSelect(false)); - $content = $this->smarty->fetch('profileedit.tpl'); $this->smarty->assign(compact('content', 'meta_title', 'meta_keywords', 'meta_description')); diff --git a/app/Models/RootCategory.php b/app/Models/RootCategory.php index 35e395813..70ed0a8a7 100644 --- a/app/Models/RootCategory.php +++ b/app/Models/RootCategory.php @@ -3,13 +3,18 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; +use Watson\Rememberable\Rememberable; class RootCategory extends Model { + use Rememberable; + + protected $guarded = []; + /** * @return \Illuminate\Database\Eloquent\Relations\HasMany */ - public function categories() + public function categories(): \Illuminate\Database\Eloquent\Relations\HasMany { return $this->hasMany(Category::class, 'root_categories_id'); } diff --git a/app/Models/User.php b/app/Models/User.php index 569ec24b5..80cda151c 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -825,7 +825,7 @@ class User extends Authenticatable } } - $exclusion = Category::query()->whereIn('parentid', $ret)->pluck('id')->toArray(); + $exclusion = Category::query()->whereIn('root_categories_id', $ret)->pluck('id')->toArray(); return $exclusion; }