aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-01-03 19:41:00 +0100
committerMax Kostikov <max@kostikov.co>2019-01-03 19:41:00 +0100
commit48821a6da5832b5eb843503121871231f78b1103 (patch)
tree3843118ac23584abd1d7c9a2d375246ad1c22781 /include
parent1c4a90626aca63d15fc1ce50339c8630702188e6 (diff)
parentb93bc142d3e6efa050d8cd75b367f607ee88eb2e (diff)
downloadvolse-hubzilla-48821a6da5832b5eb843503121871231f78b1103.tar.gz
volse-hubzilla-48821a6da5832b5eb843503121871231f78b1103.tar.bz2
volse-hubzilla-48821a6da5832b5eb843503121871231f78b1103.zip
Merge branch 'check_content_type-1' into 'dev'
fix content type check See merge request hubzilla/core!1458
Diffstat (limited to 'include')
-rw-r--r--include/photo/photo_driver.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 9aeb2ef17..5c8ed9bdc 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -482,7 +482,6 @@ function guess_image_type($filename, $headers = '') {
// logger('Photo: guess_image_type: '.$filename . ($headers?' from curl headers':''), LOGGER_DEBUG);
$type = null;
if ($headers) {
-
$hdrs=array();
$h = explode("\n",$headers);
foreach ($h as $l) {
@@ -490,11 +489,16 @@ function guess_image_type($filename, $headers = '') {
$hdrs[strtolower($k)] = $v;
}
logger('Curl headers: '.var_export($hdrs, true), LOGGER_DEBUG);
- if (array_key_exists('content-type', $hdrs))
- $type = $hdrs['content-type'];
+ if (array_key_exists('content-type', $hdrs)) {
+ $ph = photo_factory('');
+ $types = $ph->supportedTypes();
+
+ if(array_key_exists($hdrs['content-type'], $types))
+ $type = $hdrs['content-type'];
+ }
}
- if (is_null($type)){
+ if (is_null($type)){
$ignore_imagick = get_config('system', 'ignore_imagick');
// Guessing from extension? Isn't that... dangerous?
if(class_exists('Imagick') && file_exists($filename) && is_readable($filename) && !$ignore_imagick) {
@@ -638,7 +642,6 @@ function import_xchan_photo($photo,$xchan,$thing = false,$force = false) {
$img_str = $result['body'];
$type = guess_image_type($photo, $result['header']);
$modified = gmdate('Y-m-d H:i:s', (preg_match('/last-modified: (.+) \S+/i', $result['header'], $o) ? strtotime($o[1] . 'Z') : time()));
-
if(is_null($type))
$photo_failure = true;
}