Check if finfo exists before use it, a=chris
Check if finfo exists before use it, a=chris
diff --git a/controllers/resource_controller.php b/controllers/resource_controller.php
index 54fc04f92..fa79c0b67 100644
--- a/controllers/resource_controller.php
+++ b/controllers/resource_controller.php
@@ -119,8 +119,12 @@ class ResourceController extends Controller implements CrawlConstants
}
$path = "$base_dir/$name";
- $finfo = new finfo(FILEINFO_MIME);
- $mime_type = $finfo->file($path);
+ if(class_exists("finfo")) {
+ $finfo = new finfo(FILEINFO_MIME);
+ $mime_type = $finfo->file($path);
+ } else {
+ $mime_type = exec('file -b --mime-type ' . $path);
+ }
if(file_exists($path)) {
header("Content-type:$mime_type");
if(isset($offset) && isset($limit)) {
@@ -208,4 +212,4 @@ class ResourceController extends Controller implements CrawlConstants
echo base64_encode(gzcompress(serialize($info)));
}
}
-?>
\ No newline at end of file
+?>
diff --git a/models/machine_model.php b/models/machine_model.php
index c0c74630b..a0e99e7ab 100644
--- a/models/machine_model.php
+++ b/models/machine_model.php
@@ -319,4 +319,4 @@ class MachineModel extends Model
}
}
- ?>
\ No newline at end of file
+ ?>