fix support of Atom 0.3

[tt-rss.git] / classes / feedparser.php

diff --git a/classes/feedparser.php b/classes/feedparser.php
index d60db8a28b33a4788cf140f2a5aee904c4573e50..bd67ca39d9e7730e3390185e08ee19dffe490bc4 100644 (file)
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -27,6 +27,7 @@ class FeedParser {
                $root = $this->doc->firstChild;
                $xpath = new DOMXPath($this->doc);
                $xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+               $xpath->registerNamespace('atom03', 'http://purl.org/atom/ns#');
                $xpath->registerNamespace('media', 'http://search.yahoo.com/mrss/');
                $xpath->registerNamespace('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
                $xpath->registerNamespace('slash', 'http://purl.org/rss/1.0/modules/slash/');
@@ -35,7 +36,7 @@ class FeedParser {
 
                $this->xpath = $xpath;
 
-               $root = $xpath->query("(//atom:feed|//channel|//rdf:rdf|//rdf:RDF)")->item(0);
+               $root = $xpath->query("(//atom03:feed|//atom:feed|//channel|//rdf:rdf|//rdf:RDF)")->item(0);
 
                if ($root) {
                        switch (mb_strtolower($root->tagName)) {
@@ -49,7 +50,9 @@ class FeedParser {
                                $this->type = $this::FEED_ATOM;
                                break;
                        default:
-                               $this->error = "Unknown/unsupported feed type";
+                               if( !isset($this->error) ){
+                                       $this->error = "Unknown/unsupported feed type";
+                               }
                                return;
                        }
 
@@ -58,18 +61,29 @@ class FeedParser {
 
                                $title = $xpath->query("//atom:feed/atom:title")->item(0);
 
+                               if (!$title)
+                                       $title = $xpath->query("//atom03:feed/atom03:title")->item(0);
+
+
                                if ($title) {
                                        $this->title = $title->nodeValue;
                                }
 
                                $link = $xpath->query("//atom:feed/atom:link[not(@rel)]")->item(0);
 
+                               if (!$link)
+                                       $link = $xpath->query("//atom03:feed/atom03:link[not(@rel)]")->item(0);
+
+
                                if ($link && $link->hasAttributes()) {
                                        $this->link = $link->getAttribute("href");
                                }
 
                                $articles = $xpath->query("//atom:entry");
 
+                               if (!$articles || $articles->length == 0)
+                                       $articles = $xpath->query("//atom03:entry");
+
                                foreach ($articles as $article) {
                                        array_push($this->items, new FeedItem_Atom($article, $this->doc, $this->xpath));
                                }
@@ -121,7 +135,9 @@ class FeedParser {
 
                        }
                } else {
-                       $this->error = "Unknown/unsupported feed type";
+                       if( !isset($this->error) ){
+                               $this->error = "Unknown/unsupported feed type";
+                       }
                        return;
                }
        }