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

Implement automatically resizing images that are too large

Browse source
This commit is contained in:
Kijin Sung 2019-08-01 02:13:25 +09:00
parent c95f84adb8
commit 1e5eedf3e0
1 changed files with 42 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

64
modules/file/file.controller.php
View file

@ -863,6 +863,7 @@ class fileController extends file
// Sanitize filename // Sanitize filename
$file_info['name'] = Rhymix\Framework\Filters\FilenameFilter::clean($file_info['name']); $file_info['name'] = Rhymix\Framework\Filters\FilenameFilter::clean($file_info['name']);
$file_info['resized'] = false;
// Get extension // Get extension
$extension = explode('.', $file_info['name']) ?: array(''); $extension = explode('.', $file_info['name']) ?: array('');
@ -891,28 +892,10 @@ class fileController extends file
} }
} }
// Check file size
$allowed_filesize = $config->allowed_filesize * 1024 * 1024;
$allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
if($allowed_filesize < filesize($file_info['tmp_name']))
{
throw new Rhymix\Framework\Exception('msg_exceeds_limit_size');
}
// Get total size of all attachements
$size_args = new stdClass;
$size_args->upload_target_srl = $upload_target_srl;
$output = executeQuery('file.getAttachedFileSize', $size_args);
$attached_size = (int)$output->data->attached_size + filesize($file_info['tmp_name']);
if($attached_size > $allowed_attach_size)
{
throw new Rhymix\Framework\Exception('msg_exceeds_limit_size');
}
// Check image dimensions // Check image dimensions
if($config->max_image_size_action && ($config->max_image_width || $config->max_image_height)) if($config->max_image_size_action && ($config->max_image_width || $config->max_image_height))
{ {
if(in_array($extension, array('gif', 'jpg', 'png', 'webp', 'bmp'))) if(in_array($extension, array('gif', 'jpg', 'jpeg', 'png', 'webp', 'bmp')))
{ {
if ($image_info = @getimagesize($file_info['tmp_name'])) if ($image_info = @getimagesize($file_info['tmp_name']))
{ {
@ -948,7 +931,25 @@ class fileController extends file
} }
else else
{ {
// TODO $resize_width = $image_width;
$resize_height = $image_height;
if ($config->max_image_width > 0 && $image_width > $config->max_image_width)
{
$resize_width = $config->max_image_width;
$resize_height = $image_height * ($config->max_image_width / $image_width);
}
if ($config->max_image_height > 0 && $resize_height > $config->max_image_height)
{
$resize_width = $resize_width * ($config->max_image_height / $resize_height);
$resize_height = $config->max_image_height;
}
$target_type = ($extension === 'webp' || $extension === 'bmp') ? 'jpg' : $extension;
$resize_result = FileHandler::createImageFile($file_info['tmp_name'], $file_info['tmp_name'] . '.resized', intval($resize_width), intval($resize_height), $target_type);
if ($resize_result)
{
$file_info['tmp_name'] = $file_info['tmp_name'] . '.resized';
$file_info['size'] = filesize($file_info['tmp_name']);
$file_info['resized'] = true;
} }
} }
} }
@ -956,6 +957,25 @@ class fileController extends file
} }
} }
// Check file size
$file_size = filesize($file_info['tmp_name']);
$allowed_filesize = $config->allowed_filesize * 1024 * 1024;
$allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
if($allowed_filesize < $file_size)
{
throw new Rhymix\Framework\Exception('msg_exceeds_limit_size');
}
// Get total size of all attachements
$size_args = new stdClass;
$size_args->upload_target_srl = $upload_target_srl;
$output = executeQuery('file.getAttachedFileSize', $size_args);
if($allowed_attach_size < intval($output->data->attached_size) + $file_size)
{
throw new Rhymix\Framework\Exception('msg_exceeds_limit_size');
}
}
// Get file_srl // Get file_srl
$file_srl = getNextSequence(); $file_srl = getNextSequence();
$file_regdate = date('YmdHis'); $file_regdate = date('YmdHis');
@ -992,7 +1012,7 @@ class fileController extends file
} }
// Move the file // Move the file
if($manual_insert) if($manual_insert && !$file_info['resized'])
{ {
@copy($file_info['tmp_name'], $filename); @copy($file_info['tmp_name'], $filename);
if(!file_exists($filename)) if(!file_exists($filename))
@ -1004,7 +1024,7 @@ class fileController extends file
} }
} }
} }
elseif(starts_with(RX_BASEDIR . 'files/attach/chunks/', $file_info['tmp_name'])) elseif(starts_with(RX_BASEDIR . 'files/attach/chunks/', $file_info['tmp_name']) || $file_info['resized'])
{ {
if (!Rhymix\Framework\Storage::move($file_info['tmp_name'], $filename)) if (!Rhymix\Framework\Storage::move($file_info['tmp_name'], $filename))
{ {