mark date filters with unparsable reg_exp in filter display

diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 777e9ba8178e7d1c66eb1127f3525f9614821e7f..d0e12f31fac78af5d4214685576f00934e304d6b 100644 (file)
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -316,6 +316,7 @@
                                enabled,
                                inverse,
                                feed_id,
+                               filter_type,
                                ttrss_filter_actions.description AS action_description,
                                ttrss_feeds.title AS feed_title,
                                ttrss_filter_actions.name AS action_name,
@@ -417,16 +418,21 @@
 
                                $onclick = "onclick='editFilter($filter_id)' title='".__('Click to edit')."'";
 
-                               print "<td $onclick>" . $line["reg_exp"] . "</td>";             
-                               print "<td $onclick>" . $line["feed_title"] . "</td>";                  
+                               if ($line["filter_type"] == 5 && !strtotime($line["reg_exp"])) {
+                                       $line["reg_exp"] = "<span class=\"filterDateError\">" . 
+                                               $line["reg_exp"] . "</span>";
+                               }
 
                                $inverse_label = "";
 
                                if ($inverse) {
                                        $inverse_label = " <span class='insensitive'>".__('(Inverse)')."</span>";
                                }
+
+                               print "<td $onclick>" . $line["reg_exp"] . "$inverse_label</td>";               
+                               print "<td $onclick>" . $line["feed_title"] . "</td>";                  
        
-                               print "<td $onclick>" . $line["filter_type_descr"] . "$inverse_label</td>";
+                               print "<td $onclick>" . $line["filter_type_descr"] . "</td>";
                                print "<td $onclick>" . $line["action_param"] . "</td>";
 
                                print "</tr>";

diff --git a/tt-rss.css b/tt-rss.css
index 129a8446f04990bc2829f216526902be4219ecb7..7cf2bcf5e716da99095cb924005fd4a6e1115a55 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -722,6 +722,10 @@ div.warning img, div.notice img, div.error img {
        padding : 5px;
 }
 
+span.filterDateError {
+       color : #ff0000;
+}
+
 div.error {
        border : 1px solid #ff0000;
        background : #ffcccc;