extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 00:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Resources: fixed image upload failed for some browsers (Picture type not supported)

Browse Source 
caused by reporting application/octet-stream instead of image mime-type
This commit is contained in:
Ralf Becker 2018-03-20 17:59:19 +01:00
parent e7df918794
commit fa93d64bac
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/inc/class.resources_bo.inc.php
View File

@ -897,8 +897,12 @@ class resources_bo
* @param int $resource_id * @param int $resource_id
* @return mixed string with msg if somthing went wrong; nothing if all right * @return mixed string with msg if somthing went wrong; nothing if all right
*/ */
function save_picture($file,$resouce_id) function save_picture($file,$resource_id)
{ {
if ($file['type'] == 'application/octet-stream')
{
$file['type'] = Api\MimeMagic::filename2mime($file['name']);
}
switch($file['type']) switch($file['type'])
{ {
case 'image/gif': case 'image/gif':
@ -913,14 +917,14 @@ class resources_bo
$src_img = imagecreatefrompng($file['tmp_name']); $src_img = imagecreatefrompng($file['tmp_name']);
break; break;
default: default:
return lang('Picture type is not supported, sorry!'); return $file['type'].': '.lang('Picture type is not supported, sorry!');
} }
$tmp_name = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'resources-picture'); $tmp_name = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'resources-picture');
imagejpeg($src_img,$tmp_name); imagejpeg($src_img,$tmp_name);
imagedestroy($src_img); imagedestroy($src_img);
Link::attach_file('resources',$resouce_id,array( Link::attach_file('resources',$resource_id,array(
'tmp_name' => $tmp_name, 'tmp_name' => $tmp_name,
'name' => self::PICTURE_NAME, 'name' => self::PICTURE_NAME,
'type' => 'image/jpeg', 'type' => 'image/jpeg',