Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-25 18:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added: Incorrect image orientation

Browse source
This commit is contained in:
RainLoop Team 2015-10-29 23:02:58 +03:00
parent 217207883f
commit e3b62d24d8
87 changed files with 10461 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

137
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -8324,6 +8324,83 @@ class Actions
return $aValues;
}
/**
* @param \Imagine\Image\AbstractImage $oImage
* @param int $iOrientation
*/
private function rotateImageByOrientation(&$oImage, $iOrientation)
{
if (0 < $iOrientation)
{
switch ($iOrientation)
{
default:
case 1:
break;
case 2: // horizontal flip
$oImage->flipHorizontally();
break;
case 3: // 180 rotate left
$oImage->rotate(180);
break;
case 4: // vertical flip
$oImage->flipVertically();
break;
case 5: // vertical flip + 90 rotate right
$oImage->flipVertically();
$oImage->rotate(-90);
break;
case 6: // 90 rotate right
$oImage->rotate(-90);
break;
case 7: // horizontal flip + 90 rotate right
$oImage->flipHorizontally();
$oImage->rotate(-90);
break;
case 8: // 90 rotate left
$oImage->rotate(90);
break;
}
}
}
/**
* @param \Imagine\Image\AbstractImage $oImage
*/
private function correctImageOrientation($oImage, $bDetectImageOrientation = true, $iThumbnailBoxSize = null)
{
$iOrientation = 1;
if ($bDetectImageOrientation && \MailSo\Base\Utils::FunctionExistsAndEnabled('exif_read_data') &&
\MailSo\Base\Utils::FunctionExistsAndEnabled('gd_info'))
{
$oMetadata = $oImage->metadata(new \Imagine\Image\Metadata\ExifMetadataReader());
$iOrientation = isset($oMetadata['ifd0.Orientation']) &&
is_numeric($oMetadata['ifd0.Orientation']) ? (int) $oMetadata['ifd0.Orientation'] : 1;
}
if ($iThumbnailBoxSize && 0 < $iThumbnailBoxSize)
{
$oImage = $oImage->thumbnail(
new \Imagine\Image\Box($iThumbnailBoxSize, $iThumbnailBoxSize),
\Imagine\Image\ImageInterface::THUMBNAIL_OUTBOUND);
$this->rotateImageByOrientation($oImage, $iOrientation);
}
else
{
$this->rotateImageByOrientation($oImage, $iOrientation);
}
return $oImage;
}
/**
* @param bool $bDownload
* @param bool $bThumbnail = false
@ -8343,6 +8420,8 @@ class Actions
$sFileNameIn = isset($aValues['FileName']) ? (string) $aValues['FileName'] : '';
$sFileHashIn = isset($aValues['FileHash']) ? (string) $aValues['FileHash'] : '';
$bDetectImageOrientation = !!$this->Config()->Get('labs', 'detect_image_exif_orientation', true);
if (!empty($sFileHashIn))
{
$this->verifyCacheByKey($sRawKey);
@ -8386,7 +8465,7 @@ class Actions
$self = $this;
return $this->MailClient()->MessageMimeStream(
function($rResource, $sContentType, $sFileName, $sMimeIndex = '') use ($self, $oAccount, $sRawKey, $sContentTypeIn, $sFileNameIn, $bDownload, $bThumbnail) {
function($rResource, $sContentType, $sFileName, $sMimeIndex = '') use ($self, $oAccount, $sRawKey, $sContentTypeIn, $sFileNameIn, $bDownload, $bThumbnail, $bDetectImageOrientation) {
if ($oAccount && \is_resource($rResource))
{
$sContentTypeOut = $sContentTypeIn;
@ -8412,29 +8491,47 @@ class Actions
$bDone = false;
if ($bThumbnail && !$bDownload)
{
$sFileName = '';
$rTempResource = \MailSo\Base\StreamWrappers\TempFile::CreateStream(
\MailSo\Base\Utils::Md5Rand($sFileNameOut), $sFileName);
if (@\is_resource($rTempResource))
try
{
$oImagine = new \Imagine\Gd\Imagine();
$bDone = true;
$oImage = $oImagine->load(\stream_get_contents($rResource));
\MailSo\Base\Utils::MultipleStreamWriter($rResource, array($rTempResource));
@\fclose($rTempResource);
$oImage = $this->correctImageOrientation($oImage, $bDetectImageOrientation, 60);
try
{
$oThumb = new \PHPThumb\GD($sFileName);
if ($oThumb)
{
$oThumb->adaptiveResize(60, 60)->show();
}
}
catch (\Exception $oException)
{
$self->Logger()->WriteExceptionShort($oException);
}
\header('Content-Disposition: inline; '.
\trim(\MailSo\Base\Utils::EncodeHeaderUtf8AttributeValue('filename', $sFileNameOut.'_thumb60x60.png')), true);
$oImage->show('png');
}
catch (\Exception $oException)
{
$self->Logger()->WriteExceptionShort($oException);
}
}
if (!$bDone && !$bDownload && $bDetectImageOrientation &&
\in_array($sContentTypeOut, array('image/png', 'image/jpeg', 'image/jpg')) &&
\MailSo\Base\Utils::FunctionExistsAndEnabled('gd_info'))
{
try
{
$oImagine = new \Imagine\Gd\Imagine();
$bDone = true;
$oImage = $oImagine->load(\stream_get_contents($rResource));
$oImage = $this->correctImageOrientation($oImage, $bDetectImageOrientation);
\header('Content-Disposition: inline; '.
\trim(\MailSo\Base\Utils::EncodeHeaderUtf8AttributeValue('filename', $sFileNameOut)), true);
$oImage->show($sContentTypeOut === 'image/png' ? 'png' : 'jpg');
}
catch (\Exception $oException)
{
$self->Logger()->WriteExceptionShort($oException);
}
}

1
rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -352,6 +352,7 @@ Enables caching in the system'),
'fast_cache_memcache_port' => array(11211),
'fast_cache_memcache_expire' => array(43200),
'use_local_proxy_for_external_images' => array(false),
'detect_image_exif_orientation' => array(true),
'cookie_default_path' => array(''),
'startup_url' => array(''),
'emogrifier' => array(true),