From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 5 Jun 2013 09:09:47 +0000 (+0400)
Subject: opml: fix filter parameters inverse and title not being properly imported from OPML
X-Git-Tag: 1.8~30
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a1495542fcbe85e5dbe84d4eea26a8364924e2f0;p=tt-rss.git

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

diff --git a/classes/opml.php b/classes/opml.php
index b37b72c2..c5d14cdd 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -165,7 +165,7 @@ class Opml extends Handler_Protected {
 				WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY id");
 
 			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]);
 				}
 
@@ -325,11 +325,14 @@ class Opml extends Handler_Protected {
 			if ($filter) {
 				$match_any_rule = bool_to_sql_bool($filter["match_any_rule"]);
 				$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("INSERT INTO ttrss_filters2 (match_any_rule,enabled,owner_uid)
-					VALUES ($match_any_rule, $enabled,".$_SESSION["uid"].")");
+				$this->dbh->query("INSERT INTO ttrss_filters2 (match_any_rule,enabled,inverse,title,owner_uid)
+					VALUES ($match_any_rule, $enabled, $inverse, '$title',
+					".$_SESSION["uid"].")");
 
 				$result = $this->dbh->query("SELECT MAX(id) AS id FROM ttrss_filters2 WHERE
 					owner_uid = ".$_SESSION["uid"]);