createFilter: properly create type 7 filters

master
Andrew Dolgov 16 years ago
parent 6427a306ae
commit db34a63e2a

@ -232,6 +232,7 @@
$feed_id = db_escape_string($_GET["feed_id"]); $feed_id = db_escape_string($_GET["feed_id"]);
$action_id = db_escape_string($_GET["action_id"]); $action_id = db_escape_string($_GET["action_id"]);
$action_param = db_escape_string($_GET["action_param"]); $action_param = db_escape_string($_GET["action_param"]);
$action_param_label = db_escape_string($_GET["action_param_label"]);
$inverse = checkbox_to_sql_bool(db_escape_string($_GET["inverse"])); $inverse = checkbox_to_sql_bool(db_escape_string($_GET["inverse"]));
# for the time being, no other filters use params anyway... # for the time being, no other filters use params anyway...
@ -245,6 +246,13 @@
$feed_id = sprintf("'%s'", db_escape_string($feed_id)); $feed_id = sprintf("'%s'", db_escape_string($feed_id));
} }
/* When processing 'assign label' filters, action_param_label dropbox
* overrides action_param */
if ($action_id == 7) {
$action_param = $action_param_label;
}
$result = db_query($link, $result = db_query($link,
"INSERT INTO ttrss_filters (reg_exp,filter_type,owner_uid,feed_id, "INSERT INTO ttrss_filters (reg_exp,filter_type,owner_uid,feed_id,
action_id, action_param, inverse, filter_param) action_id, action_param, inverse, filter_param)

Loading…
Cancel
Save