fix lots of file type icons for archives, js, flash, ics, fonts, code, ...

8 files changed, 36 insertions, 2 deletions

diff --git a/core/img/filetypes/text-x-javascript.png b/core/img/filetypes/application-javascript.png
index 24d09ce9781..24d09ce9781 100644
--- a/core/img/filetypes/text-x-javascript.png
+++ b/core/img/filetypes/application-javascript.png
diff --git a/core/img/filetypes/text-x-javascript.svg b/core/img/filetypes/application-javascript.svg
index 0cc52ce6ba7..0cc52ce6ba7 100644
--- a/core/img/filetypes/text-x-javascript.svg
+++ b/core/img/filetypes/application-javascript.svg
diff --git a/core/img/filetypes/flash.png b/core/img/filetypes/application-x-shockwave-flash.png
index bcde641da3c..bcde641da3c 100644
--- a/core/img/filetypes/flash.png
+++ b/core/img/filetypes/application-x-shockwave-flash.png
diff --git a/core/img/filetypes/flash.svg b/core/img/filetypes/application-x-shockwave-flash.svg
index cb823703d9b..cb823703d9b 100644
--- a/core/img/filetypes/flash.svg
+++ b/core/img/filetypes/application-x-shockwave-flash.svg
diff --git a/core/img/filetypes/calendar.png b/core/img/filetypes/text-calendar.png
index d85b1db651c..d85b1db651c 100644
--- a/core/img/filetypes/calendar.png
+++ b/core/img/filetypes/text-calendar.png
diff --git a/core/img/filetypes/calendar.svg b/core/img/filetypes/text-calendar.svg
index 0016749b936..0016749b936 100644
--- a/core/img/filetypes/calendar.svg
+++ b/core/img/filetypes/text-calendar.svg
diff --git a/lib/private/helper.php b/lib/private/helper.php
index e5d1fa9b513..9b5bf0652ae 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -152,7 +152,28 @@ class OC_Helper {
 	public static function mimetypeIcon($mimetype) {
 		$alias = array(
 			'application/octet-stream' => 'file', // use file icon as fallback
-			'application/xml' => 'code/xml',
+
+			'application/illustrator' => 'image',
+			'application/coreldraw' => 'image',
+			'application/x-gimp' => 'image',
+			'application/x-photoshop' => 'image',
+
+			'application/x-font-ttf' => 'font',
+			'application/font-woff' => 'font',
+			'application/vnd.ms-fontobject' => 'font',
+
+			'application/json' => 'text/code',
+			'application/x-php' => 'text/code',
+			'application/xml' => 'text/html',
+			'text/css' => 'text/code',
+
+			'application/x-compressed' => 'package/x-generic',
+			'application/x-7z-compressed' => 'package/x-generic',
+			'application/x-deb' => 'package/x-generic',
+			'application/x-rar-compressed' => 'package/x-generic',
+			'application/x-tar' => 'package/x-generic',
+			'application/zip' => 'package/x-generic',
+
 			'application/msword' => 'x-office/document',
 			'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'x-office/document',
 			'application/vnd.openxmlformats-officedocument.wordprocessingml.template' => 'x-office/document',
@@ -162,6 +183,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',
@@ -173,6 +195,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',
@@ -183,6 +206,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',
 		);
 
diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php
index 174877d623b..7bf061172c9 100644
--- a/lib/private/mimetypes.list.php
+++ b/lib/private/mimetypes.list.php
@@ -24,11 +24,13 @@
  * Array mapping file extensions to mimetypes (in alphabetical order).
  */
 return array(
+	'7z' => 'application/x-7z-compressed',
 	'accdb'=>'application/msaccess',
 	'ai' => 'application/illustrator',
 	'avi'=>'video/x-msvideo',
 	'bash' => 'text/x-shellscript',
 	'blend'=>'application/x-blender',
+	'bin' => 'application/x-bin',
 	'cb7' => 'application/x-cbr',
 	'cba' => 'application/x-cbr',
 	'cbr' => 'application/x-cbr',
@@ -42,11 +44,13 @@ return array(
 	'cvbdl' => 'application/x-cbr',
 	'c' => 'text/x-c',
 	'c++' => 'text/x-c++src',
+	'deb' => 'application/x-deb',
 	'doc'=>'application/msword',
 	'docx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
 	'dot'=>'application/msword',
 	'dotx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
 	'dv'=>'video/dv',
+	'eot' => 'application/vnd.ms-fontobject',
 	'epub' => 'application/epub+zip',
 	'exe'=>'application/x-ms-dos-executable',
 	'flac'=>'audio/flac',
@@ -61,6 +65,7 @@ return array(
 	'jpeg'=>'image/jpeg',
 	'jpg'=>'image/jpeg',
 	'js'=>'application/javascript',
+	'json' => 'application/json',
 	'keynote'=>'application/x-iwork-keynote-sffkey',
 	'kra'=>'application/x-krita',
 	'm2t'=>'video/mp2t',
@@ -85,6 +90,7 @@ return array(
 	'oga'=>'audio/ogg',
 	'ogg'=>'audio/ogg',
 	'ogv'=>'video/ogg',
+	'otf'=>'font/opentype',
 	'pages'=>'application/x-iwork-pages-sffpages',
 	'pdf'=>'application/pdf',
 	'php'=>'application/x-php',
@@ -93,22 +99,26 @@ return array(
 	'ppt'=>'application/mspowerpoint',
 	'pptx'=>'application/vnd.openxmlformats-officedocument.presentationml.presentation',
 	'psd'=>'application/x-photoshop',
-	'py'=>'text/x-script.python',
+	'py'=>'text/x-python',
+	'rar' => 'application/x-rar-compressed',
 	'reveal' => 'text/reveal',
 	'sgf' => 'application/sgf',
 	'sh-lib' => 'text/x-shellscript',
 	'sh' => 'text/x-shellscript',
 	'svg'=>'image/svg+xml',
+	'swf' => 'application/x-shockwave-flash',
 	'tar'=>'application/x-tar',
 	'tar.gz'=>'application/x-compressed',
 	'tgz'=>'application/x-compressed',
 	'tiff'=>'image/tiff',
 	'tif'=>'image/tiff',
+	'ttf'=>'application/x-font-ttf',
 	'txt'=>'text/plain',
 	'vcard' => 'text/vcard',
 	'vcf' => 'text/vcard',
 	'wav'=>'audio/wav',
 	'webm'=>'video/webm',
+	'woff' => 'application/font-woff',
 	'wmv'=>'video/x-ms-asf',
 	'xcf'=>'application/x-gimp',
 	'xls'=>'application/msexcel',