diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-18 10:14:46 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-18 10:14:46 +0200 |
| commit | 4fe70c8f1bd032183990de37d19cdd9faafba0da (patch) | |
| tree | 889e373be4e320281da8c05776908e1f5df434c7 /articleenhancer | |
| parent | 66abbda5576ed5f675c645584969fc3e09152164 (diff) | |
correctly destroy element when route is being changed
Diffstat (limited to 'articleenhancer')
| -rw-r--r-- | articleenhancer/xpatharticleenhancer.php | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/articleenhancer/xpatharticleenhancer.php b/articleenhancer/xpatharticleenhancer.php index 4037d88ac..ad2e65f0b 100644 --- a/articleenhancer/xpatharticleenhancer.php +++ b/articleenhancer/xpatharticleenhancer.php @@ -36,7 +36,7 @@ class XPathArticleEnhancer implements ArticleEnhancer { * @internal param \OCA\News\ArticleEnhancer\a $SimplePieFileFactory factory for getting a simple pie file instance * @internal param int $maximumTimeout maximum timeout in seconds, defaults to 10 sec */ - public function __construct(SimplePieAPIFactory $fileFactory, + public function __construct(SimplePieAPIFactory $fileFactory, array $regexXPathPair, Config $config){ $this->regexXPathPair = $regexXPathPair; $this->fileFactory = $fileFactory; @@ -54,7 +54,7 @@ class XPathArticleEnhancer implements ArticleEnhancer { if(preg_match($regex, $item->getUrl())) { $file = $this->getFile($item->getUrl()); - + // convert encoding by detecting charset from header /** @noinspection PhpUndefinedFieldInspection */ $contentType = $file->headers['content-type']; @@ -72,11 +72,11 @@ class XPathArticleEnhancer implements ArticleEnhancer { $xpath = new \DOMXpath($dom); $xpathResult = $xpath->evaluate($search); - // in case it wasnt a text query assume its a single + // in case it wasnt a text query assume its a single if(!is_string($xpathResult)) { $xpathResult = $this->domToString($xpathResult); } - + // convert all relative to absolute URLs $xpathResult = $this->substituteRelativeLinks($xpathResult, $item->getUrl()); @@ -93,8 +93,8 @@ class XPathArticleEnhancer implements ArticleEnhancer { private function getFile($url) { if(trim($this->config->getProxyHost()) === '') { return $this->fileFactory->getFile( - $url, - $this->maximumTimeout, + $url, + $this->maximumTimeout, 5, null, "Mozilla/5.0 AppleWebKit", @@ -105,8 +105,8 @@ class XPathArticleEnhancer implements ArticleEnhancer { ); } else { return $this->fileFactory->getFile( - $url, - $this->maximumTimeout, + $url, + $this->maximumTimeout, 5, null, "Mozilla/5.0 AppleWebKit", @@ -135,19 +135,20 @@ class XPathArticleEnhancer implements ArticleEnhancer { return $xmlString; } - // remove <!DOCTYPE - $dom->removeChild($dom->firstChild); - // remove <html></html> + // remove <!DOCTYPE + $dom->removeChild($dom->firstChild); + // remove <html></html> $dom->replaceChild($dom->firstChild->firstChild, $dom->firstChild); - + $substitution = ["href", "src"]; foreach ($substitution as $attribute) { $xpath = new \DOMXpath($dom); $xpathResult = $xpath->query( "//*[@" . $attribute . " " . - "and not(contains(@" . $attribute . ", '://')) " . - "and not(starts-with(@" . $attribute . ", 'mailto:'))]"); + "and not(contains(@" . $attribute . ", '://')) " . + "and not(starts-with(@" . $attribute . ", 'mailto:')) " . + "and not(starts-with(@" . $attribute . ", '//'))]"); foreach ($xpathResult as $linkNode) { $urlElement = $linkNode->attributes->getNamedItem($attribute); $abs = $this->relativeToAbsoluteUrl( $urlElement->nodeValue, $absoluteUrl ); |