|
@@ -41,8 +41,10 @@ class MediaController extends Controller
|
|
): Response {
|
|
): Response {
|
|
$media = $this->getMedia($userCode, $mediaCode, true);
|
|
$media = $this->getMedia($userCode, $mediaCode, true);
|
|
|
|
|
|
- if (!$media || (!$media->published && $this->session->get('user_id') !== $media->user_id && !$this->session->get('admin',
|
|
|
|
- false))) {
|
|
|
|
|
|
+ if (!$media || (!$media->published && $this->session->get('user_id') !== $media->user_id && !$this->session->get(
|
|
|
|
+ 'admin',
|
|
|
|
+ false
|
|
|
|
+ ))) {
|
|
throw new HttpNotFoundException($request);
|
|
throw new HttpNotFoundException($request);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -131,9 +133,9 @@ class MediaController extends Controller
|
|
$media = $this->getMedia($userCode, $mediaCode, false);
|
|
$media = $this->getMedia($userCode, $mediaCode, false);
|
|
|
|
|
|
if (!$media || (!$media->published && $this->session->get('user_id') !== $media->user_id && !$this->session->get(
|
|
if (!$media || (!$media->published && $this->session->get('user_id') !== $media->user_id && !$this->session->get(
|
|
- 'admin',
|
|
|
|
- false
|
|
|
|
- ))) {
|
|
|
|
|
|
+ 'admin',
|
|
|
|
+ false
|
|
|
|
+ ))) {
|
|
throw new HttpNotFoundException($request);
|
|
throw new HttpNotFoundException($request);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -165,9 +167,9 @@ class MediaController extends Controller
|
|
$media = $this->getMedia($userCode, $mediaCode, false);
|
|
$media = $this->getMedia($userCode, $mediaCode, false);
|
|
|
|
|
|
if (!$media || (!$media->published && $this->session->get('user_id') !== $media->user_id && !$this->session->get(
|
|
if (!$media || (!$media->published && $this->session->get('user_id') !== $media->user_id && !$this->session->get(
|
|
- 'admin',
|
|
|
|
- false
|
|
|
|
- ))) {
|
|
|
|
|
|
+ 'admin',
|
|
|
|
+ false
|
|
|
|
+ ))) {
|
|
throw new HttpNotFoundException($request);
|
|
throw new HttpNotFoundException($request);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -370,8 +372,10 @@ class MediaController extends Controller
|
|
$this->session->close();
|
|
$this->session->close();
|
|
$mime = $storage->getMimetype($media->storage_path);
|
|
$mime = $storage->getMimetype($media->storage_path);
|
|
|
|
|
|
- if ((param($request, 'width') !== null || param($request, 'height') !== null) && explode('/',
|
|
|
|
- $mime)[0] === 'image') {
|
|
|
|
|
|
+ if ((param($request, 'width') !== null || param($request, 'height') !== null) && explode(
|
|
|
|
+ '/',
|
|
|
|
+ $mime
|
|
|
|
+ )[0] === 'image') {
|
|
return $this->makeThumbnail(
|
|
return $this->makeThumbnail(
|
|
$storage,
|
|
$storage,
|
|
$media,
|
|
$media,
|