harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'revert-3f61d24d' into 'dev'

Browse Source 
Revert "Merge branch 'check_content_type' into 'dev'"

See merge request hubzilla/core!1456
This commit is contained in:
Max Kostikov 2019-01-03 17:18:52 +01:00
commit 1c4a90626a
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/photo/photo_driver.php
View File

@ -482,6 +482,7 @@ function guess_image_type($filename, $headers = '') {
// logger('Photo: guess_image_type: '.$filename . ($headers?' from curl headers':''), LOGGER_DEBUG); // logger('Photo: guess_image_type: '.$filename . ($headers?' from curl headers':''), LOGGER_DEBUG);
$type = null; $type = null;
if ($headers) { if ($headers) {
$hdrs=array(); $hdrs=array();
$h = explode("\n",$headers); $h = explode("\n",$headers);
foreach ($h as $l) { foreach ($h as $l) {
@ -489,16 +490,11 @@ function guess_image_type($filename, $headers = '') {
$hdrs[strtolower($k)] = $v; $hdrs[strtolower($k)] = $v;
} }
logger('Curl headers: '.var_export($hdrs, true), LOGGER_DEBUG); logger('Curl headers: '.var_export($hdrs, true), LOGGER_DEBUG);
if (array_key_exists('content-type', $hdrs)) { if (array_key_exists('content-type', $hdrs))
$type = $hdrs['content-type']; $type = $hdrs['content-type'];
$ph = photo_factory('');
$types = $ph->supportedTypes();
$type = $types[$type];
}
} }
if (is_null($type)){ if (is_null($type)){
$ignore_imagick = get_config('system', 'ignore_imagick'); $ignore_imagick = get_config('system', 'ignore_imagick');
// Guessing from extension? Isn't that... dangerous? // Guessing from extension? Isn't that... dangerous?
if(class_exists('Imagick') && file_exists($filename) && is_readable($filename) && !$ignore_imagick) { if(class_exists('Imagick') && file_exists($filename) && is_readable($filename) && !$ignore_imagick) {
@ -642,6 +638,7 @@ function import_xchan_photo($photo,$xchan,$thing = false,$force = false) {
$img_str = $result['body']; $img_str = $result['body'];
$type = guess_image_type($photo, $result['header']); $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())); $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)) if(is_null($type))
$photo_failure = true; $photo_failure = true;
} }