diff options
author | Andrew Dolgov <[email protected]> | 2008-12-13 14:49:19 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2008-12-13 14:49:19 +0100 |
commit | 44d0e7742b05a43b69e3296596d581f4e5d825dc (patch) | |
tree | 50edf24ee726017accf819ed38f809bbfa2a5654 /modules | |
parent | 08e618f7001c3b1dd77e3fc9e484387ed6b2e7c7 (diff) |
enable processing of article-date filter (closes #225)
Diffstat (limited to 'modules')
-rw-r--r-- | modules/popup-dialog.php | 12 | ||||
-rw-r--r-- | modules/pref-filters.php | 27 |
2 files changed, 26 insertions, 13 deletions
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php index a39ea0efa..fe8bf5e01 100644 --- a/modules/popup-dialog.php +++ b/modules/popup-dialog.php @@ -360,10 +360,14 @@ print "<span id=\"filter_dlg_date_mod_box\" style=\"display : none\">"; print __("Date") . " "; - print "<select name=\"filter_date_modifier\">"; - print "<option value=\"before\">".__('before')."</option>"; - print "<option value=\"after\">".__('after')."</option>"; - print "</select> </span>"; + + $filter_params = array( + "before" => __("before"), + "after" => __("after")); + + print_select_hash("filter_date_modifier", "before", $filter_params); + + print " </span>"; print "<input onkeypress=\"return filterCR(event, createFilter)\" onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\" diff --git a/modules/pref-filters.php b/modules/pref-filters.php index 2bf4c1516..777e9ba81 100644 --- a/modules/pref-filters.php +++ b/modules/pref-filters.php @@ -15,6 +15,7 @@ $feed_id = db_fetch_result($result, 0, "feed_id"); $action_id = db_fetch_result($result, 0, "action_id"); $action_param = db_fetch_result($result, 0, "action_param"); + $filter_param = db_fetch_result($result, 0, "filter_param"); $enabled = sql_bool_to_bool(db_fetch_result($result, 0, "enabled")); $inverse = sql_bool_to_bool(db_fetch_result($result, 0, "inverse")); @@ -48,10 +49,15 @@ print "<span id=\"filter_dlg_date_mod_box\" $date_ops_invisible>"; print __("Date") . " "; - print "<select name=\"filter_date_modifier\">"; - print "<option value=\"before\">".__('before')."</option>"; - print "<option value=\"after\">".__('after')."</option>"; - print "</select> </span>"; + + $filter_params = array( + "before" => __("before"), + "after" => __("after")); + + print_select_hash("filter_date_modifier", $filter_param, + $filter_params); + + print " </span>"; print "<input onkeypress=\"return filterCR(event, filterEditSave)\" onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\" @@ -167,6 +173,9 @@ $enabled = checkbox_to_sql_bool(db_escape_string($_GET["enabled"])); $inverse = checkbox_to_sql_bool(db_escape_string($_GET["inverse"])); + # for the time being, no other filters use params anyway... + $filter_param = db_escape_string($_GET["filter_date_modifier"]); + if (!$feed_id) { $feed_id = 'NULL'; } else { @@ -180,7 +189,8 @@ filter_type = '$filter_type', enabled = $enabled, inverse = $inverse, - action_param = '$action_param' + action_param = '$action_param', + filter_param = '$filter_param' WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]); if (db_affected_rows($link, $result) != 0) { @@ -205,9 +215,11 @@ $feed_id = db_escape_string($_GET["feed_id"]); $action_id = db_escape_string($_GET["action_id"]); $action_param = db_escape_string($_GET["action_param"]); - $inverse = checkbox_to_sql_bool(db_escape_string($_GET["inverse"])); + # for the time being, no other filters use params anyway... + $filter_param = db_escape_string($_GET["filter_date_modifier"]); + if (!$regexp) return; if (!$feed_id) { @@ -216,9 +228,6 @@ $feed_id = sprintf("'%s'", db_escape_string($feed_id)); } - # for the time being, no other filters use params anyway... - $filter_param = db_escape_string($_GET["filter_date_modifier"]); - $result = db_query($link, "INSERT INTO ttrss_filters (reg_exp,filter_type,owner_uid,feed_id, action_id, action_param, inverse, filter_param) |