Simplify: Removed $progress['remains']. Added ['blocked'] and ['hosts']. (to be conti...

[pukiwiki/pukiwiki_sandbox.git] / spam / spam_pickup.php

diff --git a/spam/spam_pickup.php b/spam/spam_pickup.php
index 519db83..88c93bf 100644 (file)
--- a/spam/spam_pickup.php
+++ b/spam/spam_pickup.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam_pickup.php,v 1.41 2007/02/25 00:35:41 henoheno Exp $
+// $Id: spam_pickup.php,v 1.46 2007/05/04 13:43:59 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
@@ -119,56 +119,44 @@ if (! empty($progress)) {
 
 
        if (empty($progress['is_spam'])) {
-               var_dump('ACTION: Seems not a spam');
+               echo 'ACTION: Seems not a spam';
+               echo '<br />';
        } else {
                echo 'ACTION: Blocked by ' . summarize_spam_progress($progress, TRUE);
                echo '<br />';
 
                if (! $asap) {
-                       echo 'METRICS: ' . summarize_spam_progress($progress);
-                       echo '<br />';
+                       echo 'METRICS: ' . summarize_spam_progress($progress) . '<br />' . "\n";
                }
 
                $action = 'Blocked by: ' . summarize_spam_progress($progress, TRUE);
-               if (isset($progress['is_spam']['badhost'])) {
-                       $badhost = array();
-                       foreach($progress['is_spam']['badhost'] as $glob=>$number) {
-                               $badhost[] = $glob . '(' . $number . ')';
-                       }
-                       echo 'DETAIL_BADHOST: ' . htmlspecialchars(implode(', ', $badhost));
-                       echo '<br />';
+
+               $tmp = summarize_detail_badhost($progress);
+               if ($tmp != '') {
+                       echo 'DETAIL_BADHOST: ' . 
+                               str_replace('  ', '&nbsp; ', nl2br("\n" . htmlspecialchars($tmp). "\n"));
                }
        }
 
-       if (isset($progress['remains']['badhost'])) {
-               $count = count($progress['remains']['badhost']);
-               echo 'DETAIL_NEUTRAL_HOST: ' . $count .
-                       ' (' .
-                               htmlspecialchars(
-                                       preg_replace(
-                                               '/[^, a-z0-9.-]/i',
-                                               '',
-                                               implode(', ', array_keys($progress['remains']['badhost']))
-                                       )
-                               ) .
-                       ')';
-               echo '<br />';
+       $tmp = summarize_detail_newtral($progress);
+       if (! $asap && $tmp != '') {
+               echo 'DETAIL_NEUTRAL_HOST: ' .
+                               str_replace('  ', '&nbsp; ', nl2br("\n" . htmlspecialchars($tmp). "\n"));
        }
        
        if ($prog) {
                echo '<pre>';
-               htmlspecialchars(var_dump($progress));
+               echo '$progress:' . "\n";
+               echo htmlspecialchars(var_export($progress, TRUE));
                echo '</pre>';
        }
 }
 
 if ($pickup) {
        echo '<pre>';
-       $results = spam_uri_pickup($msg);
-       $results = uri_array_normalize($results, TRUE);
-       htmlspecialchars(var_dump('$results', $results));
+       $results = uri_pickup_normalize(spam_uri_pickup($msg));
+       echo '$results:' . "\n";
+       echo htmlspecialchars(var_export($results, TRUE));
        echo '</pre>';
 }
-
-
 ?>