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

diff --git a/spam/checker.php b/spam/checker.php
index a7ad720..eb139ff 100644
--- a/spam/checker.php
+++ b/spam/checker.php
@@ -1,15 +1,16 @@
 <?php
-// $Id: checker.php,v 1.7 2009/01/04 05:01:34 henoheno 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');
 
 // 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)) {
@@ -25,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' : '';
@@ -135,20 +136,20 @@ 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>';
 	}
 }
@@ -159,7 +160,7 @@ if ($pickup) {
  	$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>';
 }
 ?>