From 6ab3b061d3147a11e73a5e9261f4e2e3873803ac Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Tue, 28 Nov 2023 17:12:21 +0100 Subject: [PATCH 1/2] fix: add mimetype for eml and msg Signed-off-by: Daniel Kesselberg --- lib/private/Repair/RepairMimeTypes.php | 13 +++++++++++++ resources/config/mimetypemapping.dist.json | 2 ++ version.php | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php index f951c3b916df6..26f17fcb741e6 100644 --- a/lib/private/Repair/RepairMimeTypes.php +++ b/lib/private/Repair/RepairMimeTypes.php @@ -237,6 +237,15 @@ private function introduceEnhancedMetafileFormatType() { return $this->updateMimetypes($updatedMimetypes); } + private function introduceEmlAndMsgFormatType() { + $updatedMimetypes = [ + 'eml' => 'message/rfc822', + 'msg' => 'application/x-ole-storage', + ]; + + return $this->updateMimetypes($updatedMimetypes); + } + /** * Fix mime types */ @@ -297,5 +306,9 @@ public function run(IOutput $out) { if (version_compare($ocVersionFromBeforeUpdate, '28.0.0.5', '<') && $this->introduceEnhancedMetafileFormatType()) { $out->info('Fixed Enhanced Metafile Format mime types'); } + + if (version_compare($ocVersionFromBeforeUpdate, '28.0.0.8', '<') && $this->introduceEmlAndMsgFormatType()) { + $out->info('Fixed eml and msg mime type'); + } } } diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json index 47b207d6bccda..b28dd42cd1e9c 100644 --- a/resources/config/mimetypemapping.dist.json +++ b/resources/config/mimetypemapping.dist.json @@ -53,6 +53,7 @@ "dotx": ["application/vnd.openxmlformats-officedocument.wordprocessingml.template"], "dv": ["video/dv"], "emf": ["image/emf"], + "eml": ["message/rfc822", "text/plain"], "eot": ["application/vnd.ms-fontobject"], "eps": ["application/postscript"], "epub": ["application/epub+zip"], @@ -122,6 +123,7 @@ "mpeg": ["video/mpeg"], "mpg": ["video/mpeg"], "mpo": ["image/jpeg"], + "msg": ["application/x-ole-storage", "text/plain"], "msi": ["application/x-msi"], "mt2s": ["video/MP2T"], "mts": ["video/MP2T"], diff --git a/version.php b/version.php index d880a73efd528..7ae4982bcb027 100644 --- a/version.php +++ b/version.php @@ -30,7 +30,7 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patch level // when updating major/minor version number. -$OC_Version = [28, 0, 0, 7]; +$OC_Version = [28, 0, 0, 8]; // The human-readable string $OC_VersionString = '28.0.0 RC1'; From 1081c4aaa3a683247fbf82b9acda5f680b22388d Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Wed, 29 Nov 2023 12:27:55 +0100 Subject: [PATCH 2/2] fix: change mime type for msg file Signed-off-by: Daniel Kesselberg --- lib/private/Repair/RepairMimeTypes.php | 2 +- resources/config/mimetypemapping.dist.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php index 26f17fcb741e6..b58b4fefa74c6 100644 --- a/lib/private/Repair/RepairMimeTypes.php +++ b/lib/private/Repair/RepairMimeTypes.php @@ -240,7 +240,7 @@ private function introduceEnhancedMetafileFormatType() { private function introduceEmlAndMsgFormatType() { $updatedMimetypes = [ 'eml' => 'message/rfc822', - 'msg' => 'application/x-ole-storage', + 'msg' => 'application/vnd.ms-outlook', ]; return $this->updateMimetypes($updatedMimetypes); diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json index b28dd42cd1e9c..c98e33756b667 100644 --- a/resources/config/mimetypemapping.dist.json +++ b/resources/config/mimetypemapping.dist.json @@ -123,7 +123,7 @@ "mpeg": ["video/mpeg"], "mpg": ["video/mpeg"], "mpo": ["image/jpeg"], - "msg": ["application/x-ole-storage", "text/plain"], + "msg": ["application/vnd.ms-outlook"], "msi": ["application/x-msi"], "mt2s": ["video/MP2T"], "mts": ["video/MP2T"],