From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 4 Mar 2014 12:38:04 +0000 (+0400)
Subject: parser: trim some some feed-extracted data link titles and links
X-Git-Tag: 1.12~36
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=31bd6f7643bf139802a224f4584caca3cbbcc9b8;p=tt-rss.git

parser: trim some some feed-extracted data link titles and links
---

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 74be03d8..48e3aa56 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -43,9 +43,9 @@ class FeedItem_Atom extends FeedItem_Common {
 				$base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)", $link);
 
 				if ($base)
-					return rewrite_relative_url($base, $link->getAttribute("href"));
+					return rewrite_relative_url($base, trim($link->getAttribute("href")));
 				else
-					return $link->getAttribute("href");
+					return trim($link->getAttribute("href"));
 
 			}
 		}
@@ -55,7 +55,7 @@ class FeedItem_Atom extends FeedItem_Common {
 		$title = $this->elem->getElementsByTagName("title")->item(0);
 
 		if ($title) {
-			return $title->nodeValue;
+			return trim($title->nodeValue);
 		}
 	}
 
@@ -106,13 +106,13 @@ class FeedItem_Atom extends FeedItem_Common {
 
 		foreach ($categories as $cat) {
 			if ($cat->hasAttribute("term"))
-				array_push($cats, $cat->getAttribute("term"));
+				array_push($cats, trim($cat->getAttribute("term")));
 		}
 
 		$categories = $this->xpath->query("dc:subject", $this->elem);
 
 		foreach ($categories as $cat) {
-			array_push($cats, $cat->nodeValue);
+			array_push($cats, trim($cat->nodeValue));
 		}
 
 		return $cats;
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index 28f4a388..bf08a1df 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -33,20 +33,20 @@ class FeedItem_RSS extends FeedItem_Common {
 					|| $link->getAttribute("rel") == "alternate"
 					|| $link->getAttribute("rel") == "standout")) {
 
-				return $link->getAttribute("href");
+				return trim($link->getAttribute("href"));
 			}
 		}
 
 		$link = $this->elem->getElementsByTagName("guid")->item(0);
 
 		if ($link && $link->hasAttributes() && $link->getAttribute("isPermaLink") == "true") {
-			return $link->nodeValue;
+			return trim($link->nodeValue);
 		}
 
 		$link = $this->elem->getElementsByTagName("link")->item(0);
 
 		if ($link) {
-			return $link->nodeValue;
+			return trim($link->nodeValue);
 		}
 	}
 
@@ -54,7 +54,7 @@ class FeedItem_RSS extends FeedItem_Common {
 		$title = $this->elem->getElementsByTagName("title")->item(0);
 
 		if ($title) {
-			return $title->nodeValue;
+			return trim($title->nodeValue);
 		}
 	}
 
@@ -90,13 +90,13 @@ class FeedItem_RSS extends FeedItem_Common {
 		$cats = array();
 
 		foreach ($categories as $cat) {
-			array_push($cats, $cat->nodeValue);
+			array_push($cats, trim($cat->nodeValue));
 		}
 
 		$categories = $this->xpath->query("dc:subject", $this->elem);
 
 		foreach ($categories as $cat) {
-			array_push($cats, $cat->nodeValue);
+			array_push($cats, trim($cat->nodeValue));
 		}
 
 		return $cats;
diff --git a/classes/feedparser.php b/classes/feedparser.php
index 187875b5..239fdb7a 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -205,6 +205,10 @@ class FeedParser {
 				break;
 
 			}
+
+			if ($this->title) $this->title = trim($this->title);
+			if ($this->link) $this->link = trim($this->link);
+
 		} else {
 			if( !isset($this->error) ){
 				$this->error = "Unknown/unsupported feed type";
@@ -252,7 +256,7 @@ class FeedParser {
 
 			foreach ($links as $link) {
 				if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
-					array_push($rv, $link->getAttribute('href'));
+					array_push($rv, trim($link->getAttribute('href')));
 				}
 			}
 			break;
@@ -261,7 +265,7 @@ class FeedParser {
 
 			foreach ($links as $link) {
 				if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
-					array_push($rv, $link->getAttribute('href'));
+					array_push($rv, trim($link->getAttribute('href')));
 				}
 			}
 			break;