summaryrefslogtreecommitdiff
path: root/modules/aggregator
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2005-11-30 11:03:58 +0000
committerDries Buytaert <dries@buytaert.net>2005-11-30 11:03:58 +0000
commit0f6067fc849f749ca4356a5db224c6a0e5f95666 (patch)
treed94eae0347570b6c51dcb105c9ee6f8cca67152d /modules/aggregator
parent2917261693c0eea6d4593096024398e6d7141be7 (diff)
downloadbrdo-0f6067fc849f749ca4356a5db224c6a0e5f95666.tar.gz
brdo-0f6067fc849f749ca4356a5db224c6a0e5f95666.tar.bz2
- Removed valid_input_check().
Diffstat (limited to 'modules/aggregator')
-rw-r--r--modules/aggregator/aggregator.module11
1 files changed, 3 insertions, 8 deletions
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index e0e84703c..c18687419 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -524,10 +524,10 @@ function aggregator_parse_feed(&$data, $feed) {
foreach ($item as $key => $value) {
$value = decode_entities(trim($value));
$value = strip_tags($value, variable_get('aggregator_allowed_html_tags', '<a> <b> <br> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul>'));
- $value = preg_replace('/\Wstyle\s*=[^>]+?>/i', '>', $value);
- $value = preg_replace('/\Won[a-z]+\s*=[^>]+?>/i', '>', $value);
+ $value = filter_xss($value);
$item[$key] = $value;
}
+
/*
** Resolve the item's title. If no title is found, we use
** up to 40 characters of the description ending at a word
@@ -601,12 +601,7 @@ function aggregator_parse_feed(&$data, $feed) {
$entry = db_fetch_object(db_query("SELECT iid FROM {aggregator_item} WHERE fid = %d AND title = '%s'", $feed['fid'], $title));
}
- if (!valid_input_data($item['DESCRIPTION'])) {
- drupal_set_message(t('The RSS feed from %site seems to be broken, because of suspicious input data.', array('%site' => theme('placeholder', $feed['title']))), 'error');
- }
- else {
- aggregator_save_item(array('iid' => $entry->iid, 'fid' => $feed['fid'], 'timestamp' => $timestamp, 'title' => $title, 'link' => $link, 'author' => $item['AUTHOR'], 'description' => $item['DESCRIPTION']));
- }
+ aggregator_save_item(array('iid' => $entry->iid, 'fid' => $feed['fid'], 'timestamp' => $timestamp, 'title' => $title, 'link' => $link, 'author' => $item['AUTHOR'], 'description' => $item['DESCRIPTION']));
}
/*