mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Added "exclude urls" to ip validation functionality in spam block plugin. identi.ca is sending pingbacks but fails the ip validation!

Browse Source 
(there were a bug in the prior commit.. :-/)
This commit is contained in:
Grischa Brockhaus 2009-07-05 15:15:10 +00:00
parent 2c5219f17c
commit 0ec74a02ab
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/serendipity_event_spamblock/serendipity_event_spamblock.php
View File

@ -124,9 +124,10 @@ var $filter_defaults;
break; break;
case 'trackback_ipvalidation_url_exclude': case 'trackback_ipvalidation_url_exclude':
$propbag->add('type', 'string'); $propbag->add('type', 'text');
$propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_TRACKBACKIPVALIDATION_URL_EXCLUDE); $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_TRACKBACKIPVALIDATION_URL_EXCLUDE);
$propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_TRACKBACKIPVALIDATION_URL_EXCLUDE_DESC); $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_TRACKBACKIPVALIDATION_URL_EXCLUDE_DESC);
$propbag->add('rows', 2);
$propbag->add('default', $this->get_default_exclude_urls()); $propbag->add('default', $this->get_default_exclude_urls());
break; break;
@ -297,6 +298,7 @@ var $filter_defaults;
case 'contentfilter_urls': case 'contentfilter_urls':
$propbag->add('type', 'text'); $propbag->add('type', 'text');
$propbag->add('rows', 3);
$propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS); $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS);
$propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS_DESC); $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS_DESC);
$propbag->add('default', $this->filter_defaults['urls']); $propbag->add('default', $this->filter_defaults['urls']);
@ -304,6 +306,7 @@ var $filter_defaults;
case 'contentfilter_authors': case 'contentfilter_authors':
$propbag->add('type', 'text'); $propbag->add('type', 'text');
$propbag->add('rows', 3);
$propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS); $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS);
$propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS_DESC); $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS_DESC);
$propbag->add('default', $this->filter_defaults['authors']); $propbag->add('default', $this->filter_defaults['authors']);
@ -311,6 +314,7 @@ var $filter_defaults;
case 'contentfilter_words': case 'contentfilter_words':
$propbag->add('type', 'text'); $propbag->add('type', 'text');
$propbag->add('rows', 3);
$propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_WORDS); $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_WORDS);
$propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS_DESC); $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS_DESC);
$propbag->add('default', $this->filter_defaults['words']); $propbag->add('default', $this->filter_defaults['words']);
@ -318,6 +322,7 @@ var $filter_defaults;
case 'contentfilter_emails': case 'contentfilter_emails':
$propbag->add('type', 'text'); $propbag->add('type', 'text');
$propbag->add('rows', 3);
$propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_EMAILS); $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_EMAILS);
$propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS_DESC); $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS_DESC);
$propbag->add('default', $this->filter_defaults['emails']); $propbag->add('default', $this->filter_defaults['emails']);
@ -902,13 +907,15 @@ var $filter_defaults;
$trackback_ipvalidation_option = $this->get_config('trackback_ipvalidation','moderate'); $trackback_ipvalidation_option = $this->get_config('trackback_ipvalidation','moderate');
if (($addData['type'] == 'TRACKBACK' || $addData['type'] == 'PINGBACK') && $trackback_ipvalidation_option != 'no') { if (($addData['type'] == 'TRACKBACK' || $addData['type'] == 'PINGBACK') && $trackback_ipvalidation_option != 'no') {
$this->IsHardcoreSpammer(); $this->IsHardcoreSpammer();
$exclude_urls = explode(';',$this->get_config('trackback_ipvalidation_url_exclude'), $this->get_default_exclude_urls()); $exclude_urls = explode(';',$this->get_config('trackback_ipvalidation_url_exclude', $this->get_default_exclude_urls()));
$found_exclude_url = false; $found_exclude_url = false;
foreach ($exclude_urls as $exclude_url) { foreach ($exclude_urls as $exclude_url) {
$exclude_url = trim($exclude_url); $exclude_url = trim($exclude_url);
if (empty($exclude_url)) continue; if (empty($exclude_url)) continue;
$found_exclude_url = preg_match('@' . $exclude_url . '@',$addData['url']); $found_exclude_url = preg_match('@' . $exclude_url . '@',$addData['url']);
if ($found_exclude_url) break; if ($found_exclude_url) {
break;
}
} }
if (!$found_exclude_url) { if (!$found_exclude_url) {
$parts = @parse_url($addData['url']); $parts = @parse_url($addData['url']);