the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-09-04 12:14:11 +08:00
Code Issues Projects Releases Packages Wiki Activity

Improve body attributes parser.

Browse source
This commit is contained in:
RainLoop Team 2013-11-21 16:28:41 +04:00
parent 726fa6982b
commit 16b375691b
1 changed files with 42 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
View file

@ -298,53 +298,62 @@ class HtmlUtils
// convert body attributes to styles
if ('body' === $sTagNameLower)
{
$aMargins = array(
$oElement->hasAttribute('topmargin')
? \trim($oElement->getAttribute('topmargin')) : '',
$oElement->hasAttribute('leftmargin')
? \trim($oElement->getAttribute('leftmargin')) : '',
$oElement->hasAttribute('bottommargin')
? \trim($oElement->getAttribute('bottommargin')) : '',
$oElement->hasAttribute('rightmargin')
? \trim($oElement->getAttribute('rightmargin')) : '',
$aAttrs = array(
'text' => '',
'topmargin' => '',
'leftmargin' => '',
'bottommargin' => '',
'rightmargin' => ''
);
$sText = $oElement->hasAttribute('text') ? \trim($oElement->getAttribute('text')) : '';
$aStyles = array();
if (!empty($sText))
if (isset($oElement->attributes))
{
$aStyles[] = 'color: '.$sText;
$oElement->removeAttribute('text');
foreach ($oElement->attributes as $sAttributeName => /* @var $oAttributeNode \DOMNode */ $oAttributeNode)
{
if ($oAttributeNode && isset($oAttributeNode->nodeValue))
{
$sAttributeNameLower = \strtolower($sAttributeName);
if (isset($aAttrs[$sAttributeNameLower]) && '' === $aAttrs[$sAttributeNameLower])
{
$aAttrs[$sAttributeNameLower] = array($sAttributeName, \trim($oAttributeNode->nodeValue));
}
}
}
}
foreach ($aMargins as $iIndex => $sItem)
$aStyles = array();
foreach ($aAttrs as $sIndex => $aItem)
{
if ('' !== $sItem)
if (\is_array($aItem))
{
switch ($iIndex) {
case 0:
$aStyles[] = 'margin-top: '.((int) $sItem).'px';
$oElement->removeAttribute('topmargin');
$oElement->removeAttribute($aItem[0]);
switch ($sIndex)
{
case 'text':
$aStyles[] = 'color: '.$aItem[1];
break;
case 1:
$aStyles[] = 'margin-left: '.((int) $sItem).'px';
$oElement->removeAttribute('leftmargin');
case 'topmargin':
$aStyles[] = 'margin-top: '.((int) $aItem[1]).'px';
break;
case 2:
$aStyles[] = 'margin-bottom: '.((int) $sItem).'px';
$oElement->removeAttribute('bottommargin');
case 'leftmargin':
$aStyles[] = 'margin-left: '.((int) $aItem[1]).'px';
break;
case 3:
$aStyles[] = 'margin-right: '.((int) $sItem).'px';
$oElement->removeAttribute('rightmargin');
case 'bottommargin':
$aStyles[] = 'margin-bottom: '.((int) $aItem[1]).'px';
break;
case 'rightmargin':
$aStyles[] = 'margin-right: '.((int) $aItem[1]).'px';
break;
}
}
}
$sStyles = $oElement->hasAttribute('style') ? $oElement->getAttribute('style') : '';
$oElement->setAttribute('style', (empty($sStyles) ? '' : $sStyles.'; ').\implode('; ', $aStyles));
if (0 < \count($aStyles))
{
$sStyles = $oElement->hasAttribute('style') ? $oElement->getAttribute('style') : '';
$oElement->setAttribute('style', (empty($sStyles) ? '' : $sStyles.'; ').\implode('; ', $aStyles));
}
}
if ('iframe' === $sTagNameLower || 'frame' === $sTagNameLower)