valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OPML: 

1. remove unnecessary data from exported filters
2. fix import of filter rules matching on categories
This commit is contained in:
Andrew Dolgov 2019-03-05 07:31:05 +03:00
parent fb62f2b970
commit 6e920903b9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
classes/opml.php
View File

@ -195,7 +195,7 @@ class Opml extends Handler_Protected {
WHERE filter_id = ?"); WHERE filter_id = ?");
$tmph->execute([$line['id']]); $tmph->execute([$line['id']]);
while ($tmp_line = $tmph->fetch()) { while ($tmp_line = $tmph->fetch(PDO::FETCH_ASSOC)) {
unset($tmp_line["id"]); unset($tmp_line["id"]);
unset($tmp_line["filter_id"]); unset($tmp_line["filter_id"]);
@ -243,7 +243,7 @@ class Opml extends Handler_Protected {
WHERE filter_id = ?"); WHERE filter_id = ?");
$tmph->execute([$line['id']]); $tmph->execute([$line['id']]);
while ($tmp_line = $tmph->fetch()) { while ($tmp_line = $tmph->fetch(PDO::FETCH_ASSOC)) {
unset($tmp_line["id"]); unset($tmp_line["id"]);
unset($tmp_line["filter_id"]); unset($tmp_line["filter_id"]);
@ -395,7 +395,7 @@ class Opml extends Handler_Protected {
$filter_id = $row['id']; $filter_id = $row['id'];
if ($filter_id) { if ($filter_id) {
$this->opml_notice(T_sprintf("Adding filter...")); $this->opml_notice(T_sprintf("Adding filter %s...", $title));
foreach ($filter["rules"] as $rule) { foreach ($filter["rules"] as $rule) {
$feed_id = null; $feed_id = null;
@ -412,8 +412,6 @@ class Opml extends Handler_Protected {
array_push($match_on, ($is_cat ? "CAT:" : "") . $name); array_push($match_on, ($is_cat ? "CAT:" : "") . $name);
} else { } else {
$match_id = false;
if (!$is_cat) { if (!$is_cat) {
$tsth = $this->pdo->prepare("SELECT id FROM ttrss_feeds $tsth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
WHERE title = ? AND owner_uid = ?"); WHERE title = ? AND owner_uid = ?");
@ -422,6 +420,8 @@ class Opml extends Handler_Protected {
if ($row = $tsth->fetch()) { if ($row = $tsth->fetch()) {
$match_id = $row['id']; $match_id = $row['id'];
array_push($match_on, $match_id);
} }
} else { } else {
$tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories $tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
@ -430,10 +430,10 @@ class Opml extends Handler_Protected {
if ($row = $tsth->fetch()) { if ($row = $tsth->fetch()) {
$match_id = $row['id']; $match_id = $row['id'];
array_push($match_on, "CAT:$match_id");
} }
} }
if ($match_id) array_push($match_on, $match_id);
} }
} }