From 9b03a9b54499eef80458f77ea3465599624a97fe Mon Sep 17 00:00:00 2001
From: henoheno <henoheno>
Date: Mon, 24 Jan 2011 23:46:45 +0900
Subject: [PATCH 1/1] htmlsc(): Just sugar for htmlspecialchars(), and a
 foundation

---
 spam/checker.php   | 14 +++++++-------
 spam/spam.php      |  4 ++--
 spam/spam_util.php | 14 +++++++++++++-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/spam/checker.php b/spam/checker.php
index a7ad720..450276c 100644
--- a/spam/checker.php
+++ b/spam/checker.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: checker.php,v 1.7 2009/01/04 05:01:34 henoheno Exp $
+// $Id: checker.php,v 1.8 2011/01/24 14:46:45 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
@@ -9,7 +9,7 @@ error_reporting(E_ALL); // Debug purpose
 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 +25,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 +135,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 +159,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>';
 }
 ?>
diff --git a/spam/spam.php b/spam/spam.php
index ac41338..264c03c 100644
--- a/spam/spam.php
+++ b/spam/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.219 2009/01/04 08:56:07 henoheno Exp $
+// $Id: spam.php,v 1.220 2011/01/24 14:46:45 henoheno Exp $
 // Copyright (C) 2006-2009 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -664,7 +664,7 @@ function spam_exit($mode = '', $data = array())
 			break;
 		case 'dump':
 			echo('<pre>' . "\n");
-			echo htmlspecialchars(var_export($data, TRUE));
+			echo htmlsc(var_export($data, TRUE));
 			echo('</pre>' . "\n");
 			break;
 	};
diff --git a/spam/spam_util.php b/spam/spam_util.php
index 85bb18f..083f4cf 100644
--- a/spam/spam_util.php
+++ b/spam/spam_util.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam_util.php,v 1.2 2009/01/04 08:56:07 henoheno Exp $
+// $Id: spam_util.php,v 1.3 2011/01/24 14:46:45 henoheno Exp $
 // Copyright (C) 2006-2009 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -38,6 +38,18 @@ function preg_grep_invert($pattern = '//', $input = array())
 // ---------------------
 // Utilities
 
+
+if (! function_exists('htmlsc')) {
+	// Interface with PukiWiki
+	if (! defined('CONTENT_CHARSET')) define('CONTENT_CHARSET', 'ISO-8859-1');
+
+	// Sugar with default settings
+	function htmlsc($string = '', $flags = ENT_QUOTES, $charset = CONTENT_CHARSET)
+	{
+		return htmlspecialchars($string, $flags, $charset);     // htmlsc()
+	}
+}
+
 // Very roughly, shrink the lines of var_export()
 // NOTE: If the same data exists, it must be corrupted.
 function var_export_shrink($expression, $return = FALSE, $ignore_numeric_keys = FALSE)
-- 
2.11.0