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

remove code duplication

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7891 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-07-15 21:20:03 +00:00
parent 909e195a9b
commit f613f72153
1 changed files with 10 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1057,15 +1057,20 @@ function utf8_case_fold($text, $option = 'full')
$uniarray['s'] = include($phpbb_root_path . 'includes/utf/data/case_fold_s.' . $phpEx); $uniarray['s'] = include($phpbb_root_path . 'includes/utf/data/case_fold_s.' . $phpEx);
} }
// common is always replaced
$text = strtr($text, $uniarray['c']); $text = strtr($text, $uniarray['c']);
if ($option === 'full') if ($option === 'full')
{ {
// full replaces a character with multiple characters
$text = strtr($text, $uniarray['f']); $text = strtr($text, $uniarray['f']);
} }
else else
{ {
// simple replaces a character with another character
$text = strtr($text, $uniarray['s']); $text = strtr($text, $uniarray['s']);
} }
return $text; return $text;
} }
@ -1079,7 +1084,6 @@ function utf8_case_fold($text, $option = 'full')
*/ */
function utf8_case_fold_nfkc($text, $option = 'full') function utf8_case_fold_nfkc($text, $option = 'full')
{ {
static $uniarray = array();
static $fc_nfkc_closure = array( static $fc_nfkc_closure = array(
"\xCD\xBA" => "\x20\xCE\xB9", "\xCD\xBA" => "\x20\xCE\xB9",
"\xCF\x92" => "\xCF\x85", "\xCF\x92" => "\xCF\x85",
@ -1649,34 +1653,10 @@ function utf8_case_fold_nfkc($text, $option = 'full')
); );
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
// common is always set // do the case fold
if (!isset($uniarray['c'])) $text = utf8_case_fold($text, $option);
{
$uniarray['c'] = include($phpbb_root_path . 'includes/utf/data/case_fold_c.' . $phpEx);
}
// only set full if we need to
if ($option === 'full' && !isset($uniarray['f']))
{
$uniarray['f'] = include($phpbb_root_path . 'includes/utf/data/case_fold_f.' . $phpEx);
}
// only set simple if we need to
if ($option !== 'full' && !isset($uniarray['s']))
{
$uniarray['s'] = include($phpbb_root_path . 'includes/utf/data/case_fold_s.' . $phpEx);
}
$text = strtr($text, $uniarray['c']);
if ($option === 'full')
{
$text = strtr($text, $uniarray['f']);
}
else
{
$text = strtr($text, $uniarray['s']);
}
// convert to NFKC
utf_normalizer::nfkc($text); utf_normalizer::nfkc($text);
// FC_NFKC_Closure, http://www.unicode.org/Public/5.0.0/ucd/DerivedNormalizationProps.txt // FC_NFKC_Closure, http://www.unicode.org/Public/5.0.0/ucd/DerivedNormalizationProps.txt
@ -1764,36 +1744,11 @@ function utf8_case_fold_nfc($text, $option = 'full')
); );
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
// common is always set
if (!isset($uniarray['c']))
{
$uniarray['c'] = include($phpbb_root_path . 'includes/utf/data/case_fold_c.' . $phpEx);
}
// only set full if we need to
if ($option === 'full' && !isset($uniarray['f']))
{
$uniarray['f'] = include($phpbb_root_path . 'includes/utf/data/case_fold_f.' . $phpEx);
}
// only set simple if we need to
if ($option !== 'full' && !isset($uniarray['s']))
{
$uniarray['s'] = include($phpbb_root_path . 'includes/utf/data/case_fold_s.' . $phpEx);
}
// perform a small trick, avoid further normalization on composed points that contain U+0345 in their decomposition // perform a small trick, avoid further normalization on composed points that contain U+0345 in their decomposition
$text = strtr($text, $ypogegrammeni); $text = strtr($text, $ypogegrammeni);
$text = strtr($text, $uniarray['c']); // do the case fold
if ($option === 'full') $text = utf8_case_fold($text, $option);
{
$text = strtr($text, $uniarray['f']);
}
else
{
$text = strtr($text, $uniarray['s']);
}
return $text; return $text;
} }