FIX: #416

tontof · Nov 25, 2019 · 321db1b · 321db1b
1 parent af18265
commit 321db1b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/index.php b/index.php
@@ -2,7 +2,7 @@
 // KrISS feed: a simple and smart (or stupid) feed reader
 // Copyleft (ɔ) - Tontof - http://tontof.net
 // use KrISS feed at your own risk
-define('FEED_VERSION', 8.8);
+define('FEED_VERSION', 8.9);
 
 define('DATA_DIR', 'data');
 define('INC_DIR', 'inc');
@@ -796,9 +796,12 @@ public function updateItemsFromDom($dom) {
                 );
                 if(!empty($item['enclosure'])) {
                     foreach($item['enclosure'] as $enclosure) {
-                        $item['content'] .= '<br>'.$this->showEnclosure($enclosure);
+                        $item['content'] .= '<br><br>'.$this->showEnclosure($enclosure);
                     }
                 }
+                if(!empty($item['thumbnail'])) {
+                        $item['content'] .= '<br>'.$this->showEnclosure($item['thumbnail']);
+                }
                 $newItems[$hashUrl]['content'] = $item['content'];
             }
         }
@@ -4695,7 +4698,8 @@ class Rss
         'link' => array('>feedburner:origLink', '>link[rel=alternate][href]', '>link[href]', '>link', '>guid', '>id'),
         'time' => array('>pubDate', '>updated', '>lastBuildDate', '>published', '>dc:date', '>date', '>created', '>modified'),
         'title' => array('>title'),
-        'enclosure' => array('>enclosure*[url]', '>media:group>media:content*[url]')
+        'enclosure' => array('>enclosure*[url]', '>media:group>media:content*[url]'),
+        'thumbnail' => array('>media:thumbnail[url]'),
     );
 
     public static function isValidNodeAttrs($node, $attrs)
@@ -4778,6 +4782,10 @@ public static function getElement($node, $selectors)
             }
         }
 
+        if ($name == "media:description") {
+            $res = nl2br($res);
+        }
+
         return $res;
     }
 

diff --git a/src/class/Feed.php b/src/class/Feed.php
@@ -955,9 +955,12 @@ public function updateItemsFromDom($dom) {
                 );
                 if(!empty($item['enclosure'])) {
                     foreach($item['enclosure'] as $enclosure) {
-                        $item['content'] .= '<br>'.$this->showEnclosure($enclosure);
+                        $item['content'] .= '<br><br>'.$this->showEnclosure($enclosure);
                     }
                 }
+                if(!empty($item['thumbnail'])) {
+                        $item['content'] .= '<br>'.$this->showEnclosure($item['thumbnail']);
+                }
                 $newItems[$hashUrl]['content'] = $item['content'];
             }
         }

diff --git a/src/class/Rss.php b/src/class/Rss.php
@@ -32,7 +32,8 @@ class Rss
         'link' => array('>feedburner:origLink', '>link[rel=alternate][href]', '>link[href]', '>link', '>guid', '>id'),
         'time' => array('>pubDate', '>updated', '>lastBuildDate', '>published', '>dc:date', '>date', '>created', '>modified'),
         'title' => array('>title'),
-        'enclosure' => array('>enclosure*[url]', '>media:group>media:content*[url]')
+        'enclosure' => array('>enclosure*[url]', '>media:group>media:content*[url]'),
+        'thumbnail' => array('>media:thumbnail[url]'),
     );
 
     /**
@@ -147,6 +148,10 @@ public static function getElement($node, $selectors)
             }
         }
 
+        if ($name == "media:description") {
+            $res = nl2br($res);
+        }
+
         return $res;
     }
 

diff --git a/src/kriss_feed.php b/src/kriss_feed.php
@@ -2,7 +2,7 @@
 // KrISS feed: a simple and smart (or stupid) feed reader
 // Copyleft (ɔ) - Tontof - http://tontof.net
 // use KrISS feed at your own risk
-define('FEED_VERSION', 8.8);
+define('FEED_VERSION', 8.9);
 
 define('DATA_DIR', 'data');
 define('INC_DIR', 'inc');