pngcrush.sh

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

diff --git a/classes/opml.php b/classes/opml.php
index b09653ca97268924e13ba2833e59c224617ec220..5b7690375ed762c4a52c6fa4880888e695f92f39 100644 (file)
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -75,7 +75,7 @@ class Opml extends Handler_Protected {
 
                $sth = $this->pdo->prepare("SELECT id,title
                        FROM ttrss_feed_categories WHERE
-                               (parent_cat = :cat OR (:cat = 0 AND parent_cat IS NULL)) AND 
+                               (parent_cat = :cat OR (:cat = 0 AND parent_cat IS NULL)) AND
                                owner_uid = :uid ORDER BY order_id, title");
 
                $sth->execute([':cat' => $cat_id, ':uid' => $owner_uid]);
@@ -85,7 +85,7 @@ class Opml extends Handler_Protected {
                }
 
                $fsth = $this->pdo->prepare("select title, feed_url, site_url
-                               FROM ttrss_feeds WHERE 
+                               FROM ttrss_feeds WHERE
                                        (cat_id = :cat OR (:cat = 0 AND cat_id IS NULL)) AND owner_uid = :uid AND $hide_qpart
                                ORDER BY order_id, title");
 
@@ -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 (?, ?, ?, ?, ?)");
@@ -419,9 +421,9 @@ class Opml extends Handler_Protected {
                             $inverse = bool_to_sql_bool($rule["inverse"]);
                             $match_on = json_encode($match_on);
 
-                            $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules 
+                            $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules
                                                                (feed_id,cat_id,match_on,filter_id,filter_type,reg_exp,cat_filter,inverse)
-                                VALUES 
+                                VALUES
                                 (NULL, NULL, ?, ?, ?, ?, false, ?)");
                             $usth->execute([$match_on, $filter_id, $filter_type, $reg_exp, $inverse]);
 
@@ -452,9 +454,9 @@ class Opml extends Handler_Protected {
                             $filter_type = (int)$rule["filter_type"];
                             $inverse = bool_to_sql_bool($rule["inverse"]);
 
-                            $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules 
+                            $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules
                                                                (feed_id,cat_id,filter_id,filter_type,reg_exp,cat_filter,inverse)
-                                VALUES 
+                                VALUES
                                 (?, ?, ?, ?, ?, ?, ?)");
                             $usth->execute([$feed_id, $cat_id, $filter_id, $filter_type, $reg_exp, $cat_filter, $inverse]);
                         }
@@ -465,9 +467,9 @@ class Opml extends Handler_Protected {
                                                $action_id = (int)$action["action_id"];
                                                $action_param = $action["action_param"];
 
-                                               $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_actions 
+                                               $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_actions
                                                        (filter_id,action_id,action_param)
-                                                       VALUES 
+                                                       VALUES
                                                        (?, ?, ?)");
                                                $usth->execute([$filter_id, $action_id, $action_param]);
                                        }
@@ -611,7 +613,7 @@ class Opml extends Handler_Protected {
                $parent_cat_id = (int) $parent_cat_id;
 
                $sth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
-                       WHERE title = :title 
+                       WHERE title = :title
                        AND (parent_cat = :parent OR (:parent = 0 AND parent_cat IS NULL))
                        AND owner_uid = :uid");