From: Mikael Nordfeldth <mmn@hethane.se>
Date: Sat, 8 Mar 2014 00:20:08 +0000 (+0100)
Subject: Don't use PEAR MIME lib when we have PECL fileinfo
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5c343694608a2c033c3ca7b04b6e5fb0490b857f;p=quix0rs-gnu-social.git

Don't use PEAR MIME lib when we have PECL fileinfo
---

diff --git a/actions/getfile.php b/actions/getfile.php
index 4b57a05cd6..99ff84bcef 100644
--- a/actions/getfile.php
+++ b/actions/getfile.php
@@ -28,11 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once 'MIME/Type.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * An action for returning a requested file
@@ -61,7 +57,7 @@ class GetfileAction extends Action
      *
      * @return success flag
      */
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -143,22 +139,22 @@ class GetfileAction extends Action
     /**
      * Handle input, produce output
      *
-     * @param array $args $_REQUEST contents
-     *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
         // undo headers set by PHP sessions
         $sec = session_cache_expire() * 60;
         header('Expires: ' . date(DATE_RFC1123, time() + $sec));
         header('Cache-Control: max-age=' . $sec);
 
-        parent::handle($args);
+        parent::handle();
 
         $path = $this->path;
 
-        header('Content-Type: ' . MIME_Type::autoDetect($path));
+        $finfo = new finfo(FILEINFO_MIME_TYPE);
+
+        header('Content-Type: ' . $finfo->file($path));
 
         if (common_config('site', 'use_x_sendfile')) {
             header('X-Sendfile: ' . $path);