james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use the Content-Disposition header for filename & Content-Type for

Browse Source 
extension
if either doesn't exist, it will fallback to using pathinfo
This commit is contained in:
Daku 2014-01-03 00:58:53 +00:00
parent 9f06a5c565
commit 9cae856df7
2 changed files with 67 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
core/util.inc.php
View File

@ -801,17 +801,24 @@ function transload($url, $mfile) {
$ch = curl_init($url); $ch = curl_init($url);
$fp = fopen($mfile, "w"); $fp = fopen($mfile, "w");
curl_setopt($ch, CURLOPT_FILE, $fp); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_HEADER, 0); curl_setopt($ch, CURLOPT_VERBOSE, 1);
curl_setopt($ch, CURLOPT_HEADER, 1);
curl_setopt($ch, CURLOPT_REFERER, $url); curl_setopt($ch, CURLOPT_REFERER, $url);
curl_setopt($ch, CURLOPT_USERAGENT, "Shimmie-".VERSION); curl_setopt($ch, CURLOPT_USERAGENT, "Shimmie-".VERSION);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
curl_exec($ch); $response = curl_exec($ch);
$header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
$headers = http_parse_headers(implode("\n", preg_split('/\R/', rtrim(substr($response, 0, $header_size)))));
$body = substr($response, $header_size);
curl_close($ch); curl_close($ch);
fwrite($fp, $body);
fclose($fp); fclose($fp);
return true; return $headers;
} }
if($config->get_string("transload_engine") === "wget") { if($config->get_string("transload_engine") === "wget") {
@ -839,12 +846,59 @@ function transload($url, $mfile) {
fwrite($fp, $data); fwrite($fp, $data);
fclose($fp); fclose($fp);
return true; $headers = http_parse_headers(implode("\n", $http_response_header));
return $headers;
} }
return false; return false;
} }
if (!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/function.http-parse-headers.php#112917
function http_parse_headers ($raw_headers){
$headers = array(); // $headers = [];
foreach (explode("\n", $raw_headers) as $i => $h) {
$h = explode(':', $h, 2);
if (isset($h[1])){
if(!isset($headers[$h[0]])){
$headers[$h[0]] = trim($h[1]);
}else if(is_array($headers[$h[0]])){
$tmp = array_merge($headers[$h[0]],array(trim($h[1])));
$headers[$h[0]] = $tmp;
}else{
$tmp = array_merge(array($headers[$h[0]]),array(trim($h[1])));
$headers[$h[0]] = $tmp;
}
}
}
return $headers;
}
}
function getExtension ($mime_type){
if(empty($mime_type)){
return false;
}
$extensions = array(
'image/jpeg' => 'jpg',
'image/gif' => 'gif',
'image/png' => 'png',
'application/x-shockwave-flash' => 'swf',
'image/x-icon' => 'ico',
'image/svg+xml' => 'svg',
'audio/mpeg' => 'mp3',
'video/x-flv' => 'flv',
'audio/mp4' => 'mp4',
'video/mp4' => 'mp4',
'audio/webm' => 'webm',
'video/webm' => 'webm'
);
return $extensions[$mime_type];
}
$_included = array(); $_included = array();
/** /**

14
ext/upload/main.php
View File

@ -329,9 +329,12 @@ class Upload extends Extension {
} }
$tmp_filename = tempnam(ini_get('upload_tmp_dir'), "shimmie_transload"); $tmp_filename = tempnam(ini_get('upload_tmp_dir'), "shimmie_transload");
$filename = basename($url);
if(!transload($url, $tmp_filename)) { $headers = transload($url, $tmp_filename);
$h_filename = (isset($headers['Content-Disposition']) ? preg_replace('/^.*filename="([^ ]+)"/i', '$1', $headers['Content-Disposition']) : null);
$filename = $h_filename ?: basename($url);
if(!$headers) {
$this->theme->display_upload_error($page, "Error with ".html_escape($filename), $this->theme->display_upload_error($page, "Error with ".html_escape($filename),
"Error reading from ".html_escape($url)); "Error reading from ".html_escape($url));
return false; return false;
@ -341,12 +344,11 @@ class Upload extends Extension {
$this->theme->display_upload_error($page, "Error with ".html_escape($filename), $this->theme->display_upload_error($page, "Error with ".html_escape($filename),
"No data found -- perhaps the site has hotlink protection?"); "No data found -- perhaps the site has hotlink protection?");
$ok = false; $ok = false;
} }else{
else {
global $user; global $user;
$pathinfo = pathinfo($url); $pathinfo = pathinfo($url);
$metadata['filename'] = $pathinfo['basename']; $metadata['filename'] = $filename;
$metadata['extension'] = $pathinfo['extension']; $metadata['extension'] = getExtension($headers['Content-Type']) ?: $pathinfo['extension'];
$metadata['tags'] = $tags; $metadata['tags'] = $tags;
$metadata['source'] = $source; $metadata['source'] = $source;