.bh, .sc

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

diff --git a/spam/spam_pickup.php b/spam/spam_pickup.php
index 192d0d9..8905f9e 100644 (file)
--- a/spam/spam_pickup.php
+++ b/spam/spam_pickup.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam_pickup.php,v 1.40 2007/02/19 12:54:25 henoheno Exp $
+// $Id: spam_pickup.php,v 1.49 2007/05/12 09:19:49 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
@@ -64,8 +64,6 @@ $pickup = isset($_POST['pickup'])   ? TRUE : FALSE;
 echo show_form($msg, $asap, $prog, $pickup);
 echo '<br/>';
 
-echo '<pre>';
-
 
 // -----------------------------------------------------
        $spam = array();
@@ -121,44 +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 {
-               var_dump('ACTION: Blocked by ' . summarize_spam_progress($progress, TRUE));
+               echo 'ACTION: Blocked by ' . summarize_spam_progress($progress, TRUE);
+               echo '<br />';
 
-               if (! $asap) var_dump('METRICS: ' . summarize_spam_progress($progress));
+               if (! $asap) {
+                       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 . ')';
-                       }
-                       var_dump('DETAIL_BADHOST: ' . implode(', ', $badhost));
-                       //var_dump($progress['is_spam']['badhost']);
+
+               $tmp = summarize_detail_badhost($progress);
+               if ($tmp != '') {
+                       echo 'DETAIL_BADHOST: ' . 
+                               str_replace('  ', '&nbsp; ', nl2br(htmlspecialchars($tmp). "\n"));
                }
        }
 
-       if (isset($progress['remains']['badhost'])) {
-               $count = count($progress['remains']['badhost']);
-               var_dump('DETAIL_NEUTRAL_HOST: ' . $count .
-                       ' (' .
-                               preg_replace(
-                                       '/[^, a-z0-9.-]/i', '',
-                                       implode(', ', array_keys($progress['remains']['badhost']))
-                               ) .
-                       ')'
-               );
+       $tmp = summarize_detail_newtral($progress);
+       if (! $asap && $tmp != '') {
+               echo 'DETAIL_NEUTRAL_HOST: ' . 
+                               str_replace('  ', '&nbsp; ', nl2br(htmlspecialchars($tmp). "\n"));
        }
        
-       if ($prog) var_dump($progress);
+       if ($prog) {
+               echo '<pre>';
+               echo '$progress:' . "\n";
+               echo htmlspecialchars(var_export($progress, TRUE));
+               echo '</pre>';
+       }
 }
 
 if ($pickup) {
-       $results = spam_uri_pickup($msg);
-       $results = uri_array_normalize($results, TRUE);
-       var_dump('$results', $results);
+       echo '<pre>';
+       $results = uri_pickup_normalize(spam_uri_pickup($msg));
+       echo '$results:' . "\n";
+       echo htmlspecialchars(var_export($results, TRUE));
+       echo '</pre>';
 }
-
-echo '</pre>';
-
 ?>