From daa3288a368ddac0335dde7ee2a718883bfb2fdc Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 3 Nov 2006 11:26:14 +0000
Subject: - implemented the suggested html_entity_decode function made by david
 - fixed string length checking by also decoding entities for the sake of
 checking - used the new html_entity_decode function

git-svn-id: file:///svn/phpbb/trunk@6545 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/utf/utf_tools.php | 45 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/utf/utf_tools.php')

diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php
index 24aeb35d02..fdf68d092e 100644
--- a/phpBB/includes/utf/utf_tools.php
+++ b/phpBB/includes/utf/utf_tools.php
@@ -8,7 +8,7 @@
 *
 * @todo make sure the replacements are called correctly
 * already done: strtolower, strtoupper, ucfirst, str_split, strrpos, strlen (hopefully!), strpos, substr
-* remaining:	clean_username, htmlentities (no longer needed for internal data?), htmlspecialchars (using charset), html_entity_decode (own function to reverse htmlspecialchars and not htmlentities)
+* remaining:	clean_username, htmlentities (no longer needed for internal data?), htmlspecialchars (using charset)
 *				strspn, chr, ord
 */
 
@@ -929,6 +929,9 @@ function utf8_case_fold($text, $option = 'full')
 	return $text;
 }
 
+/**
+* @todo needs documenting
+*/
 function utf8_clean_string($text)
 {
 	$text = utf8_case_fold($text);
@@ -964,4 +967,44 @@ function utf8_clean_string($text)
 	return $text;
 }
 
+if (version_compare(phpversion(), '5', '>='))
+{
+	/**
+	* @ignore
+	*/
+	function utf8_html_entity_decode($string, $quote_style = ENT_COMPAT)
+	{
+		return html_entity_decode($string, $quote_style, 'UTF-8');
+	}
+}
+else
+{
+	/**
+	* @todo needs documenting
+	*/
+	function utf8_html_entity_decode($string, $quote_style = ENT_COMPAT)
+	{
+		static $static_table;
+
+		if ($static_table === null)
+		{
+			$static_table = array_map('utf8_encode', array_flip(get_html_translation_table(HTML_ENTITIES)));
+		}
+
+		$modified_table = $static_table;
+
+		if ($quote_style === ENT_QUOTES)
+		{
+			$modified_table['&#039;'] = "'";
+		}
+
+		if ($quote_style === ENT_NOQUOTES)
+		{
+			unset($modified_table['&quot;']);
+		}
+
+		return strtr($string, $modified_table);
+	}
+}
+
 ?>
\ No newline at end of file
-- 
cgit v1.2.1