blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

opml: fix filter parameters inverse and title not being properly imported from OPML

Browse source
This commit is contained in:
Andrew Dolgov 2013-06-05 13:09:47 +04:00
parent 25051fb84b
commit a1495542fc
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
classes/opml.php
View file

@ -165,7 +165,7 @@ class Opml extends Handler_Protected {
WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY id"); WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY id");
while ($line = $this->dbh->fetch_assoc($result)) { while ($line = $this->dbh->fetch_assoc($result)) {
foreach (array('enabled', 'match_any_rule') as $b) { foreach (array('enabled', 'match_any_rule', 'inverse') as $b) {
$line[$b] = sql_bool_to_bool($line[$b]); $line[$b] = sql_bool_to_bool($line[$b]);
} }
@ -325,11 +325,14 @@ class Opml extends Handler_Protected {
if ($filter) { if ($filter) {
$match_any_rule = bool_to_sql_bool($filter["match_any_rule"]); $match_any_rule = bool_to_sql_bool($filter["match_any_rule"]);
$enabled = bool_to_sql_bool($filter["enabled"]); $enabled = bool_to_sql_bool($filter["enabled"]);
$inverse = bool_to_sql_bool($filter["inverse"]);
$title = db_escape_string($filter["title"]);
$this->dbh->query("BEGIN"); $this->dbh->query("BEGIN");
$this->dbh->query("INSERT INTO ttrss_filters2 (match_any_rule,enabled,owner_uid) $this->dbh->query("INSERT INTO ttrss_filters2 (match_any_rule,enabled,inverse,title,owner_uid)
VALUES ($match_any_rule, $enabled,".$_SESSION["uid"].")"); VALUES ($match_any_rule, $enabled, $inverse, '$title',
".$_SESSION["uid"].")");
$result = $this->dbh->query("SELECT MAX(id) AS id FROM ttrss_filters2 WHERE $result = $this->dbh->query("SELECT MAX(id) AS id FROM ttrss_filters2 WHERE
owner_uid = ".$_SESSION["uid"]); owner_uid = ".$_SESSION["uid"]);