diff options
author | Vincent Petry <pvince81@owncloud.com> | 2015-10-13 16:44:01 +0200 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2015-10-13 16:44:01 +0200 |
commit | 915d37f226e107c86a04ad6a8b985440c6dee34a (patch) | |
tree | 46e0bfa12119a257e776bea041e73a1bc0acdc78 /apps | |
parent | 3891cd9068596481cf1717e9b1a5bcae1cc0ce09 (diff) | |
download | nextcloud-server-915d37f226e107c86a04ad6a8b985440c6dee34a.tar.gz nextcloud-server-915d37f226e107c86a04ad6a8b985440c6dee34a.zip |
Fallback to default mimetype detection mechanism
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files_external/lib/amazons3.php | 21 | ||||
-rw-r--r-- | apps/files_external/lib/dropbox.php | 12 | ||||
-rw-r--r-- | apps/files_external/lib/swift.php | 12 |
3 files changed, 0 insertions, 45 deletions
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 00915140bab..4b867c005a7 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -418,27 +418,6 @@ class AmazonS3 extends \OC\Files\Storage\Common { return false; } - public function getMimeType($path) { - $path = $this->normalizePath($path); - - if ($this->is_dir($path)) { - return 'httpd/unix-directory'; - } else if ($this->file_exists($path)) { - try { - $result = $this->getConnection()->headObject(array( - 'Bucket' => $this->bucket, - 'Key' => $path - )); - } catch (S3Exception $e) { - \OCP\Util::logException('files_external', $e); - return false; - } - - return $result['ContentType']; - } - return false; - } - public function touch($path, $mtime = null) { $path = $this->normalizePath($path); diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php index 4ab14d4f3e0..bf66ab78207 100644 --- a/apps/files_external/lib/dropbox.php +++ b/apps/files_external/lib/dropbox.php @@ -294,18 +294,6 @@ class Dropbox extends \OC\Files\Storage\Common { } } - public function getMimeType($path) { - if ($this->filetype($path) == 'dir') { - return 'httpd/unix-directory'; - } else { - $metaData = $this->getDropBoxMetaData($path); - if ($metaData) { - return $metaData['mime_type']; - } - } - return false; - } - public function free_space($path) { try { $info = $this->dropbox->getAccountInfo(); diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php index b9454b8d671..beb47ce0bce 100644 --- a/apps/files_external/lib/swift.php +++ b/apps/files_external/lib/swift.php @@ -361,18 +361,6 @@ class Swift extends \OC\Files\Storage\Common { } } - public function getMimeType($path) { - $path = $this->normalizePath($path); - - if ($this->is_dir($path)) { - return 'httpd/unix-directory'; - } else if ($this->file_exists($path)) { - $object = $this->getContainer()->getPartialObject($path); - return $object->getContentType(); - } - return false; - } - public function touch($path, $mtime = null) { $path = $this->normalizePath($path); if (is_null($mtime)) { |