per-feed filters

1 files changed, 10 insertions, 3 deletions

diff --git a/prefs.js b/prefs.js
index 4f3786fcb..aa1e6aeee 100644
--- a/prefs.js
+++ b/prefs.js
@@ -247,6 +247,7 @@ function addFilter() {
 
 	var regexp = document.getElementById("fadd_regexp");
 	var match = document.getElementById("fadd_match");
+	var feed = document.getElementById("fadd_feed");
 
 	if (regexp.value.length == 0) {
 		notify("Missing filter expression.");
@@ -255,8 +256,11 @@ function addFilter() {
 
 		var v_match = match[match.selectedIndex].text;
 
+		var feed_id = feed[feed.selectedIndex].id;
+
 		xmlhttp.open("GET", "backend.php?op=pref-filters&subop=add&regexp=" +
-			param_escape(regexp.value) + "&match=" + v_match, true);			
+			param_escape(regexp.value) + "&match=" + v_match +
+			"&fid=" + param_escape(feed_id), true);			
 			
 		xmlhttp.onreadystatechange=filterlist_callback;
 		xmlhttp.send(null);
@@ -794,9 +798,12 @@ function filterEditSave() {
 	var regexp = document.getElementById("iedit_regexp").value;
 	var descr = document.getElementById("iedit_descr").value;
 	var match = document.getElementById("iedit_match");
-
+	
 	var v_match = match[match.selectedIndex].text;
 
+	var feed = document.getElementById("iedit_feed");
+	var feed_id = feed[feed.selectedIndex].id;
+
 //	notify("Saving filter " + filter + ": " + regexp + ", " + descr + ", " + match);
 
 	if (regexp.length == 0) {
@@ -808,7 +815,7 @@ function filterEditSave() {
 
 	xmlhttp.open("GET", "backend.php?op=pref-filters&subop=editSave&id=" +
 		filter + "&r=" + param_escape(regexp) + "&d=" + param_escape(descr) +
-		"&m=" + param_escape(v_match), true);
+		"&m=" + param_escape(v_match) + "&fid=" + param_escape(feed_id), true);
 
 	notify("");