Update of PicoFeed

miniflux/vendor/PicoFeed/Import.php

@@ -22,7 +22,7 @@ class Import
 
             $xml = new \SimpleXMLElement(trim($this->content));
 
-            if ($xml->getName() !== 'opml') {
+            if ($xml->getName() !== 'opml' || ! isset($xml->body)) {
 
                 return false;
             }
@@ -40,21 +40,24 @@ class Import
 
     public function parseEntries($tree)
     {
-        foreach ($tree->outline as $item) {
+        if (isset($tree->outline)) {
 
-            if (isset($item['type']) && strtolower($item['type']) === 'folder' && isset($item->outline)) {
+            foreach ($tree->outline as $item) {
 
-                $this->parseEntries($item);
+                if (isset($item->outline)) {
-            }
-            else if (isset($item['type']) && strtolower($item['type']) === 'rss') {
 
-                $entry = new \StdClass;
+                    $this->parseEntries($item);
-                $entry->title = (string) $item['text'];
+                }
-                $entry->site_url = (string) $item['htmlUrl'];
+                else if (isset($item['text']) && isset($item['xmlUrl']) && isset($item['htmlUrl'])) {
-                $entry->feed_url = (string) $item['xmlUrl'];
+
-                $entry->type = isset($item['version']) ? (string) $item['version'] : (string) $item['type'];
+                    $entry = new \StdClass;
-                $entry->description = (string) $item['description'];
+                    $entry->title = isset($item['title']) ? (string) $item['title'] : (string) $item['text'];
-                $this->items[] = $entry;
+                    $entry->site_url = (string) $item['htmlUrl'];
+                    $entry->feed_url = (string) $item['xmlUrl'];
+                    $entry->type = isset($item['version']) ? (string) $item['version'] : isset($item['type']) ? (string) $item['type'] : 'rss';
+                    $entry->description = isset($item['description']) ? (string) $item['description'] : $entry->title;
+                    $this->items[] = $entry;
+                }
             }
         }
     }

miniflux/vendor/PicoFeed/Parser.php

@@ -185,3 +185,79 @@ class Rss20 extends Parser
         return $this;
     }
 }
+
+
+class Rss10 extends Parser
+{
+    public function execute()
+    {
+        try {
+
+            \libxml_use_internal_errors(true);
+
+            $xml = new \SimpleXMLElement($this->content);
+            $ns = $xml->getNamespaces(true);
+
+            $this->title = (string) $xml->channel->title;
+            $this->url = (string) $xml->channel->link;
+            $this->id = $this->url;
+
+            if (isset($ns['dc'])) {
+
+                $ns_dc = $xml->channel->children($ns['dc']);
+                $this->updated = isset($ns_dc->date) ? strtotime($ns_dc->date) : time();
+            }
+            else {
+
+                $this->updated = time();
+            }
+
+            foreach ($xml->item as $entry) {
+
+                $author = '';
+                $content = '';
+                $pubdate = '';
+                $link = '';
+
+                if (isset($ns['feedburner'])) {
+
+                    $ns_fb = $entry->children($ns['feedburner']);
+                    $link = $ns_fb->origLink;
+                }
+
+                if (isset($ns['dc'])) {
+
+                    $ns_dc = $entry->children($ns['dc']);
+                    $author = (string) $ns_dc->creator;
+                    $pubdate = (string) $ns_dc->date;
+                }
+
+                if (isset($ns['content'])) {
+
+                    $ns_content = $entry->children($ns['content']);
+                    $content = (string) $ns_content->encoded;
+                }
+
+                if ($content === '' && isset($entry->description)) {
+
+                    $content = (string) $entry->description;
+                }
+
+                $item = new \StdClass;
+                $item->title = (string) $entry->title;
+                $item->url = $link ?: (string) $entry->link;
+                $item->id = $item->url;
+                $item->updated = $pubdate ? strtotime($pubdate) : time();
+                $item->content = $this->filterHtml($content, $item->url);
+                $item->author = $author ?: (string) $xml->channel->webMaster;
+
+                $this->items[] = $item;
+            }
+        }
+        catch (\Exception $e) {
+
+        }
+
+        return $this;
+    }
+}

miniflux/vendor/PicoFeed/Reader.php

@@ -70,6 +70,10 @@ class Reader
 
             return new Rss20($this->content);
         }
+        else if (strpos($first_tag, '<rdf:') !== false && strpos($first_tag, 'xmlns="http://purl.org/rss/1.0/"') !== false) {
+
+            return new Rss10($this->content);
+        }
         else if ($discover === true) {
 
             return false;