the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-02-25 07:16:21 +08:00
Code Issues Projects Releases Packages Wiki Activity

Attempt to <a> bugs in HTML emails #187

Browse source
This commit is contained in:
the-djmaze 2022-01-13 10:33:06 +01:00
parent ca14fd3423
commit 4fa37ce187
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,9 +45,29 @@ abstract class HtmlUtils
$bState = \libxml_use_internal_errors(true); $bState = \libxml_use_internal_errors(true);
} }
$sText = \str_replace('<o:p></o:p>', '', $sText);
$sText = \str_replace('<o:p>', '<span>', $sText);
$sText = \str_replace('</o:p>', '</span>', $sText);
// $sText = \preg_replace('#<!--.*?-->#s', '', $sText);
// https://github.com/the-djmaze/snappymail/issues/187
$sText = \preg_replace('#<a[^>]*>(((?!</a).)+<a\\s)#si', '$1', $sText);
if (\function_exists('tidy_repair_string')) {
# http://tidy.sourceforge.net/docs/quickref.html
$tidyConfig = array(
'bare' => 1,
'join-classes' => 1,
'newline' => 'LF',
'numeric-entities' => 1,
'quote-nbsp' => 0,
'word-2000' => 1
);
$sText = \tidy_repair_string($sText, $tidyConfig, 'utf8');
}
$sHtmlAttrs = $sBodyAttrs = ''; $sHtmlAttrs = $sBodyAttrs = '';
$sText = static::FixSchemas($sText);
$sText = static::ClearFastTags($sText); $sText = static::ClearFastTags($sText);
$sText = static::ClearBodyAndHtmlTag($sText, $sHtmlAttrs, $sBodyAttrs); $sText = static::ClearBodyAndHtmlTag($sText, $sHtmlAttrs, $sBodyAttrs);
@ -178,19 +198,6 @@ abstract class HtmlUtils
return $sHtml; return $sHtml;
} }
private static function FixSchemas(string $sHtml, bool $bClearEmpty = true) : string
{
if ($bClearEmpty)
{
$sHtml = \str_replace('<o:p></o:p>', '', $sHtml);
}
$sHtml = \str_replace('<o:p>', '<span>', $sHtml);
$sHtml = \str_replace('</o:p>', '</span>', $sHtml);
return $sHtml;
}
private static function ClearFastTags(string $sHtml) : string private static function ClearFastTags(string $sHtml) : string
{ {
return \preg_replace(array( return \preg_replace(array(