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

[ticket/13031] Guess with all mimetype guessers and pick best guess

Browse source 
PHPBB3-13031
This commit is contained in:
Marc Alexander 2014-09-04 22:32:08 +02:00
parent 7de15bc54c
commit d31ff51785
2 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions_upload.php
View file

@ -232,9 +232,9 @@ class filespec
{ {
if ($this->mimetype_guesser !== null) if ($this->mimetype_guesser !== null)
{ {
$mimetype = $this->mimetype_guesser->guess($filename); $mimetype = $this->mimetype_guesser->guess($filename, $this->uploadname);
if (empty($this->mimetype) || $mimetype !== 'application/octet-stream') if ($mimetype !== 'application/octet-stream')
{ {
$this->mimetype = $mimetype; $this->mimetype = $mimetype;
} }

39
phpBB/phpbb/mimetype/guesser.php
View file

@ -115,17 +115,42 @@ class guesser
return false; return false;
} }
$mimetype = 'application/octet-stream';
foreach ($this->guessers as $guesser) foreach ($this->guessers as $guesser)
{ {
$mimetype = $guesser->guess($file, $file_name); $mimetype_guess = $guesser->guess($file, $file_name);
// Try to guess something that is not the fallback application/octet-stream $mimetype = $this->choose_mime_type($mimetype, $mimetype_guess);
if ($mimetype !== null && $mimetype !== 'application/octet-stream')
{
return $mimetype;
}
} }
// Return any mimetype if we got a result or the fallback value // Return any mimetype if we got a result or the fallback value
return (!empty($mimetype)) ? $mimetype : 'application/octet-stream'; return $mimetype;
}
/**
* Choose the best mime type based on the current mime type and the guess
* If a guesser returns nulls or application/octet-stream, we will keep
* the current guess. Guesses with a slash inside them will be favored over
* already existing without slashes. However, any guess that will pass the
* first check will always overwrite the default application/octet-stream.
*
* @param string $mime_type The current mime type
* @param string $guess The current mime type guess
*
* @return string The best mime type based on current mime type and guess
*/
protected function choose_mime_type($mime_type, $guess)
{
if ($guess === null || $guess == 'application/octet-stream')
{
return $mime_type;
}
if ((strpos($mime_type, '/') === false || $mime_type == 'application/octet-stream') && strpos($guess, '/') !== false)
{
$mime_type = $guess;
}
return $mime_type;
} }
} }