fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 11:44:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

EXIF 제거 옵션 추가

Browse source
This commit is contained in:
conory 2019-10-04 16:45:11 +09:00
parent 1075b528d6
commit a208526a5c
9 changed files with 87 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/file/file.controller.php
View file

@ -1091,6 +1091,7 @@ class fileController extends file
$file_info['height'] = $image_info['height'];
// Set base information
$force = false;
$adjusted = [
'width' => $image_info['width'],
'height' => $image_info['height'],
@ -1141,7 +1142,6 @@ class fileController extends file
$adjusted['rotate'] = $rotate;
}
}
unset($exif);
}
// Adjust image size
@ -1191,8 +1191,22 @@ class fileController extends file
}
}
// Set force for remove EXIF data
if($config->image_remove_exif_data && $image_info['type'] === 'jpg' && function_exists('exif_read_data'))
{
if(!isset($exif))
{
$exif = @exif_read_data($file_info['tmp_name']);
}
if($exif && (isset($exif['Model']) || isset($exif['Software']) || isset($exif['GPSVersion'])))
{
$force = true;
}
}
// Convert image if adjusted
if (
$force ||
$adjusted['width'] !== $image_info['width'] ||
$adjusted['height'] !== $image_info['height'] ||
$adjusted['type'] !== $image_info['type'] ||
@ -1220,7 +1234,7 @@ class fileController extends file
if ($result)
{
$thumbnail_name = $file_info['tmp_name'] . '.thumbnail.jpg';
if (FileHandler::createImageFile($file_info['tmp_name'], $thumbnail_name, $adjusted['width'], $adjusted['height'], 'jpg'))
if (FileHandler::createImageFile($file_info['tmp_name'], $thumbnail_name, $adjusted['width'], $adjusted['height'], 'jpg', 'crop', $adjusted['quality']))
{
$file_info['thumbnail'] = $thumbnail_name;
}