valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
functions.js
View File

@ -577,55 +577,6 @@ function parse_counters(reply, scheduled_call) {
} */
function handle_rpc_reply(transport, scheduled_call) {
try {
if (offline_mode) return false;
if (!transport.responseText && db) {
offlineConfirmModeChange();
return false;
}
if (transport.responseXML) {
if (!transport_error_check(transport)) return false;
var message = transport.responseXML.getElementsByTagName("message")[0];
if (message) {
message = message.firstChild.nodeValue;
if (message == "UPDATE_COUNTERS") {
setInitParam("last_article_id", -1);
_force_scheduled_update = true;
}
}
var counters = transport.responseXML.getElementsByTagName("counters")[0];
if (counters)
parse_counters(counters, scheduled_call);
var runtime_info = transport.responseXML.getElementsByTagName("runtime-info")[0];
if (runtime_info)
parse_runtime_info(runtime_info);
if (feedsSortByUnread())
resort_feedlist();
hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
} else {
notify_error("Error communicating with server.");
}
} catch (e) {
exception_error("handle_rpc_reply", e, transport);
}
return true;
}
function get_feed_unread(id) {
try {
@ -1291,20 +1242,45 @@ function createFilter() {
return false;
}
var query = Form.serialize("filter_add_form");
var query = "?op=rpc&subop=verifyRegexp&reg_exp=" + param_escape(reg_exp);
// we can be called from some other tab in Prefs
if (typeof active_tab != 'undefined' && active_tab) {
active_tab = "filterConfig";
}
notify_progress("Verifying regular expression...");
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(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_add_form");
// we can be called from some other tab in Prefs
if (typeof active_tab != 'undefined' && active_tab) {
active_tab = "filterConfig";
}
new Ajax.Request("backend.php?" + query, {
onComplete: function (transport) {
infobox_submit_callback2(transport);
} });
return true;
}
}
new Ajax.Request("backend.php?" + query, {
onComplete: function (transport) {
infobox_submit_callback2(transport);
} });
return true;
} catch (e) {
exception_error("createFilter", e);
}

16
modules/backend-rpc.php
View File

@ -1128,6 +1128,22 @@
return;
}
if ($subop == "verifyRegexp") {
$reg_exp = $_REQUEST["reg_exp"];
print "<rpc-reply><status>";
if (@preg_match("/$reg_exp/i", "TEST") === false) {
print "INVALID";
} else {
print "OK";
}
print "</status></rpc-reply>";
return;
}
print "<rpc-reply><error>Unknown method: $subop</error></rpc-reply>";
}
?>

53
prefs.js
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 = "?op=rpc&subop=verifyRegexp&reg_exp=" + param_escape(reg_exp);
var query = "?" + Form.serialize("filter_edit_form");
closeInfoBox();
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;
}

50
tt-rss.js
View File

@ -1250,3 +1250,53 @@ function showFeedsWithErrors() {
displayDlg('feedUpdateErrors');
}
function handle_rpc_reply(transport, scheduled_call) {
try {
if (offline_mode) return false;
if (!transport.responseText && db) {
offlineConfirmModeChange();
return false;
}
if (transport.responseXML) {
if (!transport_error_check(transport)) return false;
var message = transport.responseXML.getElementsByTagName("message")[0];
if (message) {
message = message.firstChild.nodeValue;
if (message == "UPDATE_COUNTERS") {
setInitParam("last_article_id", -1);
_force_scheduled_update = true;
}
}
var counters = transport.responseXML.getElementsByTagName("counters")[0];
if (counters)
parse_counters(counters, scheduled_call);
var runtime_info = transport.responseXML.getElementsByTagName("runtime-info")[0];
if (runtime_info)
parse_runtime_info(runtime_info);
if (feedsSortByUnread())
resort_feedlist();
hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
} else {
notify_error("Error communicating with server.");
}
} catch (e) {
exception_error("handle_rpc_reply", e, transport);
}
return true;
}