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

diff --git a/NEWS b/NEWS
index beb5f59cce40c6fd0ac931b6762ba8630908fa5a..5ba79b614734344bc12b3455db5422225bb395a0 100644 (file)
--- 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 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]";

diff --git a/prefs.php b/prefs.php
index 735263553135d4da92e58f758dd9cafde47b75c2..974101b1c8cd552abb0454abe232387c07a66e51 100644 (file)
--- 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>