From 24ce9b8a105bcc8455366ce0c5ff4e499e7d6f15 Mon Sep 17 00:00:00 2001 From: Sara Arjona Date: Tue, 11 Aug 2020 12:59:59 +0200 Subject: [PATCH] MDL-61215 core_files: add new optimised_image group Currently, PHP getimagesize method doesn't support SVG images. As some features, such as badges, processs and optimise the images before using them, a new filetype group has been created to exclude SVG from there: optimised_image. SVG can't be removed from web_image because then users won't be able to add SVG images to their courses using labels, pages... --- lang/en/mimetypes.php | 1 + lib/classes/filetypes.php | 15 ++++++++++----- lib/filelib.php | 1 + lib/form/tests/filetypes_util_test.php | 10 +++++----- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/lang/en/mimetypes.php b/lang/en/mimetypes.php index cbcd32914fc75..83f4257b334ce 100644 --- a/lang/en/mimetypes.php +++ b/lang/en/mimetypes.php @@ -74,6 +74,7 @@ $string['group:html_video'] = 'Video files natively supported by browsers'; $string['group:image'] = 'Image files'; $string['group:media_source'] = 'Streaming media'; +$string['group:optimised_image'] = 'Image files to be optimised, such as badges'; $string['group:presentation'] = 'Presentation files'; $string['group:sourcecode'] = 'Source code'; $string['group:spreadsheet'] = 'Spreadsheet files'; diff --git a/lib/classes/filetypes.php b/lib/classes/filetypes.php index e1e04168b9e08..8d32b35c9d330 100644 --- a/lib/classes/filetypes.php +++ b/lib/classes/filetypes.php @@ -107,7 +107,8 @@ protected static function get_default_types() { 'groups' => array('spreadsheet')), 'gslides' => array('type' => 'application/vnd.google-apps.presentation', 'icon' => 'powerpoint', 'groups' => array('presentation')), - 'gif' => array('type' => 'image/gif', 'icon' => 'gif', 'groups' => array('image', 'web_image'), 'string' => 'image'), + 'gif' => array('type' => 'image/gif', 'icon' => 'gif', 'groups' => array('image', 'web_image', 'optimised_image'), + 'string' => 'image'), 'gtar' => array('type' => 'application/x-gtar', 'icon' => 'archive', 'groups' => array('archive'), 'string' => 'archive'), 'tgz' => array('type' => 'application/g-zip', 'icon' => 'archive', 'groups' => array('archive'), 'string' => 'archive'), @@ -136,9 +137,12 @@ protected static function get_default_types() { 'jmt' => array('type' => 'text/xml', 'icon' => 'markup'), 'jmx' => array('type' => 'text/xml', 'icon' => 'markup'), 'jnlp' => array('type' => 'application/x-java-jnlp-file', 'icon' => 'markup'), - 'jpe' => array('type' => 'image/jpeg', 'icon' => 'jpeg', 'groups' => array('image', 'web_image'), 'string' => 'image'), - 'jpeg' => array('type' => 'image/jpeg', 'icon' => 'jpeg', 'groups' => array('image', 'web_image'), 'string' => 'image'), - 'jpg' => array('type' => 'image/jpeg', 'icon' => 'jpeg', 'groups' => array('image', 'web_image'), 'string' => 'image'), + 'jpe' => array('type' => 'image/jpeg', 'icon' => 'jpeg', 'groups' => array('image', 'web_image', 'optimised_image'), + 'string' => 'image'), + 'jpeg' => array('type' => 'image/jpeg', 'icon' => 'jpeg', 'groups' => array('image', 'web_image', 'optimised_image'), + 'string' => 'image'), + 'jpg' => array('type' => 'image/jpeg', 'icon' => 'jpeg', 'groups' => array('image', 'web_image', 'optimised_image'), + 'string' => 'image'), 'jqz' => array('type' => 'text/xml', 'icon' => 'markup'), 'js' => array('type' => 'application/x-javascript', 'icon' => 'text', 'groups' => array('web_file')), 'json' => array('type' => 'application/json', 'icon' => 'text'), @@ -206,7 +210,8 @@ protected static function get_default_types() { 'php' => array('type' => 'text/plain', 'icon' => 'sourcecode'), 'pic' => array('type' => 'image/pict', 'icon' => 'image', 'groups' => array('image'), 'string' => 'image'), 'pict' => array('type' => 'image/pict', 'icon' => 'image', 'groups' => array('image'), 'string' => 'image'), - 'png' => array('type' => 'image/png', 'icon' => 'png', 'groups' => array('image', 'web_image'), 'string' => 'image'), + 'png' => array('type' => 'image/png', 'icon' => 'png', 'groups' => array('image', 'web_image', 'optimised_image'), + 'string' => 'image'), 'pps' => array('type' => 'application/vnd.ms-powerpoint', 'icon' => 'powerpoint', 'groups' => array('presentation')), 'ppt' => array('type' => 'application/vnd.ms-powerpoint', 'icon' => 'powerpoint', 'groups' => array('presentation')), 'pptx' => array('type' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', diff --git a/lib/filelib.php b/lib/filelib.php index 2a42f8e9aced2..fd0c43e4afd89 100644 --- a/lib/filelib.php +++ b/lib/filelib.php @@ -1639,6 +1639,7 @@ function download_file_content($url, $headers=null, $postdata=null, $fullrespons * commonly used in moodle the following groups: * - web_image - image that can be included as in HTML * - image - image that we can parse using GD to find it's dimensions, also used for portfolio format + * - optimised_image - image that will be processed and optimised * - video - file that can be imported as video in text editor * - audio - file that can be imported as audio in text editor * - archive - we can extract files from this archive diff --git a/lib/form/tests/filetypes_util_test.php b/lib/form/tests/filetypes_util_test.php index 7fb1b5f95b059..355fefe4e7baa 100644 --- a/lib/form/tests/filetypes_util_test.php +++ b/lib/form/tests/filetypes_util_test.php @@ -302,10 +302,10 @@ public function test_data_for_browser() { // All these three files are in both "image" and also "web_image" // groups. We display both groups. $data = $util->data_for_browser('jpg png gif', true, '.gif'); - $this->assertEquals(2, count($data)); + $this->assertEquals(3, count($data)); $this->assertTrue($data[0]->key !== $data[1]->key); foreach ($data as $group) { - $this->assertTrue(($group->key === 'image' || $group->key === 'web_image')); + $this->assertTrue(($group->key === 'image' || $group->key === 'web_image' || $group->key === 'optimised_image')); $this->assertEquals(3, count($group->types)); $this->assertFalse($group->selectable); foreach ($group->types as $ext) { @@ -317,11 +317,11 @@ public function test_data_for_browser() { } } - // There is a group web_image which is a subset of the group image. The - // file extensions that fall into both groups will be displayed twice. + // The groups web_image and optimised_image are a subset of the group image. The + // file extensions that fall into these groups will be displayed thrice. $data = $util->data_for_browser('web_image'); foreach ($data as $group) { - $this->assertTrue(($group->key === 'image' || $group->key === 'web_image')); + $this->assertTrue(($group->key === 'image' || $group->key === 'web_image' || $group->key === 'optimised_image')); } // Check that "All file types" are displayed first.