is_badhost(): becomes just a sample code

diff --git a/spam/SpamTest.php b/spam/SpamTest.php
index 627308c..7f7050a 100644 (file)
--- a/spam/SpamTest.php
+++ b/spam/SpamTest.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: SpamTest.php,v 1.5 2007/04/30 07:41:09 henoheno Exp $
+// $Id: SpamTest.php,v 1.6 2007/05/01 05:04:39 henoheno Exp $
 // Copyright (C) 2007 heno
 //
 // Design test case for spam.php (called from runner.php)
@@ -369,12 +369,12 @@ EOF;
 
        function testFunc_is_badhost()
        {
-               $remains = array();
-
                // FALSE (Nothing)
-               $this->assertEquals(array(), is_badhost(array(), TRUE, $remains));
+               $this->assertEquals(FALSE,   is_badhost(array(), FALSE, TRUE));
+               $this->assertEquals(array(), is_badhost(array(), FALSE, FALSE));
 
                // TRUE
+               $this->assertEquals(TRUE,    is_badhost('=.blogspot.com', FALSE, TRUE));
                $this->assertEquals(
                        array(
                                'B-1' => array(
@@ -383,12 +383,8 @@ EOF;
                                        )
                                )
                        ),
-                       is_badhost('=.blogspot.com', TRUE, $remains)
+                       is_badhost('=.blogspot.com', FALSE, FALSE)
                );
-
-               // $remains
-               is_badhost('nothing', TRUE, $remains);
-               $this->assertEquals(array(0 => 'nothing'), $remains);
        }
 }
 

diff --git a/spam/spam.php b/spam/spam.php
index fd2d3a7..4ac9fa7 100644 (file)
--- a/spam/spam.php
+++ b/spam/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.138 2007/04/30 03:23:33 henoheno Exp $
+// $Id: spam.php,v 1.139 2007/05/01 05:04:39 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -1016,19 +1016,16 @@ function blocklist_distiller(& $hosts, $keys = array('goodhost', 'badhost'), $as
        return $blocked;
 }
 
-function is_badhost($hosts = array(), $asap = TRUE, & $remains)
+// Simple example for badhost (not used now)
+function is_badhost($hosts = array(), $asap = TRUE, $bool = TRUE)
 {
        $list = get_blocklist('list');
-
        $blocked = blocklist_distiller($hosts, array_keys($list), $asap);
-       $remains = $hosts;
        foreach($list as $key=>$type){
-               if (! $type) {
-                       unset($blocked[$key]); // Ignore goodhost etc
-               }
+               if (! $type) unset($blocked[$key]); // Ignore goodhost etc
        }
 
-       return $blocked;
+       return $bool ? ! empty($blocked) : $blocked;
 }
 
 
@@ -1256,29 +1253,32 @@ function check_uri_spam($target = '', $method = array())
        // Return if ...
        if ($asap && $is_spam) return $progress;
 
-       // URI: Bad host
+       // URI: Bad host (Separate good/bad hosts from $hosts)
        if ((! $asap || ! $is_spam) && isset($method['badhost'])) {
-               $__remains = array();
-               $badhost = is_badhost($hosts, $asap, $__remains);
-               if (! $asap) {
-                       if ($__remains) {
-                               $remains['badhost'] = array();
-                               foreach ($__remains as $value) {
-                                       $remains['badhost'][$value] = TRUE;
-                               }
+
+               // is_badhost()
+               $list = get_blocklist('list');
+               $blocked = blocklist_distiller($hosts, array_keys($list), $asap);
+               foreach($list as $key=>$type){
+                       if (! $type) unset($blocked[$key]); // Ignore goodhost etc
+               }
+
+               if (! $asap && $hosts) {
+                       $remains['badhost'] = array();
+                       foreach ($hosts as $value) {
+                               $remains['badhost'][$value] = TRUE;
                        }
                }
-               unset($__remains);
-               if (! empty($badhost)) {
 
-                       //var_dump($badhost);   // BADHOST detail
+               if (! empty($blocked)) {
+
+                       //var_dump($blocked);   // BADHOST detail
 
-                       $sum['badhost'] += array_count_leaves($badhost);
-                       foreach(array_keys($badhost) as $keys) {
+                       $sum['badhost'] += array_count_leaves($blocked);
+                       foreach(array_keys($blocked) as $keys) {
                                $is_spam['badhost'][$keys] =
-                                       array_count_leaves($badhost[$keys]);
+                                       array_count_leaves($blocked[$keys]);
                        }
-                       unset($badhost);
                }
        }