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 8291bf4..13c332d 100644 (file)
--- a/spam/spam_pickup.php
+++ b/spam/spam_pickup.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam_pickup.php,v 1.30 2007/01/03 10:56:12 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,19 +23,27 @@ function recursive_map($func, $array)
        return $array;
 }
 
-function show_form($string, $asap)
+function show_form($string, $asap, $pickup)
 {
        if ($asap) {
                $asap = ' checked';
        } else {
                $asap = '';
        }
+       if ($pickup) {
+               $pickup = ' checked';
+       } else {
+               $pickup = '';
+       }
        $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" value="on"$asap>asap<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/>
@@ -45,20 +53,19 @@ EOF;
 
 // ---- Show form and result
 echo basename(__FILE__) . '<br />';
-$msg  = isset($_POST['msg']) ? $_POST['msg'] : '';
-$asap = isset($_POST['asap']) ? TRUE : FALSE;
-show_form($msg, $asap);
+$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>';
 
-$pickup = TRUE;
 $method = check_uri_spam_method();
-if ($asap) {
-       $method['asap'] = TRUE;
-}
+if ($asap) $method['asap'] = TRUE;
+
 $progress = check_uri_spam(array('a', $msg, 'b'), $method);
 
 if (! empty($progress)) {
-       $action = 'Metrics: ' . summarize_spam_progress($progress, FALSE);
+       $action = 'METRICS: ' . summarize_spam_progress($progress, $asap);
        var_dump($action);
        if (! empty($progress['is_spam'])) {
                $action = 'Blocked by: ' . summarize_spam_progress($progress, TRUE);
@@ -72,11 +79,15 @@ if (! empty($progress)) {
                }
        }
        if (isset($progress['remains']['badhost'])) {
-               var_dump('DETAIL_NEUTRAL_HOST: ' .
-                       preg_replace(
-                               '/[^, a-z0-9.-]/i', '',
-                               implode(', ', array_keys($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);
 }