From a0ff21a2326e415bb1c0147ba2d96179d4036ca2 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 12 Jan 2012 18:26:13 +0100 Subject: added a file to fix wrong recognised mime-types --- lib/filestorage/local.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lib/filestorage') diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index cfc27159786..1261bd3aa83 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -132,6 +132,13 @@ class OC_Filestorage_Local extends OC_Filestorage{ public function getMimeType($fspath){ if($this->is_readable($fspath)){ $mimeType='application/octet-stream'; + if ($mimeType=='application/octet-stream') { + self::$mimetypes = include('mimetypes.fixlist.php'); + $extention=strtolower(strrchr(basename($fspath), ".")); + $extention=substr($extention,1);//remove leading . + $mimeType=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream'; + + } if (@is_dir($this->datadir.$fspath)) { // directories are easy return "httpd/unix-directory"; @@ -158,7 +165,7 @@ class OC_Filestorage_Local extends OC_Filestorage{ } if ($mimeType=='application/octet-stream') { // Fallback solution: (try to guess the type by the file extension - if(!self::$mimetypes){ + if(!self::$mimetypes || self::$mimetypes == include('mimetypes.list.php')){ self::$mimetypes=include('mimetypes.list.php'); } $extention=strtolower(strrchr(basename($fspath), ".")); -- cgit v1.2.3