public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 19:55:55 +00:00
Code Issues Releases Wiki Activity

properly handle invalid regular expressions supplied when testing filters, add some additional regexp checks (closes #427)

Browse Source
This commit is contained in:
Andrew Dolgov
2012-02-21 12:36:29 +04:00
parent 7b8ff151ed
commit 56fbb82cb0
4 changed files with 136 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
js/functions.js
View File

@@ -982,19 +982,39 @@ function quickAddFilter() {
test: function() {
if (this.validate()) {
if (dijit.byId("filterTestDlg"))
dijit.byId("filterTestDlg").destroyRecursive();
var query = "?op=rpc&method=verifyRegexp&reg_exp=" +
param_escape(dialog.attr('value').reg_exp);
tdialog = new dijit.Dialog({
id: "filterTestDlg",
title: __("Filter Test Results"),
style: "width: 600px",
href: "backend.php?savemode=test&" +
dojo.objectToQuery(dialog.attr('value')),
});
notify_progress("Verifying regular expression...");
tdialog.show();
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
var reply = JSON.parse(transport.responseText);
if (reply) {
notify('');
if (!reply['status']) {
alert("Invalid regular expression.");
return;
} else {
if (dijit.byId("filterTestDlg"))
dijit.byId("filterTestDlg").destroyRecursive();
tdialog = new dijit.Dialog({
id: "filterTestDlg",
title: __("Filter Test Results"),
style: "width: 600px",
href: "backend.php?savemode=test&" +
dojo.objectToQuery(dialog.attr('value')),
});
tdialog.show();
}
}
}});
}
},
execute: function() {
@@ -1014,7 +1034,7 @@ function quickAddFilter() {
notify('');
if (!reply['status']) {
alert("Match regular expression seems to be invalid.");
alert("Invalid regular expression.");
return;
} else {
notify_progress("Saving data...", true);