makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16151] Enable Emojis and rich text in forum name

Browse source 
Move to a new function()

PHPBB3-16151
This commit is contained in:
3D-I 2019-10-28 02:34:59 +01:00
parent 6600fc6cad
commit 2cdc2e751e
2 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/includes/acp/acp_forums.php
View file

@ -987,24 +987,14 @@ class acp_forums
} }
/** /**
* Replace Emojis and other 4bit UTF-8 chars not allowed by MySql to NCR. * Replace Emojis and other 4bit UTF-8 chars not allowed by MySql to UCR / NCR.
* Using their Numeric Character Reference's Hexadecimal notation. * Using their Numeric Character Reference's Hexadecimal notation.
* Doesn't interfere with Japanese or Cyrillic etc.
*
* @see https://www.w3.org/TR/xml11/
* @see https://www.opentag.com/xfaq_charrep.htm
*/ */
if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $forum_data_ary['forum_name'], $matches)) $forum_data_ary['forum_name'] = utf8_encode_ucr($forum_data_ary['forum_name']);
{
foreach ($matches as $key => $emoji)
{
$forum_data_ary['forum_name'] = str_replace($emoji, utf8_encode_ncr($emoji), $forum_data_ary['forum_name']);
}
}
/** /**
* This should never happen again. * This should never happen again.
* Leaving the fallback hre just in case there will be the need of it. * Leaving the fallback here just in case there will be the need of it.
*/ */
if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $forum_data_ary['forum_name'], $matches)) if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $forum_data_ary['forum_name'], $matches))
{ {

43
phpBB/includes/utf/utf_tools.php
View file

@ -418,24 +418,43 @@ function utf8_recode($string, $encoding)
} }
/** /**
* Replace all UTF-8 chars that are not in ASCII with their NCR * Replace some special UTF-8 chars that are not in ASCII with their UCR.
* * using their Numeric Character Reference's Hexadecimal notation.
* @param string $text UTF-8 string in NFC *
* @return string ASCII string using NCRs for non-ASCII chars * Doesn't interfere with Japanese or Cyrillic etc.
*/ * Unicode character visualization will depend on the character support
* of your web browser and the fonts installed on your system.
*
* @see https://en.wikibooks.org/wiki/Unicode/Character_reference/1F000-1FFFF
*
* @param string $text UTF-8 string in NFC
* @return string ASCII string using NCR for non-ASCII chars
*/
function utf8_encode_ucr($text)
{
return preg_replace_callback('/[\\xF0-\\xF4].../', 'utf8_encode_ncr_callback', $text);
}
/**
* Replace all UTF-8 chars that are not in ASCII with their NCR
* using their Numeric Character Reference's Hexadecimal notation.
*
* @param string $text UTF-8 string in NFC
* @return string ASCII string using NCRs for non-ASCII chars
*/
function utf8_encode_ncr($text) function utf8_encode_ncr($text)
{ {
return preg_replace_callback('#[\\xC2-\\xF4][\\x80-\\xBF]{1,3}#', 'utf8_encode_ncr_callback', $text); return preg_replace_callback('#[\\xC2-\\xF4][\\x80-\\xBF]{1,3}#', 'utf8_encode_ncr_callback', $text);
} }
/** /**
* Callback used in encode_ncr() * Callback used in utf8_encode_ncr() and utf8_encode_ucr()
* *
* Takes a UTF-8 char and replaces it with its NCR. Attention, $m is an array * Takes a UTF-8 char and replaces it with its NCR. Attention, $m is an array
* *
* @param array $m 0-based numerically indexed array passed by preg_replace_callback() * @param array $m 0-based numerically indexed array passed by preg_replace_callback()
* @return string A HTML NCR if the character is valid, or the original string otherwise * @return string A HTML NCR if the character is valid, or the original string otherwise
*/ */
function utf8_encode_ncr_callback($m) function utf8_encode_ncr_callback($m)
{ {
return '&#' . utf8_ord($m[0]) . ';'; return '&#' . utf8_ord($m[0]) . ';';