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

Improved mail message CSS handling due to broken Amazon mails

Browse source 
Resolves issue #108
This commit is contained in:
djmaze 2021-08-23 10:49:25 +02:00
parent cc03546484
commit 52e7cfb6a3
1 changed files with 15 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

56
snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
View file

@ -290,7 +290,7 @@ abstract class HtmlUtils
public static function ClearStyle(string $sStyle, \DOMElement $oElement, bool &$bHasExternals, array &$aFoundCIDs, public static function ClearStyle(string $sStyle, \DOMElement $oElement, bool &$bHasExternals, array &$aFoundCIDs,
array $aContentLocationUrls, array &$aFoundedContentLocationUrls, bool $bDoNotReplaceExternalUrl = false, $fAdditionalExternalFilter = null) array $aContentLocationUrls, array &$aFoundedContentLocationUrls, bool $bDoNotReplaceExternalUrl = false, $fAdditionalExternalFilter = null)
{ {
$sStyle = \trim($sStyle); $sStyle = \trim($sStyles, " \n\r\t\v\0;");
$aOutStyles = array(); $aOutStyles = array();
$aStyles = \explode(';', $sStyle); $aStyles = \explode(';', $sStyle);
@ -323,7 +323,7 @@ abstract class HtmlUtils
{ {
// skip // skip
} }
else */if (\in_array($sName, array('behavior', 'pointer-events')) || else */if (\in_array($sName, array('behavior', 'pointer-events', 'visibility')) ||
('cursor' === $sName && !\in_array(\strtolower($sValue), array('none', 'cursor'))) || ('cursor' === $sName && !\in_array(\strtolower($sValue), array('none', 'cursor'))) ||
('display' === $sName && 'none' === \strtolower($sValue)) || ('display' === $sName && 'none' === \strtolower($sValue)) ||
\preg_match('/expression/i', $sValue) || \preg_match('/expression/i', $sValue) ||
@ -503,22 +503,6 @@ abstract class HtmlUtils
unset($aNodes); unset($aNodes);
} }
public static function ClearHtmlSimple(string $sHtml, bool $bDoNotReplaceExternalUrl = false, bool $bFindLinksInHtml = false, bool $bWrapByFakeHtmlAndBodyDiv = true) : string
{
$bHasExternals = false;
$aFoundCIDs = array();
$aContentLocationUrls = array();
$aFoundedContentLocationUrls = array();
$fAdditionalExternalFilter = null;
$fAdditionalDomReader = null;
$bTryToDetectHiddenImages = false;
return static::ClearHtml($sHtml, $bHasExternals, $aFoundCIDs,
$aContentLocationUrls, $aFoundedContentLocationUrls, $bDoNotReplaceExternalUrl, $bFindLinksInHtml,
$fAdditionalExternalFilter, $fAdditionalDomReader, $bTryToDetectHiddenImages,
$bWrapByFakeHtmlAndBodyDiv);
}
/** /**
* @param callback|null $fAdditionalExternalFilter = null * @param callback|null $fAdditionalExternalFilter = null
* @param callback|null $fAdditionalDomReader = null * @param callback|null $fAdditionalDomReader = null
@ -585,6 +569,8 @@ abstract class HtmlUtils
$aRemovedAttrs = array(); $aRemovedAttrs = array();
$sTagNameLower = \strtolower($oElement->tagName); $sTagNameLower = \strtolower($oElement->tagName);
$sStyles = $oElement->hasAttribute('style') ? \trim($oElement->getAttribute('style'), " \n\r\t\v\0;") : '';
// convert body attributes to styles // convert body attributes to styles
if ('body' === $sTagNameLower) if ('body' === $sTagNameLower)
{ {
@ -649,23 +635,18 @@ abstract class HtmlUtils
if (0 < \count($aStyles)) if (0 < \count($aStyles))
{ {
$sStyles = $oElement->hasAttribute('style') ? \trim(\trim(\trim($oElement->getAttribute('style')), ';')) : ''; $sStyles .= $sStyles . '; ' . \implode('; ', $aStyles);
$oElement->setAttribute('style', (empty($sStyles) ? '' : $sStyles.'; ').\implode('; ', $aStyles));
} }
} }
if ('iframe' === $sTagNameLower || 'frame' === $sTagNameLower) else if ('iframe' === $sTagNameLower || 'frame' === $sTagNameLower)
{ {
$oElement->setAttribute('src', 'javascript:false'); $oElement->setAttribute('src', 'javascript:false');
} }
if ('a' === $sTagNameLower && !empty($sLinkColor)) else if ('a' === $sTagNameLower && !empty($sLinkColor))
{ {
$sStyles = $oElement->hasAttribute('style') $sStyles .= '; color: '.$sLinkColor;
? \trim(\trim(\trim($oElement->getAttribute('style')), ';')) : '';
$oElement->setAttribute('style',
'color: '.$sLinkColor.\trim((empty($sStyles) ? '' : '; '.$sStyles)));
} }
if ($oElement->hasAttributes() && isset($oElement->attributes) && $oElement->attributes) if ($oElement->hasAttributes() && isset($oElement->attributes) && $oElement->attributes)
@ -686,7 +667,7 @@ abstract class HtmlUtils
// || \strpos($sAttrNameLower, ':') // || \strpos($sAttrNameLower, ':')
|| \in_array($sAttrNameLower, array( || \in_array($sAttrNameLower, array(
'id', 'class', 'contenteditable', 'designmode', 'formaction', 'manifest', 'action', 'id', 'class', 'contenteditable', 'designmode', 'formaction', 'manifest', 'action',
'data-bind', 'data-reactid', 'xmlns', 'srcset', 'data-x-skip-style', 'data-bind', 'data-reactid', 'xmlns', 'srcset',
'fscommand', 'seeksegmenttime' 'fscommand', 'seeksegmenttime'
))) )))
{ {
@ -739,6 +720,7 @@ abstract class HtmlUtils
$oElement->setAttribute('tabindex', '-1'); $oElement->setAttribute('tabindex', '-1');
} }
$skipStyle = false;
if ($bTryToDetectHiddenImages && 'img' === $sTagNameLower) if ($bTryToDetectHiddenImages && 'img' === $sTagNameLower)
{ {
$sAlt = $oElement->hasAttribute('alt') $sAlt = $oElement->hasAttribute('alt')
@ -759,13 +741,10 @@ abstract class HtmlUtils
// $sW = $oElement->hasAttribute('width') // $sW = $oElement->hasAttribute('width')
// ? \trim($oElement->getAttribute('width')) : ''; // ? \trim($oElement->getAttribute('width')) : '';
$sStyles = $oElement->hasAttribute('style')
? \preg_replace('/[\s]+/', '', \trim(\trim(\trim($oElement->getAttribute('style')), ';'))) : '';
$sSrc = \trim($oElement->getAttribute('src')); $sSrc = \trim($oElement->getAttribute('src'));
$bC = \in_array($sH, array('1', '0', '1px', '0px')) || $bC = \in_array($sH, array('1', '0', '1px', '0px')) ||
\preg_match('/(display:none|visibility:hidden|height:0|height:[01][a-z][a-z])/i', $sStyles); \preg_match('/display:\\s*none|visibility:\\s*hidden|height:\\s*0/i', $sStyles);
if (!$bC) if (!$bC)
{ {
@ -782,10 +761,9 @@ abstract class HtmlUtils
if ($bC) if ($bC)
{ {
$skipStyle = true;
$oElement->setAttribute('style', 'display:none'); $oElement->setAttribute('style', 'display:none');
$oElement->setAttribute('data-x-skip-style', 'true');
$oElement->setAttribute('data-x-hidden-src', $sSrc); $oElement->setAttribute('data-x-hidden-src', $sSrc);
$oElement->removeAttribute('src'); $oElement->removeAttribute('src');
} }
} }
@ -848,8 +826,6 @@ abstract class HtmlUtils
if (!empty($sBackground) || !empty($sBackgroundColor)) if (!empty($sBackground) || !empty($sBackgroundColor))
{ {
$aStyles = array(); $aStyles = array();
$sStyles = $oElement->hasAttribute('style')
? \trim(\trim(\trim($oElement->getAttribute('style')), ';')) : '';
if (!empty($sBackground)) if (!empty($sBackground))
{ {
@ -863,18 +839,16 @@ abstract class HtmlUtils
$oElement->removeAttribute('bgcolor'); $oElement->removeAttribute('bgcolor');
} }
$oElement->setAttribute('style', (empty($sStyles) ? '' : $sStyles.'; ').\implode('; ', $aStyles)); $sStyles .= '; ' . \implode('; ', $aStyles);
} }
if ($oElement->hasAttribute('style') && !$oElement->hasAttribute('data-x-skip-style')) if ($sStyles && !$skipStyle)
{ {
$oElement->setAttribute('style', $oElement->setAttribute('style',
static::ClearStyle($oElement->getAttribute('style'), $oElement, $bHasExternals, static::ClearStyle($sStyles, $oElement, $bHasExternals,
$aFoundCIDs, $aContentLocationUrls, $aFoundedContentLocationUrls, $bDoNotReplaceExternalUrl, $fAdditionalExternalFilter)); $aFoundCIDs, $aContentLocationUrls, $aFoundedContentLocationUrls, $bDoNotReplaceExternalUrl, $fAdditionalExternalFilter));
} }
$oElement->removeAttribute('data-x-skip-style');
if (\MailSo\Config::$HtmlStrictDebug && 0 < \count($aRemovedAttrs)) if (\MailSo\Config::$HtmlStrictDebug && 0 < \count($aRemovedAttrs))
{ {
unset($aRemovedAttrs['class'], $aRemovedAttrs['target'], $aRemovedAttrs['id'], $aRemovedAttrs['name'], unset($aRemovedAttrs['class'], $aRemovedAttrs['target'], $aRemovedAttrs['id'], $aRemovedAttrs['name'],