Simplify metrics if $asap

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

diff --git a/spam/spam_pickup.php b/spam/spam_pickup.php
index b96d3e5..13c332d 100644 (file)
--- a/spam/spam_pickup.php
+++ b/spam/spam_pickup.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam_pickup.php,v 1.10 2006/11/03 07:47:57 henoheno Exp $
+// $Id: spam_pickup.php,v 1.33 2007/01/03 14:02:35 henoheno Exp $
 // Concept-work of spam-uri metrics
 // Copyright (C) 2006 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
@@ -23,27 +23,27 @@ function recursive_map($func, $array)
        return $array;
 }
 
-// $array[0] => $array['name']
-function array_rename_key(& $array, $from, $to, $force = FALSE, $default = '')
+function show_form($string, $asap, $pickup)
 {
-       if (isset($array[$from])) {
-               $array[$to] = & $array[$from];
-               unset($array[$from]);
-       } else if ($force) {
-               $array[$to] = $default;
+       if ($asap) {
+               $asap = ' checked';
        } else {
-               return FALSE;
+               $asap = '';
+       }
+       if ($pickup) {
+               $pickup = ' checked';
+       } else {
+               $pickup = '';
        }
-       return TRUE;
-}
-
-function show_form($string)
-{
        $base = basename(__FILE__);
        $string = htmlspecialchars($string);
        print <<< EOF
 <form action="$base" method="post">
        <textarea name="msg" rows="8" cols="80">$string</textarea><br />
+       <input type="checkbox" name="asap"   id="asap"   value="on"$asap>
+       <label for="asap">asap</label><br />
+       <input type="checkbox" name="pickup" id="pickup" value="on"$pickup>
+       <label for="pickup">Show pickuped URIs</label><br />
        <input type="submit" name="write" value="Submit" />
 </form>
 <br/>
@@ -53,28 +53,50 @@ EOF;
 
 // ---- Show form and result
 echo basename(__FILE__) . '<br />';
-$msg = isset($_POST['msg']) ? $_POST['msg'] : '';
-show_form($msg);
+$msg    = isset($_POST['msg'])    ? $_POST['msg'] : '';
+$asap   = isset($_POST['asap'])   ? TRUE : FALSE;
+$pickup = isset($_POST['pickup']) ? TRUE : FALSE;
+show_form($msg, $asap, $pickup);
 echo '<pre>';
 
-$results = spam_pickup($msg);
-
-// Measure
-$count = count($results);
-$area = 0;
-foreach($results as $result)
-       if (isset($result['area']))
-               $area += $result['area'];
-$average = $count ? ($area / $count) : 'NULL';
+$method = check_uri_spam_method();
+if ($asap) $method['asap'] = TRUE;
 
-echo "TOTAL = $count URIs, AREA_TOTAL = $area, AREA_AVERAGE = " . $average . "</br >" . "</br >";
-var_dump('is_uri_spam($msg)', is_uri_spam($msg));
+$progress = check_uri_spam(array('a', $msg, 'b'), $method);
 
-//$notify = TRUE;
-//var_dump('pkwk_spamfilter($msg)', pkwk_spamfilter('A', 'PAGE', array('msg' => $msg)));
-//echo "\n";
+if (! empty($progress)) {
+       $action = 'METRICS: ' . summarize_spam_progress($progress, $asap);
+       var_dump($action);
+       if (! empty($progress['is_spam'])) {
+               $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']);
+               }
+       }
+       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']))
+                               ) .
+                       ')'
+               );
+       }
+       var_dump($progress);
+}
 
-var_dump('$results', $results);
+if ($pickup) {
+       $results = spam_uri_pickup($msg);
+       $results = uri_array_normalize($results, TRUE);
+       var_dump('$results', $results);
+}
 echo '</pre>';
 
 ?>