From: henoheno <henoheno>
Date: Wed, 3 Jan 2007 13:31:20 +0000 (+0900)
Subject: DETAIL_NEUTRAL_HOST shows the number of hosts
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0cd0405b1ec0fa11e0a6370464cb65d36c5c8ba9;p=pukiwiki%2Fpukiwiki_sandbox.git

DETAIL_NEUTRAL_HOST shows the number of hosts
---

diff --git a/spam.php b/spam.php
index 47bf2dc..a2c5a96 100644
--- a/spam.php
+++ b/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.98 2007/01/03 10:54:55 henoheno Exp $
+// $Id: spam.php,v 1.99 2007/01/03 13:31:20 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 
@@ -1079,11 +1079,14 @@ 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']))
-			);
+		$count = count($progress['remains']['badhost']);
+		$summary['DETAIL_NEUTRAL_HOST'] = $count .
+			' (' .
+				preg_replace(
+					'/[^, a-z0-9.-]/i', '',
+					implode(', ', array_keys($progress['remains']['badhost']))
+				) .
+			')';
 	}
 	$summary['COMMENT'] = $action;
 	$summary['PAGE']    = '[blocked] ' . (is_pagename($page) ? $page : '');
diff --git a/spam/spam.php b/spam/spam.php
index 47bf2dc..a2c5a96 100644
--- a/spam/spam.php
+++ b/spam/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.98 2007/01/03 10:54:55 henoheno Exp $
+// $Id: spam.php,v 1.99 2007/01/03 13:31:20 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 
@@ -1079,11 +1079,14 @@ 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']))
-			);
+		$count = count($progress['remains']['badhost']);
+		$summary['DETAIL_NEUTRAL_HOST'] = $count .
+			' (' .
+				preg_replace(
+					'/[^, a-z0-9.-]/i', '',
+					implode(', ', array_keys($progress['remains']['badhost']))
+				) .
+			')';
 	}
 	$summary['COMMENT'] = $action;
 	$summary['PAGE']    = '[blocked] ' . (is_pagename($page) ? $page : '');
diff --git a/spam/spam_pickup.php b/spam/spam_pickup.php
index 8291bf4..badb142 100644
--- 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.31 2007/01/03 13:31:20 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,25 @@ 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="pickup" value="on"$pickup>Show pickuped URIs<br />
 	<input type="submit" name="write" value="Submit" />
 </form>
 <br/>
@@ -45,16 +51,15 @@ 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)) {
@@ -72,11 +77,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);
 }
diff --git a/spam_pickup.php b/spam_pickup.php
index 8291bf4..badb142 100644
--- a/spam_pickup.php
+++ b/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.31 2007/01/03 13:31:20 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,25 @@ 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="pickup" value="on"$pickup>Show pickuped URIs<br />
 	<input type="submit" name="write" value="Submit" />
 </form>
 <br/>
@@ -45,16 +51,15 @@ 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)) {
@@ -72,11 +77,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);
 }