From ea6774cf1d4bfc4fae156198dcffa709c8367785 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Sat, 3 Sep 2005 09:03:06 +0100
Subject: [PATCH] sanity checking in filter editor, updated NEWS, changed prefs
 UI a bit more

---
 NEWS        |  4 +++-
 backend.php |  7 +++++--
 prefs.php   | 11 +++++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index beb5f59cc..5ba79b614 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 v1.0.3 (Sep xx, 2005)
 
-	- OPML export/import.
+	- OPML export/import
+	- Support for simple content filtering (expression should be valid regexp)
+	- Reworked preferences dialog
 
 v1.0.2 (Sep 02, 2005)
 
diff --git a/backend.php b/backend.php
index 2c87cb7c6..20847f00a 100644
--- a/backend.php
+++ b/backend.php
@@ -646,7 +646,7 @@
 		}
 
 		print "<table class=\"prefAddFeed\"><tr>
-			<td>Expr: <input id=\"fadd_regexp\"></td>
+			<td><input id=\"fadd_regexp\"></td>
 			<td>";
 			print_select("fadd_match", "", $filter_types);	
 	
@@ -661,7 +661,7 @@
 				(SELECT description FROM ttrss_filter_types 
 					WHERE id = filter_type) as filter_type_descr
 			FROM 
-				ttrss_filters ORDER by id");
+				ttrss_filters ORDER by regexp");
 
 		print "<p><table width=\"100%\" class=\"prefFilterList\" id=\"prefFilterList\">";
 
@@ -684,6 +684,9 @@
 
 			print "<tr class=\"$class\" id=\"FILRR-$filter_id\">";
 
+			$line["regexp"] = htmlspecialchars($line["regexp"]);
+			$line["description"] = htmlspecialchars($line["description"]);
+
 			if (!$edit_filter_id || $subop != "edit") {
 
 				if (!$line["description"]) $line["description"] = "[No description]";
diff --git a/prefs.php b/prefs.php
index 735263553..974101b1c 100644
--- a/prefs.php
+++ b/prefs.php
@@ -28,11 +28,12 @@
 </tr>
 </tr>
 	<td id="prefContent" class="prefContent" valign="top" colspan="2">
-		<h2>Feed Configuration</h2> 		<div id="piggie">&nbsp;</div>
+		<h2>Feed Configuration</h2><div id="piggie">&nbsp;</div>
 
 
 		<div class="expPane" id="feedConfPane">
-			<a href="javascript:expandPane('feedConfPane')">Click to expand &gt;&gt;</a>
+			<a class="button" 
+				href="javascript:expandPane('feedConfPane')">Expand section &gt;</a>
 		</div>
 
 		<h2>OPML Import</h2>
@@ -48,10 +49,12 @@
 
 		</div>
 
-		<h2>Content filtering</h2>
+		<h2>Content Filtering</h2>
 
 		<div class="expPane" id="filterConfPane">
-			<a href="javascript:expandPane('filterConfPane')">Click to expand &gt;&gt;</a>
+			<a class="button" 
+				href="javascript:expandPane('filterConfPane')">Expand section &gt;</a>
+
 		</div>
 
 	</td>