Skip to content

Commit 7323943

Browse files
authored
Merge pull request #10135 from nextcloud/feature/noid/add-visio-mimetypes
Add visio mimetypes
2 parents 89bd037 + 5541d3d commit 7323943

4 files changed

Lines changed: 30 additions & 1 deletion

File tree

lib/private/Repair/RepairMimeTypes.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,19 @@ private function introduceStreamingTypes() {
162162
return $this->updateMimetypes($updatedMimetypes);
163163
}
164164

165+
private function introduceVisioTypes() {
166+
$updatedMimetypes = [
167+
'vsdm' => 'application/vnd.visio',
168+
'vsdx' => 'application/vnd.visio',
169+
'vssm' => 'application/vnd.visio',
170+
'vssx' => 'application/vnd.visio',
171+
'vstm' => 'application/vnd.visio',
172+
'vstx' => 'application/vnd.visio',
173+
];
174+
175+
return $this->updateMimetypes($updatedMimetypes);
176+
}
177+
165178
/**
166179
* Fix mime types
167180
*/
@@ -191,5 +204,9 @@ public function run(IOutput $out) {
191204
if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.6', '<') && $this->introduceStreamingTypes()) {
192205
$out->info('Fixed streaming mime types');
193206
}
207+
208+
if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.8', '<') && $this->introduceVisioTypes()) {
209+
$out->info('Fixed visio mime types');
210+
}
194211
}
195212
}

resources/config/mimetypealiases.dist.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@
4040
"application/vnd.ms-powerpoint.presentation.macroEnabled.12": "x-office/presentation",
4141
"application/vnd.ms-powerpoint.slideshow.macroEnabled.12": "x-office/presentation",
4242
"application/vnd.ms-powerpoint.template.macroEnabled.12": "x-office/presentation",
43+
"application/vnd.ms-visio.drawing.macroEnabled.12": "application/vnd.visio",
44+
"application/vnd.ms-visio.drawing": "application/vnd.visio",
45+
"application/vnd.ms-visio.stencil.macroEnabled.12": "application/vnd.visio",
46+
"application/vnd.ms-visio.stencil": "application/vnd.visio",
47+
"application/vnd.ms-visio.template.macroEnabled.12": "application/vnd.visio",
48+
"application/vnd.ms-visio.template": "application/vnd.visio",
4349
"application/vnd.ms-word.document.macroEnabled.12": "x-office/document",
4450
"application/vnd.ms-word.template.macroEnabled.12": "x-office/document",
4551
"application/vnd.oasis.opendocument.presentation": "x-office/presentation",

resources/config/mimetypemapping.dist.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,12 @@
176176
"vcf": ["text/vcard"],
177177
"vob": ["video/dvd"],
178178
"vsd": ["application/vnd.visio"],
179+
"vsdm": ["application/vnd.ms-visio.drawing.macroEnabled.12"],
180+
"vsdx": ["application/vnd.ms-visio.drawing"],
181+
"vssm": ["application/vnd.ms-visio.stencil.macroEnabled.12"],
182+
"vssx": ["application/vnd.ms-visio.stencil"],
183+
"vstm": ["application/vnd.ms-visio.template.macroEnabled.12"],
184+
"vstx": ["application/vnd.ms-visio.template"],
179185
"wav": ["audio/wav"],
180186
"webm": ["video/webm"],
181187
"webp": ["image/webp"],

version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
3030
// when updating major/minor version number.
3131

32-
$OC_Version = array(14, 0, 0, 7);
32+
$OC_Version = array(14, 0, 0, 8);
3333

3434
// The human readable string
3535
$OC_VersionString = '14.0.0 alpha';

0 commit comments

Comments
 (0)