From 3c13522ebf4e27094ea5947df16b304cd79bd818 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 23 Jul 2012 16:54:48 +0300 Subject: Fix issue #1644 --- application/config/mimes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/mimes.php') diff --git a/application/config/mimes.php b/application/config/mimes.php index 4b1d6a85d..a239bb254 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -37,7 +37,7 @@ return array( 'hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'), 'cpt' => 'application/mac-compactpro', - 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'), + 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel', 'text/plain'), 'bin' => array('application/macbinary', 'application/mac-binary', 'application/octet-stream', 'application/x-binary', 'application/x-macbinary'), 'dms' => 'application/octet-stream', 'lha' => 'application/octet-stream', -- cgit v1.2.3-24-g4f1b From b5ecafe0df2c4a2e81e27eab2d06af61d1eefa9e Mon Sep 17 00:00:00 2001 From: Ollie Rattue Date: Wed, 15 Aug 2012 00:11:43 -0500 Subject: Working mime types for xls and xlsx file extensions --- application/config/mimes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/config/mimes.php') diff --git a/application/config/mimes.php b/application/config/mimes.php index a239bb254..6cc1ae9ef 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -56,7 +56,7 @@ return array( 'smi' => 'application/smil', 'smil' => 'application/smil', 'mif' => 'application/vnd.mif', - 'xls' => array('application/excel', 'application/vnd.ms-excel', 'application/msexcel'), + 'xls' => array('application/vnd.ms-excel', 'application/vnd.ms-excel [official]', 'application/msexcel', 'application/x-msexcel', 'application/x-ms-excel', 'application/x-excel', 'application/x-dos_ms_excel', 'application/xls', 'application/x-xls', 'application/excel', 'application/download', 'application/vnd.ms-office', 'application/msword'), 'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint'), 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'wbxml' => 'application/wbxml', @@ -124,7 +124,7 @@ return array( 'movie' => 'video/x-sgi-movie', 'doc' => array('application/msword', 'application/vnd.ms-office'), 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip'), - 'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip'), + 'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip', 'application/vnd.ms-excel', 'application/msword'), 'word' => array('application/msword', 'application/octet-stream'), 'xl' => 'application/excel', 'eml' => 'message/rfc822', -- cgit v1.2.3-24-g4f1b From 8b4869abe5be546d64a516e42d0559d3bdc1ed53 Mon Sep 17 00:00:00 2001 From: Ollie Rattue Date: Wed, 15 Aug 2012 11:43:52 -0500 Subject: Removed invalid 'application/vnd.ms-excel [official]' mime type from xls --- application/config/mimes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/mimes.php') diff --git a/application/config/mimes.php b/application/config/mimes.php index 6cc1ae9ef..1917b11de 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -56,7 +56,7 @@ return array( 'smi' => 'application/smil', 'smil' => 'application/smil', 'mif' => 'application/vnd.mif', - 'xls' => array('application/vnd.ms-excel', 'application/vnd.ms-excel [official]', 'application/msexcel', 'application/x-msexcel', 'application/x-ms-excel', 'application/x-excel', 'application/x-dos_ms_excel', 'application/xls', 'application/x-xls', 'application/excel', 'application/download', 'application/vnd.ms-office', 'application/msword'), + 'xls' => array('application/vnd.ms-excel', 'application/msexcel', 'application/x-msexcel', 'application/x-ms-excel', 'application/x-excel', 'application/x-dos_ms_excel', 'application/xls', 'application/x-xls', 'application/excel', 'application/download', 'application/vnd.ms-office', 'application/msword'), 'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint'), 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'wbxml' => 'application/wbxml', -- cgit v1.2.3-24-g4f1b From a819580fd7d921bb1687d5690712cd61eed82dd2 Mon Sep 17 00:00:00 2001 From: Michiel Vugteveen Date: Tue, 21 Aug 2012 16:32:04 +0200 Subject: docx mimetype added --- application/config/mimes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/mimes.php') diff --git a/application/config/mimes.php b/application/config/mimes.php index 1917b11de..48771dc15 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -123,7 +123,7 @@ return array( 'avi' => array('video/x-msvideo', 'video/msvideo', 'video/avi', 'application/x-troff-msvideo'), 'movie' => 'video/x-sgi-movie', 'doc' => array('application/msword', 'application/vnd.ms-office'), - 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip'), + 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip', 'application/msword'), 'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip', 'application/vnd.ms-excel', 'application/msword'), 'word' => array('application/msword', 'application/octet-stream'), 'xl' => 'application/excel', -- cgit v1.2.3-24-g4f1b From 50f7834a747242cbaa08b19bf8bb57dff02a4b23 Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Tue, 2 Oct 2012 08:56:43 +0100 Subject: Added 'binary/octet-stream' as PDF mime. Fixes #1840 and #1828 Signed-off-by: Alex Bilbie --- application/config/mimes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/mimes.php') diff --git a/application/config/mimes.php b/application/config/mimes.php index 48771dc15..af1c95ffd 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -49,7 +49,7 @@ return array( 'sea' => 'application/octet-stream', 'dll' => 'application/octet-stream', 'oda' => 'application/oda', - 'pdf' => array('application/pdf', 'application/x-download'), + 'pdf' => array('application/pdf', 'application/x-download', 'binary/octet-stream'), 'ai' => 'application/postscript', 'eps' => 'application/postscript', 'ps' => 'application/postscript', -- cgit v1.2.3-24-g4f1b From 7bd1690b8b1c74ee6d6ff3868525d8cdc0ec0803 Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Tue, 2 Oct 2012 09:19:02 +0100 Subject: Added .dot and .dotx mimes. Fixes #1803 Signed-off-by: Alex Bilbie --- application/config/mimes.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'application/config/mimes.php') diff --git a/application/config/mimes.php b/application/config/mimes.php index af1c95ffd..90ffe61ff 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -124,6 +124,8 @@ return array( 'movie' => 'video/x-sgi-movie', 'doc' => array('application/msword', 'application/vnd.ms-office'), 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip', 'application/msword'), + 'dot' => array('application/msword', 'application/vnd.ms-office'), + 'dotx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip', 'application/msword'), 'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip', 'application/vnd.ms-excel', 'application/msword'), 'word' => array('application/msword', 'application/octet-stream'), 'xl' => 'application/excel', -- cgit v1.2.3-24-g4f1b