This commit is contained in:
Robin Appelman 2013-08-07 17:17:30 +02:00
parent 1c1ede5703
commit a0243e03ef
1 changed files with 4 additions and 4 deletions

View File

@ -61,7 +61,7 @@ class Detection {
* @return string * @return string
*/ */
public function detect($path) { public function detect($path) {
$isWrapped = (strpos($path, '://') !== false) and (substr($path, 0, 7) == 'file://'); $isWrapped = (strpos($path, '://') !== false) and (substr($path, 0, 7) === 'file://');
if (@is_dir($path)) { if (@is_dir($path)) {
// directories are easy // directories are easy
@ -70,7 +70,7 @@ class Detection {
$mimeType = $this->detectPath($path); $mimeType = $this->detectPath($path);
if ($mimeType == 'application/octet-stream' and function_exists('finfo_open') if ($mimeType === 'application/octet-stream' and function_exists('finfo_open')
and function_exists('finfo_file') and $finfo = finfo_open(FILEINFO_MIME) and function_exists('finfo_file') and $finfo = finfo_open(FILEINFO_MIME)
) { ) {
$info = @strtolower(finfo_file($finfo, $path)); $info = @strtolower(finfo_file($finfo, $path));
@ -79,11 +79,11 @@ class Detection {
} }
finfo_close($finfo); finfo_close($finfo);
} }
if (!$isWrapped and $mimeType == 'application/octet-stream' && function_exists("mime_content_type")) { if (!$isWrapped and $mimeType === 'application/octet-stream' && function_exists("mime_content_type")) {
// use mime magic extension if available // use mime magic extension if available
$mimeType = mime_content_type($path); $mimeType = mime_content_type($path);
} }
if (!$isWrapped and $mimeType == 'application/octet-stream' && \OC_Helper::canExecute("file")) { if (!$isWrapped and $mimeType === 'application/octet-stream' && \OC_Helper::canExecute("file")) {
// it looks like we have a 'file' command, // it looks like we have a 'file' command,
// lets see if it does have mime support // lets see if it does have mime support
$path = escapeshellarg($path); $path = escapeshellarg($path);