From 5db4a1974621ca918e3541c31e87a3e74ddd5bee Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 6 Jan 2019 18:50:16 +0300 Subject: [PATCH] Admin Panel: Media Manager - improvements --- site/plugins/admin/classes/EntriesManager.php | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index 4693bc91..22cf66d4 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -467,33 +467,36 @@ class EntriesManager if($file !== false) { - // open an image file - $img = Image::make($file); + if (in_array(pathinfo($file)['extension'], ['jpg', 'jpeg', 'png', 'gif'])) { + + // open an image file + $img = Image::make($file); - // now you are able to resize the instance - if (Registry::get('settings.entries.media.upload_images_width') > 0 && Registry::get('settings.entries.media.upload_images_height') > 0) { - $img->resize(Registry::get('settings.entries.media.upload_images_width'), Registry::get('settings.entries.media.upload_images_height'), function ($constraint) { - $constraint->aspectRatio(); - $constraint->upsize(); - }); - } elseif (Registry::get('settings.entries.media.upload_images_width') > 0) { - $img->resize(Registry::get('settings.entries.media.upload_images_width'), null, function ($constraint) { - $constraint->aspectRatio(); - $constraint->upsize(); - }); - } elseif (Registry::get('settings.entries.media.upload_images_height') > 0) { - $img->resize(null, Registry::get('settings.entries.media.upload_images_height'), function ($constraint) { - $constraint->aspectRatio(); - $constraint->upsize(); - }); + // now you are able to resize the instance + if (Registry::get('settings.entries.media.upload_images_width') > 0 && Registry::get('settings.entries.media.upload_images_height') > 0) { + $img->resize(Registry::get('settings.entries.media.upload_images_width'), Registry::get('settings.entries.media.upload_images_height'), function ($constraint) { + $constraint->aspectRatio(); + $constraint->upsize(); + }); + } elseif (Registry::get('settings.entries.media.upload_images_width') > 0) { + $img->resize(Registry::get('settings.entries.media.upload_images_width'), null, function ($constraint) { + $constraint->aspectRatio(); + $constraint->upsize(); + }); + } elseif (Registry::get('settings.entries.media.upload_images_height') > 0) { + $img->resize(null, Registry::get('settings.entries.media.upload_images_height'), function ($constraint) { + $constraint->aspectRatio(); + $constraint->upsize(); + }); + } + + // finally we save the image as a new file + $img->save($file, Registry::get('settings.entries.media.upload_images_quality')); + + // destroy + $img->destroy(); } - // finally we save the image as a new file - $img->save($file, Registry::get('settings.entries.media.upload_images_quality')); - - // destroy - $img->destroy(); - Notification::set('success', __('admin_message_entry_file_uploaded')); Http::redirect(Http::getBaseUrl().'/admin/entries/edit?entry='.Http::get('entry').'&media=true'); } else {