Store size of enclosure to database

[tt-rss.git] / classes / feeditem / atom.php

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 9680748f91aa4f03a6e6659dc102c05236c1ec89..dfac7149f6cb4981cd6d768dd36e3600b80dd438 100644 (file)
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -1,5 +1,6 @@
 <?php
 class FeedItem_Atom extends FeedItem_Common {
+
        function get_id() {
                $id = $this->elem->getElementsByTagName("id")->item(0);
 
@@ -30,6 +31,7 @@ class FeedItem_Atom extends FeedItem_Common {
                }
        }
 
+
        function get_link() {
                $links = $this->elem->getElementsByTagName("link");
 
@@ -38,8 +40,13 @@ class FeedItem_Atom extends FeedItem_Common {
                                (!$link->hasAttribute("rel")
                                        || $link->getAttribute("rel") == "alternate"
                                        || $link->getAttribute("rel") == "standout")) {
+                               $base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)", $link);
+
+                               if ($base)
+                                       return rewrite_relative_url($base, trim($link->getAttribute("href")));
+                               else
+                                       return trim($link->getAttribute("href"));
 
-                               return $link->getAttribute("href");
                        }
                }
        }
@@ -48,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);
                }
        }
 
@@ -58,7 +65,13 @@ class FeedItem_Atom extends FeedItem_Common {
                if ($content) {
                        if ($content->hasAttribute('type')) {
                                if ($content->getAttribute('type') == 'xhtml') {
-                                       return $this->doc->saveXML($content->firstChild->nextSibling);
+                                       for ($i = 0; $i < $content->childNodes->length; $i++) {
+                                               $child = $content->childNodes->item($i);
+
+                                               if ($child->hasChildNodes()) {
+                                                       return $this->doc->saveXML($child);
+                                               }
+                                       }
                                }
                        }
 
@@ -72,7 +85,13 @@ class FeedItem_Atom extends FeedItem_Common {
                if ($content) {
                        if ($content->hasAttribute('type')) {
                                if ($content->getAttribute('type') == 'xhtml') {
-                                       return $this->doc->saveXML($content->firstChild->nextSibling);
+                                       for ($i = 0; $i < $content->childNodes->length; $i++) {
+                                               $child = $content->childNodes->item($i);
+
+                                               if ($child->hasChildNodes()) {
+                                                       return $this->doc->saveXML($child);
+                                               }
+                                       }
                                }
                        }
 
@@ -87,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;
@@ -126,6 +145,51 @@ class FeedItem_Atom extends FeedItem_Common {
                        $enc->type = $enclosure->getAttribute("type");
                        $enc->link = $enclosure->getAttribute("url");
                        $enc->length = $enclosure->getAttribute("length");
+                       $enc->height = $enclosure->getAttribute("height");
+                       $enc->width = $enclosure->getAttribute("width");
+
+                       $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+                       if ($desc) $enc->title = strip_tags($desc->nodeValue);
+
+                       array_push($encs, $enc);
+               }
+
+
+               $enclosures = $this->xpath->query("media:group", $this->elem);
+
+               foreach ($enclosures as $enclosure) {
+                       $enc = new FeedEnclosure();
+
+                       $content = $this->xpath->query("media:content", $enclosure)->item(0);
+
+                       if ($content) {
+                               $enc->type = $content->getAttribute("type");
+                               $enc->link = $content->getAttribute("url");
+                               $enc->length = $content->getAttribute("length");
+                               $enc->height = $content->getAttribute("height");
+                               $enc->width = $content->getAttribute("width");
+
+                               $desc = $this->xpath->query("media:description", $content)->item(0);
+                               if ($desc) {
+                                       $enc->title = strip_tags($desc->nodeValue);
+                               } else {
+                                       $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+                                       if ($desc) $enc->title = strip_tags($desc->nodeValue);
+                               }
+
+                               array_push($encs, $enc);
+                       }
+               }
+
+               $enclosures = $this->xpath->query("media:thumbnail", $this->elem);
+
+               foreach ($enclosures as $enclosure) {
+                       $enc = new FeedEnclosure();
+
+                       $enc->type = "image/generic";
+                       $enc->link = $enclosure->getAttribute("url");
+                       $enc->height = $enclosure->getAttribute("height");
+                       $enc->width = $enclosure->getAttribute("width");
 
                        array_push($encs, $enc);
                }