diff options
| -rwxr-xr-x | scripts/mimetype | 9 | ||||
| -rw-r--r-- | system/application/models/file_mod.php | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/scripts/mimetype b/scripts/mimetype index ec191adc8..43c69ebc6 100755 --- a/scripts/mimetype +++ b/scripts/mimetype @@ -22,6 +22,7 @@ my %opts = ( 'stdin' => [''], 'brief' => ['b'], 'namefile' => ['f', 1], + 'orig-name' => ['', 1], 'noalign' => ['N'], 'describe' => ['d'], 'file-compat' => [''], @@ -192,6 +193,14 @@ foreach my $file (@ARGV) { print $format->($file, $m), "\n" if $m; } } + elsif ($args{'orig-name'}) { + my $type = globs($args{'orig-name'}); + if ($type ne "") { + print $format->($file, $type), "\n"; + } else { + print $format->($file, mimetype($f)), "\n"; + } + } else { print $format->($file, mimetype($f)), "\n" } } diff --git a/system/application/models/file_mod.php b/system/application/models/file_mod.php index bc7168e27..41959a5d2 100644 --- a/system/application/models/file_mod.php +++ b/system/application/models/file_mod.php @@ -153,7 +153,7 @@ class File_mod extends Model { } // MODIFIED SINCE SUPPORT -- END - $type = exec('/usr/bin/perlbin/vendor/mimetype -b '.escapeshellarg($file)); + $type = exec(FCPATH.'scripts/mimetype -b --orig-name '.escapeshellarg($filedata['filename']).' '.escapeshellarg($file)); if (!$mode && substr_count(ltrim($this->uri->uri_string(), "/"), '/') >= 1) { $mode = $this->mime2extension($type); |