the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-11-10 17:13:38 +08:00
Code Issues Projects Releases Packages Wiki Activity

small cleanup

Browse source
This commit is contained in:
the-djmaze 2023-02-08 12:12:02 +01:00
parent f35ea9a815
commit 8b8b0fc7e4
2 changed files with 12 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dev/Styles/User/Layout.less
View file

@ -71,25 +71,11 @@ html:not(.rl-left-panel-disabled) #rl-left {
min-width: 320px; min-width: 320px;
max-width: 60%; max-width: 60%;
} }
/*
.rl-side-preview-pane #V-MailMessageList .messageList {
resize: horizontal; overflow: auto;
min-width: 320px;
max-width: 60%;
}
*/
.rl-bottom-preview-pane #V-MailMessageList { .rl-bottom-preview-pane #V-MailMessageList {
resize: vertical; /*overflow: auto;*/ resize: vertical; /*overflow: auto;*/
min-height: 200px; min-height: 200px;
max-height: 60%; max-height: 60%;
} }
/*
.rl-side-preview-pane #V-MailMessageList .messageList {
resize: vertical; overflow: auto;
min-height: 200px;
max-height: 60%;
}
*/
.rl-bottom-preview-pane #V-MailMessageList > .resizer { .rl-bottom-preview-pane #V-MailMessageList > .resizer {
cursor: ns-resize; cursor: ns-resize;
height: 5px; height: 5px;

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

@ -23,8 +23,7 @@ abstract class HtmlUtils
public static function BuildHtml(string $sHtml, array &$aFoundCids, array &$aFoundDataURL, array &$aFoundContentLocationUrls) : string public static function BuildHtml(string $sHtml, array &$aFoundCids, array &$aFoundDataURL, array &$aFoundContentLocationUrls) : string
{ {
$bState = true; $bState = true;
if (\MailSo\Base\Utils::FunctionCallable('libxml_use_internal_errors')) if (\MailSo\Base\Utils::FunctionCallable('libxml_use_internal_errors')) {
{
$bState = \libxml_use_internal_errors(true); $bState = \libxml_use_internal_errors(true);
} }
@ -86,13 +85,11 @@ abstract class HtmlUtils
$oDoc->normalizeDocument(); $oDoc->normalizeDocument();
if (\MailSo\Base\Utils::FunctionCallable('libxml_clear_errors')) if (\MailSo\Base\Utils::FunctionCallable('libxml_clear_errors')) {
{
\libxml_clear_errors(); \libxml_clear_errors();
} }
if (\MailSo\Base\Utils::FunctionCallable('libxml_use_internal_errors')) if (\MailSo\Base\Utils::FunctionCallable('libxml_use_internal_errors')) {
{
\libxml_use_internal_errors($bState); \libxml_use_internal_errors($bState);
} }
@ -110,12 +107,10 @@ abstract class HtmlUtils
$sIdRight = \md5(\microtime()); $sIdRight = \md5(\microtime());
$aNodes = $oBody->getElementsByTagName('*'); $aNodes = $oBody->getElementsByTagName('*');
foreach ($aNodes as /* @var $oElement \DOMElement */ $oElement) foreach ($aNodes as /* @var $oElement \DOMElement */ $oElement) {
{
$sTagNameLower = \strtolower($oElement->nodeName); $sTagNameLower = \strtolower($oElement->nodeName);
if (\in_array($sTagNameLower, $aRemoveTags)) if (\in_array($sTagNameLower, $aRemoveTags)) {
{
$aRemove[] = $oElement; $aRemove[] = $oElement;
continue; continue;
} }
@ -147,16 +142,14 @@ abstract class HtmlUtils
if ($aCid) { if ($aCid) {
foreach ($aCid as $sCidName => $sCid) { foreach ($aCid as $sCidName => $sCid) {
$sCidName = \strtolower(\preg_replace('/([A-Z])/', '-\1', $sCidName)); $sCidName = \strtolower(\preg_replace('/([A-Z])/', '-\1', $sCidName));
if (\in_array($sCidName, array('background-image', 'list-style-image', 'content'))) if (\in_array($sCidName, array('background-image', 'list-style-image', 'content'))) {
{
$sStyles = $oElement->hasAttribute('style') $sStyles = $oElement->hasAttribute('style')
? \trim(\trim($oElement->getAttribute('style')), ';') ? \trim(\trim($oElement->getAttribute('style')), ';')
: ''; : '';
$sBack = $sCidName.':url(cid:'.$sCid.')'; $sBack = $sCidName.':url(cid:'.$sCid.')';
$sStyles = \preg_replace('/'.\preg_quote($sCidName).'\\s*:\\s*[^;]+/i', $sBack, $sStyles); $sStyles = \preg_replace('/'.\preg_quote($sCidName).'\\s*:\\s*[^;]+/i', $sBack, $sStyles);
if (false === \strpos($sStyles, $sBack)) if (false === \strpos($sStyles, $sBack)) {
{
$sStyles .= ";{$sBack}"; $sStyles .= ";{$sBack}";
} }
@ -169,30 +162,24 @@ abstract class HtmlUtils
// Remove all remaining data-* attributes // Remove all remaining data-* attributes
if ($oElement->hasAttributes()) { if ($oElement->hasAttributes()) {
foreach ($oElement->attributes as $oAttr) { foreach ($oElement->attributes as $oAttr) {
if ('data-' === \substr(\strtolower($oAttr->nodeName), 0, 5)) if ('data-' === \substr(\strtolower($oAttr->nodeName), 0, 5)) {
{
$oElement->removeAttribute($oAttr->nodeName); $oElement->removeAttribute($oAttr->nodeName);
} }
} }
} }
if ('img' === $sTagNameLower) if ('img' === $sTagNameLower) {
{
$sSrc = $oElement->getAttribute('src'); $sSrc = $oElement->getAttribute('src');
if ('data:image/' === \strtolower(\substr($sSrc, 0, 11))) if ('data:image/' === \strtolower(\substr($sSrc, 0, 11))) {
{
$sHash = \md5($sSrc) . '@' . $sIdRight; $sHash = \md5($sSrc) . '@' . $sIdRight;
$aFoundDataURL[$sHash] = $sSrc; $aFoundDataURL[$sHash] = $sSrc;
$oElement->setAttribute('src', 'cid:'.$sHash); $oElement->setAttribute('src', 'cid:'.$sHash);
} }
} }
} }
foreach ($aRemove as /* @var $oElement \DOMElement */ $oElement) foreach ($aRemove as /* @var $oElement \DOMElement */ $oElement) {
{ if (isset($oElement->parentNode)) {
if (isset($oElement->parentNode))
{
@$oElement->parentNode->removeChild($oElement); @$oElement->parentNode->removeChild($oElement);
} }
} }