summaryrefslogtreecommitdiff
path: root/modules/aggregator.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2003-08-08 22:24:55 +0000
committerDries Buytaert <dries@buytaert.net>2003-08-08 22:24:55 +0000
commit39950fe2e22b479284f758131e7050f36ef83899 (patch)
tree498d33a38dc5431bfdd6dab3a0c0d25b68e2ae86 /modules/aggregator.module
parente2f098af854861033d863c2dc304e62f90c0896d (diff)
downloadbrdo-39950fe2e22b479284f758131e7050f36ef83899.tar.gz
brdo-39950fe2e22b479284f758131e7050f36ef83899.tar.bz2
- Committed a modified version of Ulf's input checking changes. Patch #95.
I added an error message, changed a few things around and fixed tw typos.
Diffstat (limited to 'modules/aggregator.module')
-rw-r--r--modules/aggregator.module6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 59847de0b..62261e711 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -291,7 +291,7 @@ function import_refresh($feed) {
*/
if (!ereg("^http://|ftp://", $feed["url"])) {
- return t("failed to parse RSS feed '%site': incorrect or missing URL.", array("%side" => $feed["title"]));
+ return t("failed to parse RSS feed '%site': incorrect or missing URL.", array("%site" => $feed["title"]));
}
/*
@@ -306,7 +306,9 @@ function import_refresh($feed) {
fclose($fp);
// filter the input data:
- xss_check_input_data($data);
+ if (!valid_input_data($data)) {
+ return t("failed to parse RSS feed '%site': suspicious input data.", array("%site" => $feed["title"]));
+ }
// parse the data:
$xml_parser = xml_parser_create();