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

Missed one use of $headers. Was used in only one other place. Also, change the function so that if anyone else uses it in the future it doesn't throw warnings.

Browse Source
This commit is contained in:
jgen 2015-06-01 17:57:34 -07:00
parent 6a6480181d
commit 4bf56364eb
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/util.inc.php
View File

@ -991,17 +991,29 @@ if (!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/func
} }
} }
function findHeader ($headers, $name){ /**
//HTTP Headers can sometimes be lowercase which will cause issues. * HTTP Headers can sometimes be lowercase which will cause issues.
//In cases like these, we need to make sure to check for them if the camelcase version does not exist. * In cases like these, we need to make sure to check for them if the camelcase version does not exist.
$header = FALSE; *
* @param array $headers
* @param mixed $key
* @return mixed
*/
function findHeader ($headers, $name) {
if (!is_array($headers) {
return false;
}
if(array_key_exists($name, $headers)){ $header = false;
if(array_key_exists($name, $headers)) {
$header = $headers[$name]; $header = $headers[$name];
}else{ } else {
$headers = array_change_key_case($headers); $headers = array_change_key_case($headers); // convert all to lower case.
if(array_key_exists(strtolower($name), $headers)){ $lc_name = strtolower($name);
$header = $headers[strtolower($name)];
if(array_key_exists($lc_name, $headers)) {
$header = $headers[$lc_name];
} }
} }

7
ext/upload/main.php
View File

@ -385,10 +385,15 @@ class Upload extends Extension {
$pathinfo = pathinfo($url); $pathinfo = pathinfo($url);
$metadata = array(); $metadata = array();
$metadata['filename'] = $filename; $metadata['filename'] = $filename;
$metadata['extension'] = getExtension(findHeader($headers, 'Content-Type')) ?: $pathinfo['extension'];
$metadata['tags'] = $tags; $metadata['tags'] = $tags;
$metadata['source'] = (($url == $source) && !$config->get_bool('upload_tlsource') ? "" : $source); $metadata['source'] = (($url == $source) && !$config->get_bool('upload_tlsource') ? "" : $source);
if (is_array($headers)) {
$metadata['extension'] = getExtension(findHeader($headers, 'Content-Type'));
} else {
$metadata['extension'] = $pathinfo['extension'];
}
/* check for locked > adds to metadata if it has */ /* check for locked > adds to metadata if it has */
if(!empty($locked)){ if(!empty($locked)){
$metadata['locked'] = $locked ? "on" : ""; $metadata['locked'] = $locked ? "on" : "";