From f69240064a37da89bd30cfd4d192168e042e5130 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Sun, 8 Nov 2015 13:45:59 +0000 Subject: [PATCH] #18: Make playlist accessible conditional one line --- app/Http/Controllers/PlaylistsController.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/Http/Controllers/PlaylistsController.php b/app/Http/Controllers/PlaylistsController.php index 609b378a..92655ae2 100644 --- a/app/Http/Controllers/PlaylistsController.php +++ b/app/Http/Controllers/PlaylistsController.php @@ -63,12 +63,8 @@ class PlaylistsController extends Controller public function getDownload($id, $extension) { $playlist = Playlist::with('tracks', 'user', 'tracks.album')->find($id); - if (!$playlist || (!$playlist->is_public && !Auth::check())) { + if (!$playlist || (!$playlist->is_public && !Auth::check()) || (!$playlist->is_public && ($playlist->user_id !== Auth::user()->id))) { App::abort(404); - } elseif (!$playlist->is_public && Auth::check()) { - if ($playlist->user_id !== Auth::user()->id) { - App::abort(404); - } } $format = null;