X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=spam%2Fspam_pickup.php;h=8905f9e65339b4a108c8369b384c1e0b8a7c5f60;hb=0a896e285eeec32120a8d842de899d6be3ef5d57;hp=8291bf4d17e357f7cb6958554a10e815970374eb;hpb=b89dcd7400c3e40472521c99323ef04074524da3;p=pukiwiki%2Fpukiwiki_sandbox.git

diff --git a/spam/spam_pickup.php b/spam/spam_pickup.php
index 8291bf4..8905f9e 100644
--- a/spam/spam_pickup.php
+++ b/spam/spam_pickup.php
@@ -1,7 +1,7 @@
 <?php
-// $Id: spam_pickup.php,v 1.30 2007/01/03 10:56:12 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 PukiWiki Developers Team
+// Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 
 error_reporting(E_ALL); // Debug purpose
@@ -23,69 +23,140 @@ function recursive_map($func, $array)
 	return $array;
 }
 
-function show_form($string, $asap)
+function show_form($string, $asap = FALSE, $progress = TRUE, $pickup = TRUE)
 {
-	if ($asap) {
-		$asap = ' checked';
-	} else {
-		$asap = '';
-	}
-	$base = basename(__FILE__);
-	$string = htmlspecialchars($string);
-	print <<< EOF
+	$string   = htmlspecialchars($string);
+	$asap     = $asap     ? ' checked' : '';
+	$progress = $progress ? ' checked' : '';
+	$pickup   = $pickup   ? ' checked' : '';
+	$base     = basename(__FILE__);
+
+	return <<< 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="progress" id="progress" value="on"$progress>
+	<label for="progress">Show \$progress</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/>
 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);
-echo '<pre>';
-
-$pickup = TRUE;
-$method = check_uri_spam_method();
-if ($asap) {
-	$method['asap'] = TRUE;
-}
-$progress = check_uri_spam(array('a', $msg, 'b'), $method);
+
+$msg    = isset($_POST['msg'])      ? $_POST['msg'] : '';
+$asap   = isset($_POST['asap'])     ? TRUE : FALSE;
+$prog   = isset($_POST['progress']) ? TRUE : FALSE;
+$pickup = isset($_POST['pickup'])   ? TRUE : FALSE;
+
+echo show_form($msg, $asap, $prog, $pickup);
+echo '<br/>';
+
+
+// -----------------------------------------------------
+	$spam = array();
+
+	// Threshold and rules for insertion (default)
+	$spam['method']['_default'] = array(
+		'_comment'     => '_default',
+		'quantity'     =>  8,
+		//'non_uniquri'  =>  3,
+		'non_uniqhost' =>  3,
+		'area_anchor'  =>  0,
+		'area_bbcode'  =>  0,
+		'uniqhost'     => TRUE,
+		'badhost'      => TRUE,
+		//'asap'         => TRUE, // Stop as soon as possible (quick but less-info)
+	);
+	
+	// For editing
+	// NOTE:
+	// Any thresholds may LOCK your contents by
+	// "posting one URL" many times.
+	// Any rules will lock contents that have NG things already.
+	$spam['method']['edit'] = array(
+		// Supposed_by_you(n) * Edit_form_spec(2) * Margin(1.5)
+		'_comment'     => 'edit',
+		//'quantity'     => 60 * 3,
+		//'non_uniquri'  =>  5 * 3,
+		//'non_uniqhost' => 50 * 3,
+		//'area_anchor'  => 30 * 3,
+		//'area_bbcode'  => 15 * 3,
+		'uniqhost'     => TRUE,
+		'badhost'      => TRUE,
+		//'asap'         => TRUE,
+	);
+	
+	
+$method = & $spam['method']['_default'];
+//$method = & $spam['method']['edit'];
+//$method = check_uri_spam_method();
+//var_dump($method);
+// -----------------------------------------------------
+
+if ($asap) $method['asap'] = TRUE;
+
+$progress = check_uri_spam(
+	array(
+		'a http://foobaA.example.com',
+		$msg,
+		'b http://foobarB.example.com'
+	), $method);
 
 if (! empty($progress)) {
-	$action = 'Metrics: ' . summarize_spam_progress($progress, FALSE);
-	var_dump($action);
-	if (! empty($progress['is_spam'])) {
+
+
+	if (empty($progress['is_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) . '<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'])) {
-		var_dump('DETAIL_NEUTRAL_HOST: ' .
-			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) {
+		echo '<pre>';
+		echo '$progress:' . "\n";
+		echo htmlspecialchars(var_export($progress, TRUE));
+		echo '</pre>';
 	}
-	var_dump($progress);
 }
 
 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>';
-
 ?>