Remains more data

diff --git a/spam.php b/spam.php
index f9e0a88..2625180 100644 (file)
--- a/spam.php
+++ b/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.117 2007/02/17 13:43:34 henoheno Exp $
+// $Id: spam.php,v 1.118 2007/02/19 12:54:25 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 // Functions for Concept-work of spam-uri metrics
@@ -793,7 +793,7 @@ function check_uri_spam($target = '', $method = array())
        $remains = & $progress['remains'];
        $asap    = isset($method['asap']);
 
-       // Return if ...
+       // Recurse
        if (is_array($target)) {
                foreach($target as $str) {
                        // Recurse
@@ -820,7 +820,11 @@ function check_uri_spam($target = '', $method = array())
                        }
                        foreach ($_remains as $key=>$value) {
                                foreach ($value as $_key=>$_value) {
-                                       $remains[$key][$_key] = $_value;
+                                       if (is_int($_key)) {
+                                               $remains[$key][]      = $_value;
+                                       } else {
+                                               $remains[$key][$_key] = $_value;
+                                       }
                                }
                        }
                        if ($asap && $is_spam) break;
@@ -855,14 +859,14 @@ function check_uri_spam($target = '', $method = array())
        }
 
        // Return if ...
-       if ($asap && $is_spam) {
-               return $progress;
-       }
-       // URI Init
+       if ($asap && $is_spam) return $progress;
+
+       // URI: Pickup
        $pickups = spam_uri_pickup($target, $method);
-       if (empty($pickups)) {
-               return $progress;
-       }
+       //$remains['uri_pickup'] = & $pickups;
+
+       // Return if ...
+       if (empty($pickups)) return $progress;
 
        // URI: Check quantity
        $sum['quantity'] += count($pickups);
@@ -930,14 +934,13 @@ function check_uri_spam($target = '', $method = array())
        }
 
        // Return if ...
-       if ($asap && $is_spam) {
-               return $progress;
-       }
+       if ($asap && $is_spam) return $progress;
 
        // Host: Uniqueness (uniq / non-uniq)
        $hosts = array();
        foreach ($pickups as $pickup) $hosts[] = & $pickup['host'];
        $hosts = array_unique($hosts);
+       //$remains['uniqhost'] = & $hosts;
        $sum['uniqhost'] += count($hosts);
        if ((! $asap || ! $is_spam) && isset($method['non_uniqhost'])) {
                $sum['non_uniqhost'] = $sum['quantity'] - $sum['uniqhost'];
@@ -947,9 +950,7 @@ function check_uri_spam($target = '', $method = array())
        }
 
        // Return if ...
-       if ($asap && $is_spam) {
-               return $progress;
-       }
+       if ($asap && $is_spam) return $progress;
 
        // URI: Bad host
        if ((! $asap || ! $is_spam) && isset($method['badhost'])) {
@@ -959,9 +960,9 @@ function check_uri_spam($target = '', $method = array())
                } else {
                        $badhost = is_badhost($hosts, $asap, $__remains);
                        if ($__remains) {
-                               $progress['remains']['badhost'] = array();
+                               $remains['badhost'] = array();
                                foreach ($__remains as $value) {
-                                       $progress['remains']['badhost'][$value] = TRUE;
+                                       $remains['badhost'][$value] = TRUE;
                                }
                        }
                }

diff --git a/spam/spam.php b/spam/spam.php
index f9e0a88..2625180 100644 (file)
--- a/spam/spam.php
+++ b/spam/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.117 2007/02/17 13:43:34 henoheno Exp $
+// $Id: spam.php,v 1.118 2007/02/19 12:54:25 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 // Functions for Concept-work of spam-uri metrics
@@ -793,7 +793,7 @@ function check_uri_spam($target = '', $method = array())
        $remains = & $progress['remains'];
        $asap    = isset($method['asap']);
 
-       // Return if ...
+       // Recurse
        if (is_array($target)) {
                foreach($target as $str) {
                        // Recurse
@@ -820,7 +820,11 @@ function check_uri_spam($target = '', $method = array())
                        }
                        foreach ($_remains as $key=>$value) {
                                foreach ($value as $_key=>$_value) {
-                                       $remains[$key][$_key] = $_value;
+                                       if (is_int($_key)) {
+                                               $remains[$key][]      = $_value;
+                                       } else {
+                                               $remains[$key][$_key] = $_value;
+                                       }
                                }
                        }
                        if ($asap && $is_spam) break;
@@ -855,14 +859,14 @@ function check_uri_spam($target = '', $method = array())
        }
 
        // Return if ...
-       if ($asap && $is_spam) {
-               return $progress;
-       }
-       // URI Init
+       if ($asap && $is_spam) return $progress;
+
+       // URI: Pickup
        $pickups = spam_uri_pickup($target, $method);
-       if (empty($pickups)) {
-               return $progress;
-       }
+       //$remains['uri_pickup'] = & $pickups;
+
+       // Return if ...
+       if (empty($pickups)) return $progress;
 
        // URI: Check quantity
        $sum['quantity'] += count($pickups);
@@ -930,14 +934,13 @@ function check_uri_spam($target = '', $method = array())
        }
 
        // Return if ...
-       if ($asap && $is_spam) {
-               return $progress;
-       }
+       if ($asap && $is_spam) return $progress;
 
        // Host: Uniqueness (uniq / non-uniq)
        $hosts = array();
        foreach ($pickups as $pickup) $hosts[] = & $pickup['host'];
        $hosts = array_unique($hosts);
+       //$remains['uniqhost'] = & $hosts;
        $sum['uniqhost'] += count($hosts);
        if ((! $asap || ! $is_spam) && isset($method['non_uniqhost'])) {
                $sum['non_uniqhost'] = $sum['quantity'] - $sum['uniqhost'];
@@ -947,9 +950,7 @@ function check_uri_spam($target = '', $method = array())
        }
 
        // Return if ...
-       if ($asap && $is_spam) {
-               return $progress;
-       }
+       if ($asap && $is_spam) return $progress;
 
        // URI: Bad host
        if ((! $asap || ! $is_spam) && isset($method['badhost'])) {
@@ -959,9 +960,9 @@ function check_uri_spam($target = '', $method = array())
                } else {
                        $badhost = is_badhost($hosts, $asap, $__remains);
                        if ($__remains) {
-                               $progress['remains']['badhost'] = array();
+                               $remains['badhost'] = array();
                                foreach ($__remains as $value) {
-                                       $progress['remains']['badhost'][$value] = TRUE;
+                                       $remains['badhost'][$value] = TRUE;
                                }
                        }
                }

diff --git a/spam/spam_pickup.php b/spam/spam_pickup.php
index c7ddda3..192d0d9 100644 (file)
--- a/spam/spam_pickup.php
+++ b/spam/spam_pickup.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam_pickup.php,v 1.39 2007/02/17 13:43:59 henoheno Exp $
+// $Id: spam_pickup.php,v 1.40 2007/02/19 12:54:25 henoheno Exp $
 // Concept-work of spam-uri metrics
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
@@ -110,7 +110,12 @@ $method = & $spam['method']['_default'];
 
 if ($asap) $method['asap'] = TRUE;
 
-$progress = check_uri_spam(array('a', $msg, 'b'), $method);
+$progress = check_uri_spam(
+       array(
+               'a http://foobaA.example.com',
+               $msg,
+               'b http://foobarB.example.com'
+       ), $method);
 
 if (! empty($progress)) {
 

diff --git a/spam_pickup.php b/spam_pickup.php
index c7ddda3..192d0d9 100644 (file)
--- a/spam_pickup.php
+++ b/spam_pickup.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam_pickup.php,v 1.39 2007/02/17 13:43:59 henoheno Exp $
+// $Id: spam_pickup.php,v 1.40 2007/02/19 12:54:25 henoheno Exp $
 // Concept-work of spam-uri metrics
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
@@ -110,7 +110,12 @@ $method = & $spam['method']['_default'];
 
 if ($asap) $method['asap'] = TRUE;
 
-$progress = check_uri_spam(array('a', $msg, 'b'), $method);
+$progress = check_uri_spam(
+       array(
+               'a http://foobaA.example.com',
+               $msg,
+               'b http://foobarB.example.com'
+       ), $method);
 
 if (! empty($progress)) {