mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-04 17:21:39 +09:00
Add option to maintain file format when resizing #1508
This commit is contained in:
Kijin Sung
parent
198bb1b079
commit
32aae27a13
6 changed files with 32 additions and 6 deletions
|
|
@ -71,6 +71,7 @@ class fileAdminController extends file
|
|||
$config->max_image_width = intval(Context::get('max_image_width')) ?: '';
|
||||
$config->max_image_height = intval(Context::get('max_image_height')) ?: '';
|
||||
$config->max_image_size_action = Context::get('max_image_size_action') ?: '';
|
||||
$config->max_image_size_same_format = Context::get('max_image_size_same_format') === 'Y' ? 'Y' : 'N';
|
||||
$config->max_image_size_admin = Context::get('max_image_size_admin') === 'Y' ? 'Y' : 'N';
|
||||
$config->image_quality_adjustment = max(50, min(100, intval(Context::get('image_quality_adjustment'))));
|
||||
$config->image_autorotate = Context::get('image_autorotate') === 'Y' ? true : false;
|
||||
|
|
@ -210,6 +211,7 @@ class fileAdminController extends file
|
|||
$config->max_image_width = intval(Context::get('max_image_width')) ?: '';
|
||||
$config->max_image_height = intval(Context::get('max_image_height')) ?: '';
|
||||
$config->max_image_size_action = Context::get('max_image_size_action') ?: '';
|
||||
$config->max_image_size_same_format = Context::get('max_image_size_same_format') === 'Y' ? 'Y' : 'N';
|
||||
$config->max_image_size_admin = Context::get('max_image_size_admin') === 'Y' ? 'Y' : 'N';
|
||||
$config->image_quality_adjustment = max(50, min(100, intval(Context::get('image_quality_adjustment'))));
|
||||
$config->image_autorotate = Context::get('image_autorotate') === 'Y' ? true : false;
|
||||
|
|
|
|||
|
|
@ -1098,7 +1098,7 @@ class fileController extends file
|
|||
|
||||
$adjusted['width'] = (int)$resize_width;
|
||||
$adjusted['height'] = (int)$resize_height;
|
||||
if (!$is_animated && $adjusted['type'] === $image_info['type'])
|
||||
if (!$is_animated && $adjusted['type'] === $image_info['type'] && $config->max_image_size_same_format !== 'Y')
|
||||
{
|
||||
$adjusted['type'] = 'jpg';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,6 +90,8 @@ $lang->about_max_image_size = 'limit the size of uploaded images.<br />This limi
|
|||
$lang->max_image_size_action_nothing = 'If exceeded, do nothing';
|
||||
$lang->max_image_size_action_block = 'If exceeded, block upload';
|
||||
$lang->max_image_size_action_resize = 'If exceeded, resize automatically';
|
||||
$lang->max_image_size_same_format_Y = 'Maintain file format';
|
||||
$lang->max_image_size_same_format_N = 'Convert to JPG';
|
||||
$lang->max_image_size_admin = 'Also apply to administrator';
|
||||
$lang->image_quality_adjustment = 'Image Quality';
|
||||
$lang->about_image_quality_adjustment = 'adjust the quality of images that will is converted by other settings.<br />If set to more than 75% (Standard), the file size may be larger than the original.';
|
||||
|
|
@ -97,8 +99,8 @@ $lang->image_autorotate = 'Fix Image Rotation';
|
|||
$lang->about_image_autorotate = 'correct images that are rotated by mobile devices.';
|
||||
$lang->image_remove_exif_data = 'Remove EXIF';
|
||||
$lang->about_image_remove_exif_data = 'remove EXIF data including camera, GPS information, and more in image file for privacy.<br />Even if this option is not used, EXIF data may be removed when the image is converted by other settings.';
|
||||
$lang->image_autoconv_gif2mp4 = 'Convert GIF';
|
||||
$lang->about_image_autoconv_gif2mp4 = 'convert animated GIF images into MP4 videos to save storage and bandwidth.<br />Videos may not play properly in older browsers.';
|
||||
$lang->image_autoconv_gif2mp4 = 'Convert GIF to MP4';
|
||||
$lang->about_image_autoconv_gif2mp4 = 'convert animated GIF images into MP4 videos to save storage and bandwidth.<br />This requires ffmpeg settings below. Videos may not play properly in older browsers.';
|
||||
$lang->video_thumbnail = 'Video Thumbnail';
|
||||
$lang->about_video_thumbnail = 'extract a thumbnail image from uploaded video.';
|
||||
$lang->video_mp4_gif_time = 'Treat as GIF';
|
||||
|
|
|
|||
|
|
@ -91,6 +91,8 @@ $lang->about_max_image_size = '업로드된 이미지의 크기를 제한하거
|
|||
$lang->max_image_size_action_nothing = '초과시 아무 것도 하지 않음';
|
||||
$lang->max_image_size_action_block = '초과시 업로드 금지';
|
||||
$lang->max_image_size_action_resize = '초과시 자동 크기 조정';
|
||||
$lang->max_image_size_same_format_Y = '동일한 포맷 유지';
|
||||
$lang->max_image_size_same_format_N = 'JPG로 변환';
|
||||
$lang->max_image_size_admin = '관리자에게도 적용';
|
||||
$lang->image_quality_adjustment = '이미지 화질';
|
||||
$lang->about_image_quality_adjustment = '다른 설정에 의해 이미지가 변환될 경우 화질을 조정합니다.<br />75% (표준) 이상으로 설정시 오히려 원본보다 용량이 늘어날 수 있습니다.';
|
||||
|
|
@ -98,8 +100,8 @@ $lang->image_autorotate = '이미지 회전 수정';
|
|||
$lang->about_image_autorotate = '모바일 기기 등에서 잘못 회전된 이미지를 바로잡습니다.';
|
||||
$lang->image_remove_exif_data = 'EXIF 제거';
|
||||
$lang->about_image_remove_exif_data = '프라이버시를 위해 이미지 파일에서 카메라, GPS 정보 등이 포함되어 있는 EXIF 데이터를 삭제합니다.<br />이 옵션을 사용하지 않아도 다른 설정에 의해 이미지가 변환될 경우에도 EXIF 데이터가 삭제될 수 있습니다.';
|
||||
$lang->image_autoconv_gif2mp4 = 'GIF 변환';
|
||||
$lang->about_image_autoconv_gif2mp4 = '움직이는 GIF 이미지를 MP4 동영상으로 변환하여 용량 및 트래픽을 절약합니다.<br />구형 브라우저에서는 동영상이 재생되지 않을 수도 있습니다.';
|
||||
$lang->image_autoconv_gif2mp4 = 'GIF → MP4 변환';
|
||||
$lang->about_image_autoconv_gif2mp4 = '움직이는 GIF 이미지를 MP4 동영상으로 변환하여 용량 및 트래픽을 절약합니다.<br />아래에서 ffmpeg 설정을 해야 하며, 구형 브라우저에서는 동영상이 재생되지 않을 수도 있습니다.';
|
||||
$lang->video_thumbnail = '동영상 섬네일';
|
||||
$lang->about_video_thumbnail = '업로드된 동영상에서 섬네일 이미지를 추출합니다.';
|
||||
$lang->video_mp4_gif_time = 'GIF로 취급';
|
||||
|
|
|
|||
|
|
@ -82,12 +82,22 @@
|
|||
</select>
|
||||
<p class="x_help-block">
|
||||
{$lang->about_max_image_size}
|
||||
</p>
|
||||
<p class="x_help-block">
|
||||
<label class="x_inline" for="max_image_size_same_format_Y">
|
||||
<input type="radio" name="max_image_size_same_format" id="max_image_size_same_format_Y" value="Y" checked="checked"|cond="$config->max_image_size_same_format === 'Y'" />
|
||||
{$lang->max_image_size_same_format_Y}
|
||||
</label>
|
||||
<label class="x_inline" for="max_image_size_same_format_N">
|
||||
<input type="radio" name="max_image_size_same_format" id="max_image_size_same_format_N" value="N" checked="checked"|cond="$config->max_image_size_same_format !== 'Y'" />
|
||||
{$lang->max_image_size_same_format_N}
|
||||
</label>
|
||||
<label for="max_image_size_admin">
|
||||
<input type="checkbox" name="max_image_size_admin" id="max_image_size_admin" value="Y" checked="checked"|cond="$config->max_image_size_admin === 'Y'" />
|
||||
{$lang->max_image_size_admin}
|
||||
</label>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="x_control-group">
|
||||
<label class="x_control-label">{$lang->image_quality_adjustment}</label>
|
||||
|
|
|
|||
|
|
@ -62,6 +62,16 @@
|
|||
</select>
|
||||
<p class="x_help-block">
|
||||
{$lang->about_max_image_size}
|
||||
</p>
|
||||
<p class="x_help-block">
|
||||
<label class="x_inline" for="max_image_size_same_format_Y">
|
||||
<input type="radio" name="max_image_size_same_format" id="max_image_size_same_format_Y" value="Y" checked="checked"|cond="$config->max_image_size_same_format === 'Y'" />
|
||||
{$lang->max_image_size_same_format_Y}
|
||||
</label>
|
||||
<label class="x_inline" for="max_image_size_same_format_N">
|
||||
<input type="radio" name="max_image_size_same_format" id="max_image_size_same_format_N" value="N" checked="checked"|cond="$config->max_image_size_same_format !== 'Y'" />
|
||||
{$lang->max_image_size_same_format_N}
|
||||
</label>
|
||||
<label for="max_image_size_admin">
|
||||
<input type="checkbox" name="max_image_size_admin" id="max_image_size_admin" value="Y" checked="checked"|cond="$config->max_image_size_admin === 'Y'" />
|
||||
{$lang->max_image_size_admin}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue