Reporting DETAIL_NEUTRAL_HOST (not good and not bad)

diff --git a/spam.php b/spam.php
index 0c2cec5..b83c5ea 100644 (file)
--- a/spam.php
+++ b/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.96 2007/01/03 10:05:19 henoheno Exp $
+// $Id: spam.php,v 1.97 2007/01/03 10:14:26 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 
@@ -1077,6 +1077,13 @@ function pkwk_spamnotify($action, $page, $target = array('title' => ''), $progre
                }
                $summary['DETAIL_BADHOST'] = implode(', ', $badhost);
        }
+       if (! $asap && $progress['remains']['badhost']) {
+               $summary['DETAIL_NEUTRAL_HOST'] = 
+                       preg_replace(
+                               '/[^, a-z0-9.-]/i', '',
+                               implode(', ', array_keys($progress['remains']['badhost']))
+                       );
+       }
        $summary['COMMENT'] = $action;
        $summary['PAGE']    = '[blocked] ' . (is_pagename($page) ? $page : '');
        $summary['URI']     = get_script_uri() . '?' . rawurlencode($page);

diff --git a/spam/spam.php b/spam/spam.php
index 0c2cec5..b83c5ea 100644 (file)
--- a/spam/spam.php
+++ b/spam/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.96 2007/01/03 10:05:19 henoheno Exp $
+// $Id: spam.php,v 1.97 2007/01/03 10:14:26 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 
@@ -1077,6 +1077,13 @@ function pkwk_spamnotify($action, $page, $target = array('title' => ''), $progre
                }
                $summary['DETAIL_BADHOST'] = implode(', ', $badhost);
        }
+       if (! $asap && $progress['remains']['badhost']) {
+               $summary['DETAIL_NEUTRAL_HOST'] = 
+                       preg_replace(
+                               '/[^, a-z0-9.-]/i', '',
+                               implode(', ', array_keys($progress['remains']['badhost']))
+                       );
+       }
        $summary['COMMENT'] = $action;
        $summary['PAGE']    = '[blocked] ' . (is_pagename($page) ? $page : '');
        $summary['URI']     = get_script_uri() . '?' . rawurlencode($page);

diff --git a/spam/spam_pickup.php b/spam/spam_pickup.php
index 5703d82..7c33179 100644 (file)
--- a/spam/spam_pickup.php
+++ b/spam/spam_pickup.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam_pickup.php,v 1.28 2007/01/03 06:54:22 henoheno Exp $
+// $Id: spam_pickup.php,v 1.29 2007/01/03 10:14:26 henoheno Exp $
 // Concept-work of spam-uri metrics
 // Copyright (C) 2006 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
@@ -61,6 +61,13 @@ if (! empty($progress)) {
                        //var_dump($progress['is_spam']['badhost']);
                }
        }
+       if (isset($progress['remains']['badhost'])) {
+               var_dump('DETAIL_NEUTRAL_HOST: ' .
+                       preg_replace(
+                               '/[^, a-z0-9.-]/i', '',
+                               implode(', ', array_keys($progress['remains']['badhost'])))
+                       );
+       }
        var_dump($progress);
 }
 

diff --git a/spam_pickup.php b/spam_pickup.php
index 5703d82..7c33179 100644 (file)
--- a/spam_pickup.php
+++ b/spam_pickup.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam_pickup.php,v 1.28 2007/01/03 06:54:22 henoheno Exp $
+// $Id: spam_pickup.php,v 1.29 2007/01/03 10:14:26 henoheno Exp $
 // Concept-work of spam-uri metrics
 // Copyright (C) 2006 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
@@ -61,6 +61,13 @@ if (! empty($progress)) {
                        //var_dump($progress['is_spam']['badhost']);
                }
        }
+       if (isset($progress['remains']['badhost'])) {
+               var_dump('DETAIL_NEUTRAL_HOST: ' .
+                       preg_replace(
+                               '/[^, a-z0-9.-]/i', '',
+                               implode(', ', array_keys($progress['remains']['badhost'])))
+                       );
+       }
        var_dump($progress);
 }