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

[tt-rss.git] / backend.php

diff --git a/backend.php b/backend.php
index 2c87cb7c690510132b6c8be0597fc619ad3b8687..20847f00af37206e76463c39daa66fa27f257922 100644 (file)
--- 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]";