Merge pull request #6903 from owncloud/fix-ms-office-icons

Add/fix Microsoft Office file icons.

2 files changed, 63 insertions, 62 deletions

diff --git a/lib/private/helper.php b/lib/private/helper.php
index 1c8d01c141f..58bee9c6300 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -161,6 +161,7 @@ class OC_Helper {
 			'application/vnd.oasis.opendocument.text-template' => 'x-office/document',
 			'application/vnd.oasis.opendocument.text-web' => 'x-office/document',
 			'application/vnd.oasis.opendocument.text-master' => 'x-office/document',
+			'application/mspowerpoint' => 'x-office/presentation',
 			'application/vnd.ms-powerpoint' => 'x-office/presentation',
 			'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'x-office/presentation',
 			'application/vnd.openxmlformats-officedocument.presentationml.template' => 'x-office/presentation',
@@ -171,6 +172,7 @@ class OC_Helper {
 			'application/vnd.ms-powerpoint.slideshow.macroEnabled.12' => 'x-office/presentation',
 			'application/vnd.oasis.opendocument.presentation' => 'x-office/presentation',
 			'application/vnd.oasis.opendocument.presentation-template' => 'x-office/presentation',
+			'application/msexcel' => 'x-office/spreadsheet',
 			'application/vnd.ms-excel' => 'x-office/spreadsheet',
 			'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'x-office/spreadsheet',
 			'application/vnd.openxmlformats-officedocument.spreadsheetml.template' => 'x-office/spreadsheet',
@@ -180,6 +182,7 @@ class OC_Helper {
 			'application/vnd.ms-excel.sheet.binary.macroEnabled.12' => 'x-office/spreadsheet',
 			'application/vnd.oasis.opendocument.spreadsheet' => 'x-office/spreadsheet',
 			'application/vnd.oasis.opendocument.spreadsheet-template' => 'x-office/spreadsheet',
+			'application/msaccess' => 'database',
 		);
 
 		if (isset($alias[$mimetype])) {
diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php
index 08228336966..40fb1d2d97d 100644
--- a/lib/private/mimetypes.list.php
+++ b/lib/private/mimetypes.list.php
@@ -21,93 +21,91 @@
 */
 
 /**
- * list of mimetypes by extension
+ * Array mapping file extensions to mimetypes (in alphabetical order).
  */
-
 return array(
+	'accdb'=>'application/msaccess',
+	'ai' => 'application/illustrator',
+	'avi'=>'video/x-msvideo',
+	'bash' => 'text/x-shellscript',
+	'blend'=>'application/x-blender',
+	'cc' => 'text/x-c',
+	'cdr' => 'application/coreldraw',
+	'cpp' => 'text/x-c++src',
 	'css'=>'text/css',
+	'c' => 'text/x-c',
+	'c++' => 'text/x-c++src',
+	'doc'=>'application/msword',
+	'docx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+	'dot'=>'application/msword',
+	'dotx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+	'dv'=>'video/dv',
+	'epub' => 'application/epub+zip',
+	'exe'=>'application/x-ms-dos-executable',
 	'flac'=>'audio/flac',
 	'gif'=>'image/gif',
-	'gzip'=>'application/x-gzip',
 	'gz'=>'application/x-gzip',
+	'gzip'=>'application/x-gzip',
 	'html'=>'text/html',
 	'htm'=>'text/html',
-	'ics'=>'text/calendar',
 	'ical'=>'text/calendar',
+	'ics'=>'text/calendar',
+	'impress' => 'text/impress',
 	'jpeg'=>'image/jpeg',
 	'jpg'=>'image/jpeg',
 	'js'=>'application/javascript',
+	'keynote'=>'application/x-iwork-keynote-sffkey',
+	'kra'=>'application/x-krita',
+	'm2t'=>'video/mp2t',
+	'm4v'=>'video/mp4',
+	'markdown' => 'text/markdown',
+	'mdown' => 'text/markdown',
+	'md' => 'text/markdown',
+	'mdb'=>'application/msaccess',
+	'mdwn' => 'text/markdown',
+	'mobi' => 'application/x-mobipocket-ebook',
+	'mov'=>'video/quicktime',
+	'mp3'=>'audio/mpeg',
+	'mp4'=>'video/mp4',
+	'mpeg'=>'video/mpeg',
+	'mpg'=>'video/mpeg',
+	'msi'=>'application/x-msi',
+	'numbers'=>'application/x-iwork-numbers-sffnumbers',
+	'odg'=>'application/vnd.oasis.opendocument.graphics',
+	'odp'=>'application/vnd.oasis.opendocument.presentation',
+	'ods'=>'application/vnd.oasis.opendocument.spreadsheet',
+	'odt'=>'application/vnd.oasis.opendocument.text',
 	'oga'=>'audio/ogg',
 	'ogg'=>'audio/ogg',
 	'ogv'=>'video/ogg',
+	'pages'=>'application/x-iwork-pages-sffpages',
 	'pdf'=>'application/pdf',
+	'php'=>'application/x-php',
+	'pl'=>'application/x-pearl',
 	'png'=>'image/png',
+	'ppt'=>'application/mspowerpoint',
+	'pptx'=>'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+	'psd'=>'application/x-photoshop',
+	'py'=>'text/x-script.python',
+	'reveal' => 'text/reveal',
+	'sgf' => 'application/sgf',
+	'sh-lib' => 'text/x-shellscript',
+	'sh' => 'text/x-shellscript',
 	'svg'=>'image/svg+xml',
 	'tar'=>'application/x-tar',
-	'tgz'=>'application/x-compressed',
 	'tar.gz'=>'application/x-compressed',
-	'tif'=>'image/tiff',
+	'tgz'=>'application/x-compressed',
 	'tiff'=>'image/tiff',
+	'tif'=>'image/tiff',
 	'txt'=>'text/plain',
-	'zip'=>'application/zip',
+	'vcard' => 'text/vcard',
+	'vcf' => 'text/vcard',
 	'wav'=>'audio/wav',
-	'odt'=>'application/vnd.oasis.opendocument.text',
-	'ods'=>'application/vnd.oasis.opendocument.spreadsheet',
-	'odg'=>'application/vnd.oasis.opendocument.graphics',
-	'odp'=>'application/vnd.oasis.opendocument.presentation',
-	'pages'=>'application/x-iwork-pages-sffpages',
-	'numbers'=>'application/x-iwork-numbers-sffnumbers',
-	'keynote'=>'application/x-iwork-keynote-sffkey',
-	'kra'=>'application/x-krita',
-	'mp3'=>'audio/mpeg',
-	'doc'=>'application/msword',
-	'docx'=>'application/msword',
-	'xls'=>'application/msexcel',
-	'xlsx'=>'application/msexcel',
-	'php'=>'application/x-php',
-	'exe'=>'application/x-ms-dos-executable',
-	'msi'=>'application/x-msi',
-	'pl'=>'application/x-pearl',
-	'py'=>'application/x-python',
-	'blend'=>'application/x-blender',
-	'xcf'=>'application/x-gimp',
-	'psd'=>'application/x-photoshop',
-	'xml'=>'application/xml',
-	'avi'=>'video/x-msvideo',
-	'dv'=>'video/dv',
-	'm2t'=>'video/mp2t',
-	'mp4'=>'video/mp4',
-	'm4v'=>'video/mp4',
-	'mpg'=>'video/mpeg',
-	'mpeg'=>'video/mpeg',
-	'mov'=>'video/quicktime',
 	'webm'=>'video/webm',
 	'wmv'=>'video/x-ms-asf',
-	'py'=>'text/x-script.python',
-	'vcf' => 'text/vcard',
-	'vcard' => 'text/vcard',
-	'doc'=>'application/msword',
-	'docx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+	'xcf'=>'application/x-gimp',
 	'xls'=>'application/msexcel',
 	'xlsx'=>'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-	'ppt'=>'application/mspowerpoint',
-	'pptx'=>'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-	'sgf' => 'application/sgf',
-	'cdr' => 'application/coreldraw',
-	'impress' => 'text/impress',
-	'ai' => 'application/illustrator',
-	'epub' => 'application/epub+zip',
-	'mobi' => 'application/x-mobipocket-ebook',
-	'md' => 'text/markdown',
-	'markdown' => 'text/markdown',
-	'mdown' => 'text/markdown',
-	'mdwn' => 'text/markdown',
-	'reveal' => 'text/reveal',
-	'c' => 'text/x-c',
-	'cc' => 'text/x-c',
-	'cpp' => 'text/x-c++src',
-	'c++' => 'text/x-c++src',
-	'sh' => 'text/x-shellscript',
-	'bash' => 'text/x-shellscript',
-	'sh-lib' => 'text/x-shellscript',
+	'xml'=>'application/xml',
+	'zip'=>'application/zip',
 );