Fixed time stamping of new unmarked/unpublished articles

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

diff --git a/classes/opml.php b/classes/opml.php
index b09653ca97268924e13ba2833e59c224617ec220..ae995860f9e4d73c0b344ef14f7e158d0847595d 100644 (file)
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -289,14 +289,16 @@ class Opml extends Handler_Protected {
 
                $site_url = mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250);
 
-               if ($feed_url && $feed_title) {
+               if ($feed_url) {
                        $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
                                feed_url = ? AND owner_uid = ?");
                        $sth->execute([$feed_url, $owner_uid]);
 
+                       if (!$feed_title) $feed_title = '[Unknown]';
+
                        if (!$sth->fetch()) {
                                #$this->opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
-                               $this->opml_notice(T_sprintf("Adding feed: %s", $feed_title));
+                               $this->opml_notice(T_sprintf("Adding feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
 
                                if (!$cat_id) $cat_id = null;
 
@@ -307,7 +309,7 @@ class Opml extends Handler_Protected {
                                $sth->execute([$feed_title, $feed_url, $owner_uid, $cat_id, $site_url]);
 
                        } else {
-                               $this->opml_notice(T_sprintf("Duplicate feed: %s", $feed_title));
+                               $this->opml_notice(T_sprintf("Duplicate feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
                        }
                }
        }
@@ -357,7 +359,7 @@ class Opml extends Handler_Protected {
                                $inverse = bool_to_sql_bool($filter["inverse"]);
                                $title = $filter["title"];
 
-                               print "F: $title, $inverse, $enabled, $match_any_rule";
+                               //print "F: $title, $inverse, $enabled, $match_any_rule";
 
                                $sth = $this->pdo->prepare("INSERT INTO ttrss_filters2 (match_any_rule,enabled,inverse,title,owner_uid)
                                        VALUES (?, ?, ?, ?, ?)");