X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Ffeedparser.php;h=a5e406149d46062c620b60a6ce53738f0b0d13d8;hb=50052fb78a3a9d1bb3fa488e7fd7b23125c38124;hp=de6c565428a1a803ea316790da8279b742f389e6;hpb=4ad04ee227dd7d704f417aaf9d6762f5cfdf4c1f;p=tt-rss.git

diff --git a/classes/feedparser.php b/classes/feedparser.php
index de6c5654..a5e40614 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -15,7 +15,11 @@ class FeedParser {
 
 	function normalize_encoding($data) {
 		if (preg_match('/^(<\?xml[\t\n\r ].*?encoding[\t\n\r ]*=[\t\n\r ]*["\'])(.+?)(["\'].*?\?>)/s', $data, $matches) === 1) {
-			$data = mb_convert_encoding($data, 'UTF-8', $matches[2]);
+
+			$encoding = strtolower($matches[2]);
+
+			if (in_array($encoding, array_map('strtolower', mb_list_encodings())))
+				$data = mb_convert_encoding($data, 'UTF-8', $encoding);
 
 			$data = preg_replace('/^<\?xml[\t\n\r ].*?\?>/s', $matches[1] . "UTF-8" . $matches[3] , $data);
 		}
@@ -97,6 +101,7 @@ class FeedParser {
 		$xpath->registerNamespace('slash', 'http://purl.org/rss/1.0/modules/slash/');
 		$xpath->registerNamespace('dc', 'http://purl.org/dc/elements/1.1/');
 		$xpath->registerNamespace('content', 'http://purl.org/rss/1.0/modules/content/');
+		$xpath->registerNamespace('thread', 'http://purl.org/syndication/thread/1.0');
 
 		$this->xpath = $xpath;
 
@@ -114,6 +119,7 @@ class FeedParser {
 					$this->type = $this::FEED_RSS;
 					break;
 				case "feed":
+				case "atom:feed":
 					$this->type = $this::FEED_ATOM;
 					break;
 				default:
@@ -139,9 +145,14 @@ class FeedParser {
 
 				$link = $xpath->query("//atom:feed/atom:link[not(@rel)]")->item(0);
 
+				if (!$link)
+					$link = $xpath->query("//atom:feed/atom:link[@rel='alternate']")->item(0);
+
 				if (!$link)
 					$link = $xpath->query("//atom03:feed/atom03:link[not(@rel)]")->item(0);
 
+				if (!$link)
+					$link = $xpath->query("//atom03:feed/atom03:link[@rel='alternate']")->item(0);
 
 				if ($link && $link->hasAttributes()) {
 					$this->link = $link->getAttribute("href");
@@ -204,6 +215,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";
@@ -251,7 +266,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;
@@ -260,7 +275,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;
@@ -268,4 +283,4 @@ class FeedParser {
 
 		return $rv;
 	}
-} ?>
+}