1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-22 09:41:29 +00:00

check regular expression before adding/saving filter

This commit is contained in:
Andrew Dolgov
2010-11-11 14:26:44 +03:00
parent a9d63d29a1
commit f705f20656
4 changed files with 151 additions and 68 deletions

View File

@@ -764,19 +764,44 @@ function userEditSave() {
function filterEditSave() {
try {
var reg_exp = document.forms["filter_edit_form"].reg_exp.value;
notify_progress("Saving filter...");
var query = "?" + Form.serialize("filter_edit_form");
closeInfoBox();
var query = "?op=rpc&subop=verifyRegexp&reg_exp=" + param_escape(reg_exp);
notify_progress("Verifying regular expression...");
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
filterlist_callback2(transport);
handle_rpc_reply(transport);
var response = transport.responseXML;
if (response) {
var s = response.getElementsByTagName("status")[0].firstChild.nodeValue;
notify('');
if (s == "INVALID") {
alert("Match regular expression seems to be invalid.");
return;
} else {
var query = "?" + Form.serialize("filter_edit_form");
notify_progress("Saving filter...");
Form.disable("filter_edit_form");
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
closeInfoBox();
filterlist_callback2(transport);
} });
}
}
} });
} catch (e) {
@@ -2099,4 +2124,20 @@ function clearFeedAccessKeys() {
return false;
}
function handle_rpc_reply(transport, scheduled_call) {
try {
if (transport.responseXML) {
if (!transport_error_check(transport)) return false;
} else {
notify_error("Error communicating with server.");
}
} catch (e) {
exception_error("handle_rpc_reply", e, transport);
}
return true;
}