From 7f94284bd6c6bfb267f81b8bfdff1df93177a96c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 16 Dec 2008 08:21:35 +0100 Subject: [PATCH] tweak filter list display --- modules/pref-filters.php | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/modules/pref-filters.php b/modules/pref-filters.php index d0e12f31..f30d772b 100644 --- a/modules/pref-filters.php +++ b/modules/pref-filters.php @@ -316,6 +316,7 @@ enabled, inverse, feed_id, + filter_param, filter_type, ttrss_filter_actions.description AS action_description, ttrss_feeds.title AS feed_title, @@ -403,6 +404,22 @@ print ""; + $filter_params = array( + "before" => __("before"), + "after" => __("after")); + + if ($line["filter_type"] == 5) { + + if (!strtotime($line["reg_exp"])) { + $line["reg_exp"] = "" . + $line["reg_exp"] . ""; + } + + $line["reg_exp"] = __("Date") . " " . + $filter_params[$line['filter_param']] . " " . + $line["reg_exp"]; + } + if (!$enabled) { $line["reg_exp"] = "" . $line["reg_exp"] . " " . __("(Disabled)").""; @@ -418,11 +435,6 @@ $onclick = "onclick='editFilter($filter_id)' title='".__('Click to edit')."'"; - if ($line["filter_type"] == 5 && !strtotime($line["reg_exp"])) { - $line["reg_exp"] = "" . - $line["reg_exp"] . ""; - } - $inverse_label = ""; if ($inverse) { -- 2.39.5