Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 16:37:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changes for #305

Browse source
This commit is contained in:
the-djmaze 2022-04-18 19:44:16 +02:00
parent e53e21857e
commit 81392ee8a0
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
View file

@ -206,7 +206,9 @@ trait Raw
if (!$bDownload) if (!$bDownload)
{ {
$bDetectImageOrientation = !!$self->Config()->Get('labs', 'detect_image_exif_orientation', false); $bDetectImageOrientation = $self->Config()->Get('labs', 'image_exif_rotate', false)
// Mostly only JPEG has EXIF metadata
&& 'image/jpeg' == $sContentType;
try try
{ {
if ($bThumbnail) if ($bThumbnail)
@ -218,8 +220,7 @@ trait Raw
// $oImage->show('webp'); // Little Britain: "Safari says NO" // $oImage->show('webp'); // Little Britain: "Safari says NO"
exit; exit;
} }
else if ($bDetectImageOrientation && else if ($bDetectImageOrientation)
\in_array($sContentType, array('image/png', 'image/jpeg', 'image/jpg', 'image/webp')))
{ {
$oImage = static::loadImage($rResource, $bDetectImageOrientation); $oImage = static::loadImage($rResource, $bDetectImageOrientation);
\header('Content-Disposition: inline; '. \header('Content-Disposition: inline; '.
@ -292,7 +293,7 @@ trait Raw
}, $sFolder, $iUid, $sMimeIndex); }, $sFolder, $iUid, $sMimeIndex);
} }
private static function loadImage($resource, bool $bDetectImageOrientation = true, int $iThumbnailBoxSize = 0) : \SnappyMail\Image private static function loadImage($resource, bool $bDetectImageOrientation = false, int $iThumbnailBoxSize = 0) : \SnappyMail\Image
{ {
if (\extension_loaded('gmagick')) { $handler = 'gmagick'; } if (\extension_loaded('gmagick')) { $handler = 'gmagick'; }
else if (\extension_loaded('imagick')) { $handler = 'imagick'; } else if (\extension_loaded('imagick')) { $handler = 'imagick'; }

2
snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -382,7 +382,7 @@ Enables caching in the system'),
'fast_cache_redis_host' => array('127.0.0.1'), 'fast_cache_redis_host' => array('127.0.0.1'),
'fast_cache_redis_port' => array(6379), 'fast_cache_redis_port' => array(6379),
'use_local_proxy_for_external_images' => array(true), 'use_local_proxy_for_external_images' => array(true),
'detect_image_exif_orientation' => array(false), 'image_exif_rotate' => array(false),
'cookie_default_path' => array(''), 'cookie_default_path' => array(''),
'cookie_default_secure' => array(false), 'cookie_default_secure' => array(false),
'check_new_messages' => array(true), 'check_new_messages' => array(true),