summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2014-06-05 13:01:01 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2014-06-06 12:00:25 +0200
commita59b5249d39e4b04da318c3f1ec43132988933cc (patch)
tree8702a2e9365cb1bd11b9b72173be6c3ba1c33d18 /lib/private
parentc47d4ebbac7885ad91cf56355bd6aa09318ff8e8 (diff)
downloadnextcloud-server-a59b5249d39e4b04da318c3f1ec43132988933cc.tar.gz
nextcloud-server-a59b5249d39e4b04da318c3f1ec43132988933cc.zip
add more and fix office mimetypes, migrate wrong mimetypes
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/mimetypes.list.php22
1 files changed, 20 insertions, 2 deletions
diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php
index 3fe454f41f1..ba1b9ca10b1 100644
--- a/lib/private/mimetypes.list.php
+++ b/lib/private/mimetypes.list.php
@@ -52,6 +52,7 @@ return array(
'c++' => array('text/x-c++src', null),
'deb' => array('application/x-deb', null),
'doc' => array('application/msword', null),
+ 'docm' => array('application/vnd.ms-word.document.macroEnabled.12', null),
'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', null),
'dot' => array('application/msword', null),
'dotx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.template', null),
@@ -91,6 +92,7 @@ return array(
'mpg' => array('video/mpeg', null),
'msi' => array('application/x-msi', null),
'numbers' => array('application/x-iwork-numbers-sffnumbers', null),
+ 'odf' => array('application/vnd.oasis.opendocument.formula', null),
'odg' => array('application/vnd.oasis.opendocument.graphics', null),
'odp' => array('application/vnd.oasis.opendocument.presentation', null),
'ods' => array('application/vnd.oasis.opendocument.spreadsheet', null),
@@ -104,7 +106,16 @@ return array(
'php' => array('application/x-php', null),
'pl' => array('application/x-perl', null),
'png' => array('image/png', null),
- 'ppt' => array('application/mspowerpoint', null),
+ 'pot' => array('application/vnd.ms-powerpoint', null),
+ 'potm' => array('application/vnd.ms-powerpoint.template.macroEnabled.12', null),
+ 'potx' => array('application/vnd.openxmlformats-officedocument.presentationml.template', null),
+ 'ppa' => array('application/vnd.ms-powerpoint', null),
+ 'ppam' => array('application/vnd.ms-powerpoint.addin.macroEnabled.12', null),
+ 'pps' => array('application/vnd.ms-powerpoint', null),
+ 'ppsm' => array('application/vnd.ms-powerpoint.slideshow.macroEnabled.12', null),
+ 'ppsx' => array('application/vnd.openxmlformats-officedocument.presentationml.slideshow', null),
+ 'ppt' => array('application/vnd.ms-powerpoint', null),
+ 'pptm' => array('application/vnd.ms-powerpoint.presentation.macroEnabled.12', null),
'pptx' => array('application/vnd.openxmlformats-officedocument.presentationml.presentation', null),
'psd' => array('application/x-photoshop', null),
'py' => array('text/x-python', null),
@@ -130,8 +141,15 @@ return array(
'woff' => array('application/font-woff', null),
'wmv' => array('video/x-ms-asf', null),
'xcf' => array('application/x-gimp', null),
- 'xls' => array('application/msexcel', null),
+ 'xla' => array('application/vnd.ms-excel', null),
+ 'xlam' => array('application/vnd.ms-excel.addin.macroEnabled.12', null),
+ 'xls' => array('application/vnd.ms-excel', null),
+ 'xlsb' => array('application/vnd.ms-excel.sheet.binary.macroEnabled.12', null),
+ 'xlsm' => array('application/vnd.ms-excel.sheet.macroEnabled.12', null),
'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', null),
+ 'xlt' => array('application/vnd.ms-excel', null),
+ 'xltm' => array('application/vnd.ms-excel.template.macroEnabled.12', null),
+ 'xltx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.template', null),
'xml' => array('application/xml', 'text/plain'),
'zip' => array('application/zip', null),
);