From 9a25e4ad8956f46fa41a6057a8af53f2955fb532 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Tue, 4 Jan 2011 11:54:10 +0700
Subject: [ticket/9933] Wrong handling consecutive multiple asterisks in word
 censor

Fix consecutive asterisks issue in word censor.

PHPBB3-9933
---
 phpBB/includes/cache.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/cache.php')

diff --git a/phpBB/includes/cache.php b/phpBB/includes/cache.php
index b50fab4ca2..9b90483b50 100644
--- a/phpBB/includes/cache.php
+++ b/phpBB/includes/cache.php
@@ -90,9 +90,9 @@ class cache extends acm
 				{
 					// Unescape the asterisk to simplify further conversions
 					$row['word'] = str_replace('\*', '*', preg_quote($row['word'], '#'));
-					
+
 					// Replace the asterisk inside the pattern, at the start and at the end of it with regexes
-					$row['word'] = preg_replace(array('#(?<=[\p{Nd}\p{L}_])\*(?=[\p{Nd}\p{L}_])#iu', '#^\*#', '#\*$#'), array('([\x20]*?|[\p{Nd}\p{L}_-]*?)', '[\p{Nd}\p{L}_-]*?', '[\p{Nd}\p{L}_-]*?'), $row['word']);
+					$row['word'] = preg_replace(array('#(?<=[\p{Nd}\p{L}_])\*+(?=[\p{Nd}\p{L}_])#iu', '#^\*+#', '#\*+$#'), array('([\x20]*?|[\p{Nd}\p{L}_-]*?)', '[\p{Nd}\p{L}_-]*?', '[\p{Nd}\p{L}_-]*?'), $row['word']);
 
 					// Generate the final substitution
 					$censors['match'][] = '#(?<![\p{Nd}\p{L}_-])(' . $row['word'] . ')(?![\p{Nd}\p{L}_-])#iu';
-- 
cgit v1.2.1


From 951b7b22e002571f1c304fcd63049aae77551a7b Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Wed, 5 Jan 2011 21:13:33 +0700
Subject: [ticket/9933] Move word censor regex into separate function in
 functions.php

PHPBB3-9933
---
 phpBB/includes/cache.php | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'phpBB/includes/cache.php')

diff --git a/phpBB/includes/cache.php b/phpBB/includes/cache.php
index 9b90483b50..612adcca4f 100644
--- a/phpBB/includes/cache.php
+++ b/phpBB/includes/cache.php
@@ -82,26 +82,9 @@ class cache extends acm
 			$result = $db->sql_query($sql);
 
 			$censors = array();
-			$unicode = ((version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>='))) && @preg_match('/\p{L}/u', 'a') !== false) ? true : false;
-
 			while ($row = $db->sql_fetchrow($result))
 			{
-				if ($unicode)
-				{
-					// Unescape the asterisk to simplify further conversions
-					$row['word'] = str_replace('\*', '*', preg_quote($row['word'], '#'));
-
-					// Replace the asterisk inside the pattern, at the start and at the end of it with regexes
-					$row['word'] = preg_replace(array('#(?<=[\p{Nd}\p{L}_])\*+(?=[\p{Nd}\p{L}_])#iu', '#^\*+#', '#\*+$#'), array('([\x20]*?|[\p{Nd}\p{L}_-]*?)', '[\p{Nd}\p{L}_-]*?', '[\p{Nd}\p{L}_-]*?'), $row['word']);
-
-					// Generate the final substitution
-					$censors['match'][] = '#(?<![\p{Nd}\p{L}_-])(' . $row['word'] . ')(?![\p{Nd}\p{L}_-])#iu';
-				}
-				else
-				{
-					$censors['match'][] = '#(?<!\S)(' . str_replace('\*', '\S*?', preg_quote($row['word'], '#')) . ')(?!\S)#iu';
-				}
-
+				$censors['match'][] = get_censor_preg_expression($row['word']);
 				$censors['replace'][] = $row['replacement'];
 			}
 			$db->sql_freeresult($result);
-- 
cgit v1.2.1