From: Andrew Dolgov <fox@bah.spb.su>
Date: Sat, 13 Dec 2008 14:02:19 +0000 (+0100)
Subject: mark date filters with unparsable reg_exp in filter display
X-Git-Tag: 1.2.30~11
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=1b74062fc554dcd51a680e30c5f9fbd4b4332225;p=tt-rss.git

mark date filters with unparsable reg_exp in filter display
---

diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 777e9ba8..d0e12f31 100644
--- 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 129a8446..7cf2bcf5 100644
--- 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;