[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.45,1.46

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29023

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
- Call the vars 'contentfilter_*' and not 'filter_*', because the 'filter' is what all vars do...


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_event_spamblock.php	1 Feb 2005 10:36:33 -0000	1.45
+++ serendipity_event_spamblock.php	1 Feb 2005 13:23:45 -0000	1.46
@@ -186,7 +186,7 @@
             'frontend_comment'     => true,
             'fetchcomments'        => true
         ));
-        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'surbl_enabled', 'rbl_enabled', 'rbllist', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'disable_api_comments', 'links_moderate', 'links_reject', 'filter_activate', 'filter_urls', 'filter_authors', 'hide_email', 'logtype', 'logfile'));
+        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'surbl_enabled', 'rbl_enabled', 'rbllist', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'disable_api_comments', 'links_moderate', 'links_reject', 'contentfilter_activate', 'contentfilter_urls', 'contentfilter_authors', 'hide_email', 'logtype', 'logfile'));
 
         $this->filter_defaults = array(
                                    'authors' => 'casino;phentermine;credit;loans;poker',
@@ -240,7 +240,7 @@
                 $propbag->add('default', false);
                 break;
 
-            case 'filter_activate':
+            case 'contentfilter_activate':
                 $propbag->add('type', 'radio');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_ACTIVATE);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_ACTIVATE_DESC);
@@ -253,14 +253,14 @@
 
                 break;
 
-            case 'filter_urls':
+            case 'contentfilter_urls':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS_DESC);
                 $propbag->add('default', $this->filter_defaults['urls']);
                 break;
 
-            case 'filter_authors':
+            case 'contentfilter_authors':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS_DESC);
@@ -466,10 +466,10 @@
                         }
 
                         // Check for word filtering
-                        if ($filter_type = $this->get_config('filter_activate', 'moderate')) {
+                        if ($filter_type = $this->get_config('contentfilter_activate', 'moderate')) {
 
                             // Filter authors names
-                            $filter_authors = explode(';', $this->get_config('filter_authors', $this->filter_defaults['authors']));
+                            $filter_authors = explode(';', $this->get_config('contentfilter_authors', $this->filter_defaults['authors']));
                             if (is_array($filter_authors)) {
                                 foreach($filter_authors AS $filter_author) {
                                     if (preg_match('@' . $filter_author . '@', $eventData['name'])) {
@@ -488,7 +488,7 @@
                             }
 
                             // Filter URL
-                            $filter_urls = explode(';', $this->get_config('filter_urls', $this->filter_defaults['urls']));
+                            $filter_urls = explode(';', $this->get_config('contentfilter_urls', $this->filter_defaults['urls']));
                             if (is_array($filter_urls)) {
                                 foreach($filter_urls AS $filter_url) {
                                     if (preg_match('@' . $filter_url . '@', $eventData['url'])) {