GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-03-08 01:20:08 +01:00
parent 074339ea13
commit 5c34369460
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
actions/getfile.php
View File

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