mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22552 from nextcloud/bugfix/noid/opendocument-templates 

Add opendocument templates to mimetype mappings
This commit is contained in:
Morris Jobke 2020-09-10 12:42:29 +02:00 committed by GitHub
parent bd5a297c93 b0970f86f0
commit 9708b004f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/private/Repair/RepairMimeTypes.php
View File

@ -191,6 +191,17 @@ class RepairMimeTypes implements IRepairStep {
return $this->updateMimetypes($updatedMimetypes); return $this->updateMimetypes($updatedMimetypes);
} }
private function introduceOpenDocumentTemplates() {
$updatedMimetypes = [
'ott' => 'application/vnd.oasis.opendocument.text-template',
'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
'otp' => 'application/vnd.oasis.opendocument.presentation-template',
'otg' => 'application/vnd.oasis.opendocument.graphics-template',
];
return $this->updateMimetypes($updatedMimetypes);
}
/** /**
* Fix mime types * Fix mime types
*/ */
@ -227,5 +238,9 @@ class RepairMimeTypes implements IRepairStep {
if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.10', '<') && $this->introduceComicbookTypes()) { if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.10', '<') && $this->introduceComicbookTypes()) {
$out->info('Fixed comicbook mime types'); $out->info('Fixed comicbook mime types');
} }
if (version_compare($ocVersionFromBeforeUpdate, '20.0.0.5', '<') && $this->introduceOpenDocumentTemplates()) {
$out->info('Fixed OpenDocument template mime types');
}
} }
} }

4
resources/config/mimetypemapping.dist.json
View File

@ -123,6 +123,10 @@
"odp": ["application/vnd.oasis.opendocument.presentation"], "odp": ["application/vnd.oasis.opendocument.presentation"],
"ods": ["application/vnd.oasis.opendocument.spreadsheet"], "ods": ["application/vnd.oasis.opendocument.spreadsheet"],
"odt": ["application/vnd.oasis.opendocument.text"], "odt": ["application/vnd.oasis.opendocument.text"],
"ott": ["application/vnd.oasis.opendocument.text-template"],
"ots": ["application/vnd.oasis.opendocument.spreadsheet-template"],
"otp": ["application/vnd.oasis.opendocument.presentation-template"],
"otg": ["application/vnd.oasis.opendocument.graphics-template"],
"oga": ["audio/ogg"], "oga": ["audio/ogg"],
"ogg": ["audio/ogg"], "ogg": ["audio/ogg"],
"ogv": ["video/ogg"], "ogv": ["video/ogg"],