From ebd29758e92b48183520062bd7ff102e31ee7b0e Mon Sep 17 00:00:00 2001 From: DariusIII Date: Tue, 8 Jan 2019 12:40:46 +0100 Subject: [PATCH] Fix switched categories for TV and PC for users excluded categories views --- Changelog | 1 + app/Http/Middleware/ClearanceMiddleware.php | 8 ++++++++ app/Models/User.php | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 80ab42cdb..4b4b9ca3d 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-01-08 DariusIII + * Fix: Fix switched categories for TV and PC for users excluded categories views * Chg: Update phpstan/phpstan to version 0.10.8 * Chg: Update xref matching regex * Chg: Alter Binaries class xref updates and adjust nzb creation accordingly diff --git a/app/Http/Middleware/ClearanceMiddleware.php b/app/Http/Middleware/ClearanceMiddleware.php index f96ad30a7..7b2b7ae96 100644 --- a/app/Http/Middleware/ClearanceMiddleware.php +++ b/app/Http/Middleware/ClearanceMiddleware.php @@ -71,6 +71,14 @@ class ClearanceMiddleware } } + if ($request->is(['TV', 'browse/TV', 'browse/TV/*'])) { + if (! $user->hasDirectPermission('view tv') || ! $user->hasPermissionTo('view tv')) { + abort(401); + } else { + return $next($request); + } + } + return $next($request); } } diff --git a/app/Models/User.php b/app/Models/User.php index 82aea3427..911513e67 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -829,10 +829,10 @@ class User extends Authenticatable case 'view audio': $ret[] = 3000; continue 2; - case 'view tv': + case 'view pc': $ret[] = 4000; continue 2; - case 'view pc': + case 'view tv': $ret[] = 5000; continue 2; case 'view adult':