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

Fix html parsing (for PHP <5.3.6)

Browse source
This commit is contained in:
RainLoop Team 2016-06-09 00:41:05 +03:00
parent dee86572e4
commit fddc68b16d
2 changed files with 105 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -2,9 +2,9 @@
"name": "RainLoop",
"title": "RainLoop Webmail",
"version": "1.10.1",
"release": "123",
"release": "125",
"private": true,
"ownCloudPackageVersion": "4.17",
"ownCloudPackageVersion": "4.18",
"description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net",
"main": "gulpfile.js",

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

@ -26,51 +26,6 @@ class HtmlUtils
{
}
/**
* @param string $sText
*
* @return \DOMDocument|bool
*/
public static function GetDomFromText($sText)
{
$bState = true;
if (\MailSo\Base\Utils::FunctionExistsAndEnabled('libxml_use_internal_errors'))
{
$bState = \libxml_use_internal_errors(true);
}
$oDom = new \DOMDocument('1.0', 'utf-8');
$oDom->encoding = 'UTF-8';
$oDom->strictErrorChecking = false;
$oDom->formatOutput = false;
$oDom->preserveWhiteSpace = false;
$sHtmlAttrs = $sBodyAttrs = '';
$sText = \MailSo\Base\HtmlUtils::FixSchemas($sText);
$sText = \MailSo\Base\HtmlUtils::ClearFastTags($sText);
$sText = \MailSo\Base\HtmlUtils::ClearBodyAndHtmlTag($sText, $sHtmlAttrs, $sBodyAttrs);
@$oDom->loadHTML('<'.'?xml version="1.0" encoding="utf-8"?'.'>'.
'<html '.$sHtmlAttrs.'><head>'.
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head>'.
'<body '.$sBodyAttrs.'><div data-wrp="rainloop">'.$sText.'</div></body></html>');
@$oDom->normalizeDocument();
if (\MailSo\Base\Utils::FunctionExistsAndEnabled('libxml_clear_errors'))
{
@\libxml_clear_errors();
}
if (\MailSo\Base\Utils::FunctionExistsAndEnabled('libxml_use_internal_errors'))
{
\libxml_use_internal_errors($bState);
}
return $oDom;
}
/**
* @param \DOMElement $oElement
*
@ -97,6 +52,104 @@ class HtmlUtils
return $aResult;
}
/**
* @param string $sText
*
* @return \DOMDocument|bool
*/
public static function GetDomFromText($sText)
{
$bState = true;
if (\MailSo\Base\Utils::FunctionExistsAndEnabled('libxml_use_internal_errors'))
{
$bState = \libxml_use_internal_errors(true);
}
$sHtmlAttrs = $sBodyAttrs = '';
$sText = \MailSo\Base\HtmlUtils::FixSchemas($sText);
$sText = \MailSo\Base\HtmlUtils::ClearFastTags($sText);
$sText = \MailSo\Base\HtmlUtils::ClearBodyAndHtmlTag($sText, $sHtmlAttrs, $sBodyAttrs);
$oDom = self::createDOMDocument();
@$oDom->loadHTML('<'.'?xml version="1.0" encoding="utf-8"?'.'>'.
'<html '.$sHtmlAttrs.'><head>'.
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head>'.
'<body '.$sBodyAttrs.'><div data-wrp="rainloop">'.$sText.'</div></body></html>');
@$oDom->normalizeDocument();
if (\MailSo\Base\Utils::FunctionExistsAndEnabled('libxml_clear_errors'))
{
@\libxml_clear_errors();
}
if (\MailSo\Base\Utils::FunctionExistsAndEnabled('libxml_use_internal_errors'))
{
\libxml_use_internal_errors($bState);
}
return $oDom;
}
/**
* @return \DOMDocument
*/
private static function createDOMDocument()
{
$oDoc = new \DOMDocument('1.0', 'UTF-8');
$oDoc->encoding = 'UTF-8';
$oDoc->strictErrorChecking = false;
$oDoc->formatOutput = false;
$oDoc->preserveWhiteSpace = false;
return $oDoc;
}
/**
* @return boolean
*/
private static function comparedVersion()
{
return \version_compare(PHP_VERSION, '5.3.6') >= 0;
}
/**
* @param \DOMDocument|\DOMElement $oElem
*
* @return type
*/
private static function domToString($oElem, $oDom = null)
{
$sResult = '';
if ($oElem instanceof \DOMDocument)
{
if (isset($oElem->documentElement) && self::comparedVersion())
{
$sResult = $oElem->saveHTML($oElem->documentElement);
}
else
{
$sResult = $oElem->saveHTML();
}
}
else if ($oElem)
{
if ($oDom && self::comparedVersion())
{
$sResult = $oDom->saveHTML($oElem);
}
else
{
$oTempDoc = self::createDOMDocument();
$oTempDoc->appendChild($oTempDoc->importNode($oElem->cloneNode(true), true));
$sResult = $oTempDoc->saveHTML();
}
}
return \trim($sResult);
}
/**
* @param \DOMDocument $oDom
* @param bool $bWrapByFakeHtmlAndBodyDiv = true
@ -138,28 +191,22 @@ class HtmlUtils
}
$oWrap->appendChild($oDiv);
$sResult = \trim($oDom->saveHTML($oWrap));
$sResult = self::domToString($oWrap, $oDom);
}
else
{
$sResult = \trim($oDom->saveHTML($oDiv));
if (0 === strpos($sResult, '<div>'))
$sResult = self::domToString($oDiv, $oDom);
if (0 === strpos($sResult, '<div>') && '</div>' === substr($sResult, -6))
{
$sResult = substr($sResult, 5);
if ('</div>' === substr($sResult, -6))
{
$sResult = substr($sResult, 0, -6);
}
$sResult = substr($sResult, 0, -6);
$sResult = \trim($sResult);
}
}
}
else
{
$sResult = \trim($oDom->saveHTML());
$sResult = self::domToString($oDom);
}
$sResult = \str_replace(\MailSo\Base\HtmlUtils::$KOS, ':', $sResult);