danolo
/
rss-bridge
mirror of https://github.com/danoloan10/rss-bridge
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[XPathAbstract] Save HTML for entry content (#3366)

This commit is contained in:
mrnoname1000 2023-05-10 18:31:34 -05:00 committed by GitHub
parent 723768c828
commit 63dc500ae0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/XPathAbstract.php
View File

@ -414,7 +414,8 @@ abstract class XPathAbstract extends BridgeAbstract
continue; continue;
} }
$item->__set($param, $this->formatParamValue($param, $this->getItemValueOrNodeValue($typedResult))); $value = $this->getItemValueOrNodeValue($typedResult, $param === 'content');
$item->__set($param, $this->formatParamValue($param, $value));
} }
$itemId = $this->generateItemId($item); $itemId = $this->generateItemId($item);
@ -569,21 +570,33 @@ abstract class XPathAbstract extends BridgeAbstract
* @param $typedResult * @param $typedResult
* @return string * @return string
*/ */
protected function getItemValueOrNodeValue($typedResult) protected function getItemValueOrNodeValue($typedResult, $returnXML = false)
{ {
if ($typedResult instanceof \DOMNodeList) { if ($typedResult instanceof \DOMNodeList) {
$item = $typedResult->item(0); $item = $typedResult->item(0);
if ($item instanceof \DOMElement) { if ($item instanceof \DOMElement) {
return trim($item->nodeValue); // Don't escape XML
if ($returnXML) {
return ($item->ownerDocument ?? $item)->saveXML($item);
}
$text = $item->nodeValue;
} elseif ($item instanceof \DOMAttr) { } elseif ($item instanceof \DOMAttr) {
return trim($item->value); $text = $item->value;
} elseif ($item instanceof \DOMText) { } elseif ($item instanceof \DOMText) {
return trim($item->wholeText); $text = $item->wholeText;
} }
} elseif (is_string($typedResult) && strlen($typedResult) > 0) { } elseif (is_string($typedResult) && strlen($typedResult) > 0) {
return trim($typedResult); $text = $typedResult;
} else {
throw new \Exception('Unknown type of XPath expression result.');
} }
throw new \Exception('Unknown type of XPath expression result.');
$text = trim($text);
if ($returnXML) {
return htmlspecialchars($text);
}
return $text;
} }
/** /**