From 2de8bbe5482cc857c38f01990bf133d30b344ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Holba?= Date: Tue, 15 Sep 2020 10:33:39 +0200 Subject: [PATCH] v0.1 Fix exif data function just for jpeg and Fix config in index.blade for mimetype_blacklist --- app/Http/Helpers/helpers.php | 2 +- public/mix-manifest.json | 4 +++- resources/views/index.blade.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Http/Helpers/helpers.php b/app/Http/Helpers/helpers.php index 299daa83..b27a6387 100644 --- a/app/Http/Helpers/helpers.php +++ b/app/Http/Helpers/helpers.php @@ -531,7 +531,7 @@ function get_pretty_name($basename, $name, $mimetype) } function get_image_meta_data($file) { - if(get_file_type($file->getMimeType()) === 'image') { + if(get_file_type_from_mimetype($file->getMimeType()) === 'jpeg') { return exif_read_data($file); } } diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 1533d1d1..5db4b4c2 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -75,5 +75,7 @@ "/chunks/user-storage.js": "/chunks/user-storage.js?id=b3d2101b0d95ede2d504", "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=df3b919b96061f49df6b", "/chunks/users.js": "/chunks/users.js?id=74c47d22c0bd00148f31", - "/js/main.50ad87ca021508a6c1cc.hot-update.js": "/js/main.50ad87ca021508a6c1cc.hot-update.js" + "/js/main.8e00cddc0bf687aa9b81.hot-update.js": "/js/main.8e00cddc0bf687aa9b81.hot-update.js", + "/chunks/app-others.8e00cddc0bf687aa9b81.hot-update.js": "/chunks/app-others.8e00cddc0bf687aa9b81.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.8e00cddc0bf687aa9b81.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.8e00cddc0bf687aa9b81.hot-update.js" } diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 0dc480e5..e57a5221 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -55,7 +55,7 @@ storageLimit: {{ isset($settings->storage_limitation) ? $settings->storage_limitation : 1 }}, storageDefaultSpace: {{ isset($settings->storage_default) ? $settings->storage_default : 5 }}, storageDefaultSpaceFormatted: '{{ isset($settings->storage_default) ? format_gigabytes($settings->storage_default) : format_gigabytes(5) }}', - mimetypesBlacklist: '{{$settings->mimetypes_blacklist}}', + mimetypesBlacklist: '{{ isset($settings->mimetypes_blacklist) ? $settings->mimetypes_blacklist: null}}', hasAuthCookie: {{ Cookie::has('token') ? 1 : 0 }}, isSaaS: {{ isset($settings->license) && $settings->license === 'Extended' ? 1 : 0 }},