makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10963] filespec::get_mimetype now used

Browse source 
filespec::get_mimetype now uses the finfo class in order to detect the
mimetype of a given filename. filespec::is_image() now uses this method.

PHPBB3-10963
This commit is contained in:
Fyorl 2012-07-04 13:27:55 +01:00
parent f208b59c59
commit 4fbcf4eaad
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/includes/functions_upload.php
View file

@ -151,9 +151,7 @@ class filespec
*/ */
function is_image() function is_image()
{ {
$finfo = new finfo(FILEINFO_MIME_TYPE); $mimetype = $this->get_mimetype($this->filename);
$mimetype = $finfo->file($this->filename);
return (strpos($mimetype, 'image/') === 0); return (strpos($mimetype, 'image/') === 0);
} }
@ -203,17 +201,12 @@ class filespec
} }
/** /**
* Get mimetype. Utilize mime_content_type if the function exist. * Get mimetype. Utilises the finfo class.
* Not used at the moment...
*/ */
function get_mimetype($filename) function get_mimetype($filename)
{ {
$mimetype = ''; $finfo = new finfo(FILEINFO_MIME_TYPE);
$mimetype = $finfo->file($filename);
if (function_exists('mime_content_type'))
{
$mimetype = mime_content_type($filename);
}
// Some browsers choke on a mimetype of application/octet-stream // Some browsers choke on a mimetype of application/octet-stream
if (!$mimetype || $mimetype == 'application/octet-stream') if (!$mimetype || $mimetype == 'application/octet-stream')