sanity checking in filter editor, updated NEWS, changed prefs UI a bit more

1 files changed, 5 insertions, 2 deletions

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]";