minor css fixes (mostly for zoom mode)

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

diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
old mode 100644 (file)
new mode 100755 (executable)
index 7d445a6..6bb2721
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -33,28 +33,36 @@ 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);
                }
        }
 
        function get_title() {
+               $title = $this->xpath->query("title", $this->elem)->item(0);
+
+               if ($title) {
+                       return trim($title->nodeValue);
+               }
+
+               // if the document has a default namespace then querying for
+               // title would fail because of reasons so let's try the old way
                $title = $this->elem->getElementsByTagName("title")->item(0);
 
                if ($title) {
-                       return $title->nodeValue;
+                       return trim($title->nodeValue);
                }
        }
 
@@ -63,17 +71,19 @@ class FeedItem_RSS extends FeedItem_Common {
                $contentB = $this->elem->getElementsByTagName("description")->item(0);
 
                if ($contentA && !$contentB) {
-                       return $contentA->nodeValue;
+                       return $this->subtree_or_text($contentA);
                }
 
 
                if ($contentB && !$contentA) {
-                       return $contentB->nodeValue;
+                       return $this->subtree_or_text($contentB);
                }
 
                if ($contentA && $contentB) {
-                       return mb_strlen($contentA->nodeValue) > mb_strlen($contentB->nodeValue) ?
-                               $contentA->nodeValue : $contentB->nodeValue;
+                       $resultA = $this->subtree_or_text($contentA);
+                       $resultB = $this->subtree_or_text($contentB);
+
+                       return mb_strlen($resultA) > mb_strlen($resultB) ? $resultA : $resultB;
                }
        }
 
@@ -90,13 +100,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;
@@ -113,61 +123,25 @@ class FeedItem_RSS 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");
 
                        array_push($encs, $enc);
                }
 
-               $enclosures = $this->xpath->query("media:content", $this->elem);
-
-               foreach ($enclosures as $enclosure) {
-                       $enc = new FeedEnclosure();
-
-                       $enc->type = $enclosure->getAttribute("type");
-                       $enc->link = $enclosure->getAttribute("url");
-                       $enc->length = $enclosure->getAttribute("length");
-
-                       $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);
-
-                       $enc->type = $content->getAttribute("type");
-                       $enc->link = $content->getAttribute("url");
-                       $enc->length = $content->getAttribute("length");
-
-                       $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);
+               $encs = array_merge($encs, parent::get_enclosures());
 
-               foreach ($enclosures as $enclosure) {
-                       $enc = new FeedEnclosure();
+               return $encs;
+       }
 
-                       $enc->type = "image/generic";
-                       $enc->link = $enclosure->getAttribute("url");
+       function get_language() {
+               $languages = $this->doc->getElementsByTagName('language');
 
-                       array_push($encs, $enc);
+               if (count($languages) == 0) {
+                       return "";
                }
 
-               return $encs;
+               return $languages[0]->textContent;
        }
 
 }
-?>