X-Git-Url: http://git.osdn.net/view?p=pukiwiki%2Fpukiwiki_sandbox.git;a=blobdiff_plain;f=spam%2Fchecker.php;h=eb139ff8508c6979b402ae81fa5bdc1e84fee680;hp=1cc534e052fca405e4bd15d1ae9031132745764d;hb=6ce06a0f0de067ad24ec7b01781ce8f15cede441;hpb=5bd340d2e0de82560373b3780a7ad76752a7a84a

diff --git a/spam/checker.php b/spam/checker.php
index 1cc534e..eb139ff 100644
--- a/spam/checker.php
+++ b/spam/checker.php
@@ -1,16 +1,16 @@
 <?php
-// $Id: checker.php,v 1.3 2007/12/26 17:30:57 teanan Exp $
+// $Id: checker.php,v 1.9 2011/01/25 13:16:35 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
 
 error_reporting(E_ALL); // Debug purpose
 
+if (! defined('CONTENT_CHARSET')) define('CONTENT_CHARSET', 'ISO-8859-1');
 require('spam.php');
-require('spam_pickup.php');
 
 // Recursive array_map()
-// e.g. Sanitilze ALL values (Debug purpose): var_dump(recursive_map('htmlspecialchars', $array));
+// e.g. Sanitilze ALL values (Debug purpose): var_dump(recursive_map('htmlsc', $array));
 function recursive_map($func, $array)
 {
 	if (is_array($array)) {
@@ -26,7 +26,7 @@ function recursive_map($func, $array)
 
 function show_form($string, $asap = FALSE, $progress = TRUE, $pickup = TRUE)
 {
-	$string   = htmlspecialchars($string);
+	$string   = htmlsc($string);
 	$asap     = $asap     ? ' checked' : '';
 	$progress = $progress ? ' checked' : '';
 	$pickup   = $pickup   ? ' checked' : '';
@@ -89,14 +89,15 @@ echo '<br/>';
 	// 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,
+		'_comment'       => 'edit',
+		'quantity'       => 150 * 1.5,
+		'non_uniq'       =>   5 * 1.5,
+		//'non_uniquri'  =>   5 * 1.5,
+		//'non_uniqhost' =>  50 * 1.5,
+		'area_anchor'    =>   3 * 1.5,
+		'area_bbcode'    =>   1 * 1.5,
+		'uniqhost'       => TRUE,
+		'badhost'        => TRUE,
 		//'asap'         => TRUE,
 	);
 	
@@ -135,29 +136,31 @@ if (! empty($progress)) {
 		$tmp = summarize_detail_badhost($progress);
 		if ($tmp != '') {
 			echo 'DETAIL_BADHOST: ' . 
-				str_replace('  ', '&nbsp; ', nl2br(htmlspecialchars($tmp). "\n"));
+				str_replace('  ', '&nbsp; ', nl2br(htmlsc($tmp). "\n"));
 		}
 	}
 
 	$tmp = summarize_detail_newtral($progress);
 	if (! $asap && $tmp != '') {
 		echo 'DETAIL_NEUTRAL_HOST: ' . 
-				str_replace('  ', '&nbsp; ', nl2br(htmlspecialchars($tmp). "\n"));
+				str_replace('  ', '&nbsp; ', nl2br(htmlsc($tmp). "\n"));
 	}
 	
 	if ($prog) {
 		echo '<pre>';
 		echo '$progress:' . "\n";
-		echo htmlspecialchars(var_export($progress, TRUE));
+		echo htmlsc(var_export($progress, TRUE));
 		echo '</pre>';
 	}
 }
 
 if ($pickup) {
 	echo '<pre>';
-	$results = uri_pickup_normalize(spam_uri_pickup($msg));
+ 	$results = spam_uri_pickup($msg);
+ 	$results = uri_pickup_normalize($results);
+ 	$results = uri_pickup_normalize_pathfile($results);
 	echo '$results:' . "\n";
-	echo htmlspecialchars(var_export($results, TRUE));
+	echo htmlsc(var_export($results, TRUE));
 	echo '</pre>';
 }
 ?>