Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-06 20:24:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix IHTTPResult::getHeader()

Browse source 
- Now returns a string array, like expected
- Fix usages
- Fix dataset
This commit is contained in:
Philipp 2020-10-09 22:28:41 +02:00
parent f3cd973cbe
commit 80bd0a4d5a
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
11 changed files with 68 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Util/Images.php
View file

@ -75,23 +75,25 @@ class Images
/**
* Fetch image mimetype from the image data or guessing from the file name
*
* @param string $image_data Image data
* @param string $filename File name (for guessing the type via the extension)
* @param string $mime default mime type
* @param string $image_data Image data
* @param string $filename File name (for guessing the type via the extension)
* @param string[] $mimeTypes possible mime types
*
* @return string
* @throws \Exception
*/
public static function getMimeTypeByData(string $image_data, string $filename = '', string $mime = '')
public static function getMimeTypeByData(string $image_data, string $filename = '', array $mimeTypes = [])
{
if (substr($mime, 0, 6) == 'image/') {
Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $mime]);
return $mime;
foreach ($mimeTypes as $mimeType) {
if (substr($mimeType, 0, 6) == 'image/') {
Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $mimeTypes]);
return $mimeType;
}
}
$image = @getimagesizefromstring($image_data);
if (!empty($image['mime'])) {
Logger::info('Mime type detected via data', ['filename' => $filename, 'default' => $mime, 'mime' => $image['mime']]);
Logger::info('Mime type detected via data', ['filename' => $filename, 'default' => $mimeTypes, 'mime' => $image['mime']]);
return $image['mime'];
}