diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:36 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:36 +0100 |
| commit | 75e7ffc317af7ad5b7a420a53115caaa66d3a942 (patch) | |
| tree | 643b59585bc706acf1c0260dd262f26e52de06c0 /phpBB/develop | |
| parent | 1ceddd9eeccde56ab307631a16e40b943eac883a (diff) | |
| parent | e02e530204a31c7723a73cbfcdba0d6132b1a175 (diff) | |
| download | forums-75e7ffc317af7ad5b7a420a53115caaa66d3a942.tar forums-75e7ffc317af7ad5b7a420a53115caaa66d3a942.tar.gz forums-75e7ffc317af7ad5b7a420a53115caaa66d3a942.tar.bz2 forums-75e7ffc317af7ad5b7a420a53115caaa66d3a942.tar.xz forums-75e7ffc317af7ad5b7a420a53115caaa66d3a942.zip | |
Merge commit 'release-3.0-RC4'
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 30 | ||||
| -rw-r--r-- | phpBB/develop/generate_utf_confusables.php | 240 | ||||
| -rw-r--r-- | phpBB/develop/unicode_testing.php | 120 |
3 files changed, 375 insertions, 15 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 1261d4f57e..1675fc0899 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -14,7 +14,7 @@ die("Please read the first lines of this script for instructions on how to enable it"); -set_time_limit(0); +@set_time_limit(0); $schema_path = './../install/schemas/'; @@ -1028,7 +1028,7 @@ function get_schema_struct() 'forum_desc_uid' => array('VCHAR:5', ''), 'forum_link' => array('VCHAR_UNI', ''), 'forum_password' => array('VCHAR_UNI:40', ''), - 'forum_style' => array('TINT:4', 0), + 'forum_style' => array('USINT', 0), 'forum_image' => array('VCHAR', ''), 'forum_rules' => array('TEXT_UNI', ''), 'forum_rules_link' => array('VCHAR_UNI', ''), @@ -1107,9 +1107,9 @@ function get_schema_struct() 'group_desc_uid' => array('VCHAR:5', ''), 'group_display' => array('BOOL', 0), 'group_avatar' => array('VCHAR', ''), - 'group_avatar_type' => array('TINT:4', 0), - 'group_avatar_width' => array('TINT:4', 0), - 'group_avatar_height' => array('TINT:4', 0), + 'group_avatar_type' => array('TINT:2', 0), + 'group_avatar_width' => array('USINT', 0), + 'group_avatar_height' => array('USINT', 0), 'group_rank' => array('UINT', 0), 'group_colour' => array('VCHAR:6', ''), 'group_sig_chars' => array('UINT', 0), @@ -1556,13 +1556,13 @@ function get_schema_struct() $schema_data['phpbb_styles'] = array( 'COLUMNS' => array( - 'style_id' => array('TINT:4', NULL, 'auto_increment'), + 'style_id' => array('USINT', NULL, 'auto_increment'), 'style_name' => array('VCHAR_UNI:255', ''), 'style_copyright' => array('VCHAR_UNI', ''), 'style_active' => array('BOOL', 1), - 'template_id' => array('TINT:4', 0), - 'theme_id' => array('TINT:4', 0), - 'imageset_id' => array('TINT:4', 0), + 'template_id' => array('USINT', 0), + 'theme_id' => array('USINT', 0), + 'imageset_id' => array('USINT', 0), ), 'PRIMARY_KEY' => 'style_id', 'KEYS' => array( @@ -1575,7 +1575,7 @@ function get_schema_struct() $schema_data['phpbb_styles_template'] = array( 'COLUMNS' => array( - 'template_id' => array('TINT:4', NULL, 'auto_increment'), + 'template_id' => array('USINT', NULL, 'auto_increment'), 'template_name' => array('VCHAR_UNI:255', ''), 'template_copyright' => array('VCHAR_UNI', ''), 'template_path' => array('VCHAR:100', ''), @@ -1590,7 +1590,7 @@ function get_schema_struct() $schema_data['phpbb_styles_template_data'] = array( 'COLUMNS' => array( - 'template_id' => array('TINT:4', NULL, 'auto_increment'), + 'template_id' => array('USINT', NULL, 'auto_increment'), 'template_filename' => array('VCHAR:100', ''), 'template_included' => array('TEXT', ''), 'template_mtime' => array('TIMESTAMP', 0), @@ -1604,7 +1604,7 @@ function get_schema_struct() $schema_data['phpbb_styles_theme'] = array( 'COLUMNS' => array( - 'theme_id' => array('TINT:4', NULL, 'auto_increment'), + 'theme_id' => array('USINT', NULL, 'auto_increment'), 'theme_name' => array('VCHAR_UNI:255', ''), 'theme_copyright' => array('VCHAR_UNI', ''), 'theme_path' => array('VCHAR:100', ''), @@ -1620,7 +1620,7 @@ function get_schema_struct() $schema_data['phpbb_styles_imageset'] = array( 'COLUMNS' => array( - 'imageset_id' => array('TINT:4', NULL, 'auto_increment'), + 'imageset_id' => array('USINT', NULL, 'auto_increment'), 'imageset_name' => array('VCHAR_UNI:255', ''), 'imageset_copyright' => array('VCHAR_UNI', ''), 'imageset_path' => array('VCHAR:100', ''), @@ -1639,7 +1639,7 @@ function get_schema_struct() 'image_lang' => array('VCHAR:30', ''), 'image_height' => array('USINT', 0), 'image_width' => array('USINT', 0), - 'imageset_id' => array('TINT:4', 0), + 'imageset_id' => array('USINT', 0), ), 'PRIMARY_KEY' => 'image_id', 'KEYS' => array( @@ -1777,7 +1777,7 @@ function get_schema_struct() 'user_timezone' => array('DECIMAL', 0), 'user_dst' => array('BOOL', 0), 'user_dateformat' => array('VCHAR_UNI:30', 'd M Y H:i'), - 'user_style' => array('TINT:4', 0), + 'user_style' => array('USINT', 0), 'user_rank' => array('UINT', 0), 'user_colour' => array('VCHAR:6', ''), 'user_new_privmsg' => array('TINT:4', 0), diff --git a/phpBB/develop/generate_utf_confusables.php b/phpBB/develop/generate_utf_confusables.php new file mode 100644 index 0000000000..908ebbf6f4 --- /dev/null +++ b/phpBB/develop/generate_utf_confusables.php @@ -0,0 +1,240 @@ +<?php +/** +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +if (php_sapi_name() != 'cli') +{ + die("This program must be run from the command line.\n"); +} + +// +// Security message: +// +// This script is potentially dangerous. +// Remove or comment the next line (die(".... ) to enable this script. +// Do NOT FORGET to either remove this script or disable it after you have used it. +// +die("Please read the first lines of this script for instructions on how to enable it"); + +set_time_limit(0); + +define('IN_PHPBB', true); +$phpbb_root_path = '../'; +$phpEx = substr(strrchr(__FILE__, '.'), 1); + +echo "Checking for required files\n"; +download('http://unicode.org/reports/tr39/data/confusables.txt'); +download('http://unicode.org/Public/UNIDATA/CaseFolding.txt'); +echo "\n"; + + +/** +* Load the confusables table +*/ +echo "Loading confusables\n"; +$unidata = file_get_contents('confusables.txt'); + +/** +* Load the CaseFolding table +*/ +echo "Loading CaseFolding\n"; +$casefolds = file_get_contents('CaseFolding.txt'); + + +function utf8_chr($cp) +{ + if ($cp > 0xFFFF) + { + return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F)); + } + else if ($cp > 0x7FF) + { + return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F)); + } + else if ($cp > 0x7F) + { + return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F)); + } + else + { + return chr($cp); + } +} + +preg_match_all('/^([0-9A-F]+) ;\s((?:[0-9A-F]+ )*);.*?$/im', $unidata, $array, PREG_SET_ORDER); +preg_match_all('/^([0-9A-F]+); ([CFS]); ([0-9A-F]+(?: [0-9A-F]+)*);/im', $casefolds, $casefold_array); + +// some that we defined ourselves +$uniarray = array( + "\xC2\xA1" => "\x69", // EXCLAMATION MARK, INVERTED => LATIN SMALL LETTER I + "\xC7\x83" => "\x21", // LATIN LETTER RETROFLEX CLICK => EXCLAMATION MARK + "\xCE\xB1" => "\x61", // GREEK SMALL LETTER ALPHA => LATIN SMALL LETTER A + "\xE1\x9A\x80" => "\x20", // OGHAM SPACE MARK + + "\xC2\xAD" => '', // HYPHEN, SOFT => empty string + "\xDB\x9D" => '', // ARABIC END OF AYAH + "\xDC\x8F" => '', // SYRIAC ABBREVIATION MARK + "\xE1\xA0\x86" => '', // MONGOLIAN TODO SOFT HYPHEN + "\xE1\xA0\x8E" => '', // MONGOLIAN VOWEL SEPARATOR + "\xE2\x80\x8B" => '', // ZERO WIDTH SPACE + "\xE2\x80\x8C" => '', // ZERO WIDTH NON-JOINER + "\xE2\x80\x8D" => '', // ZERO WIDTH JOINER + "\xE2\x80\xA8" => '', // LINE SEPARATOR + "\xE2\x80\xA9" => '', // PARAGRAPH SEPARATOR + "\xE2\x81\xA0" => '', // WORD JOINER + "\xE2\x81\xA1" => '', // FUNCTION APPLICATION + "\xE2\x81\xA2" => '', // INVISIBLE TIMES + "\xE2\x81\xA3" => '', // INVISIBLE SEPARATOR + "\xE2\x81\xAA" => '', // [CONTROL CHARACTERS] + "\xE2\x81\xAB" => '', // [CONTROL CHARACTERS] + "\xE2\x81\xAC" => '', // [CONTROL CHARACTERS] + "\xE2\x81\xAD" => '', // [CONTROL CHARACTERS] + "\xE2\x81\xAE" => '', // [CONTROL CHARACTERS] + "\xE2\x81\xAF" => '', // [CONTROL CHARACTERS] + "\xEF\xBB\xBF" => '', // ZERO WIDTH NO-BREAK SPACE + "\xEF\xBF\xB9" => '', // [CONTROL CHARACTERS] + "\xEF\xBF\xBA" => '', // [CONTROL CHARACTERS] + "\xEF\xBF\xBB" => '', // [CONTROL CHARACTERS] + "\xEF\xBF\xBC" => '', // [CONTROL CHARACTERS] + "\xF0\x9D\x85\xB3" => '', // [MUSICAL CONTROL CHARACTERS] + "\xF0\x9D\x85\xB4" => '', // [MUSICAL CONTROL CHARACTERS] + "\xF0\x9D\x85\xB5" => '', // [MUSICAL CONTROL CHARACTERS] + "\xF0\x9D\x85\xB6" => '', // [MUSICAL CONTROL CHARACTERS] + "\xF0\x9D\x85\xB7" => '', // [MUSICAL CONTROL CHARACTERS] + "\xF0\x9D\x85\xB8" => '', // [MUSICAL CONTROL CHARACTERS] + "\xF0\x9D\x85\xB9" => '', // [MUSICAL CONTROL CHARACTERS] + "\xF0\x9D\x85\xBA" => '', // [MUSICAL CONTROL CHARACTERS] +); + +$copy = $uniarray; + +foreach ($array as $value) +{ + $temp_hold = implode(array_map('utf8_chr', array_map('hexdec', explode(' ', trim($value[2]))))); + + if (isset($copy[utf8_chr(hexdec((string)$value[1]))])) + { + $num = ''; + $string = utf8_chr(hexdec((string)$value[1])); + for ($i = 0; $i < strlen($string); $i++) + { + $num .= '\x' . str_pad(base_convert(ord($string[$i]), 10, 16), 2, '0', STR_PAD_LEFT); + } + echo $num . "\n"; + if ($uniarray[$string] != $temp_hold) + { + echo " --> $string\n"; + echo " --> " . $temp_hold . "\n"; + } + } + + // do some tests for things that transform into something with the number one + if (strpos($temp_hold, utf8_chr(0x0031)) !== false) + { + // any kind of letter L? + if (strpos($value[0], 'LETTER L') !== false || strpos($value[0], 'IOTA') !== false || strpos($value[0], 'SMALL L ') !== false || preg_match('/SMALL LIGATURE [^L]*L /', $value[0])) + { + // replace all of the mappings that transform some sort of letter l to number one instead to some sort of letter l to latin small letter l + $temp_hold = str_replace(utf8_chr(0x0031), utf8_chr(0x006C), $temp_hold); + } + } + + // uppercased chars that were folded do not exist in this universe, + // no amount of normalization could ever "trick" this into not working + if (in_array($value[1], $casefold_array[1])) + { + continue; + } + + $uniarray[utf8_chr(hexdec((string)$value[1]))] = $temp_hold; +} + +echo "Writing to confusables.$phpEx\n"; + +$fp = fopen($phpbb_root_path . 'includes/utf/data/confusables.' . $phpEx, 'wb'); +fwrite($fp, '<?php return ' . my_var_export($uniarray) . ';'); +fclose($fp); + +/** +* Return a parsable string representation of a variable +* +* This is function is limited to array/strings/integers +* +* @param mixed $var Variable +* @return string PHP code representing the variable +*/ +function my_var_export($var) +{ + if (is_array($var)) + { + $lines = array(); + + foreach ($var as $k => $v) + { + $lines[] = my_var_export($k) . '=>' . my_var_export($v); + } + + return 'array(' . implode(',', $lines) . ')'; + } + else if (is_string($var)) + { + return "'" . str_replace(array('\\', "'"), array('\\\\', "\\'"), $var) . "'"; + } + else + { + return $var; + } +} + +/** +* Download a file to the develop/ dir +* +* @param string $url URL of the file to download +* @return void +*/ +function download($url) +{ + global $phpbb_root_path; + + if (file_exists($phpbb_root_path . 'develop/' . basename($url))) + { + return; + } + + echo 'Downloading from ', $url, ' '; + + if (!$fpr = fopen($url, 'rb')) + { + die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai"); + } + + if (!$fpw = fopen($phpbb_root_path . 'develop/' . basename($url), 'wb')) + { + die("Can't open develop/" . basename($url) . " for output... please check your permissions or something"); + } + + $i = 0; + $chunk = 32768; + $done = ''; + + while (!feof($fpr)) + { + $i += fwrite($fpw, fread($fpr, $chunk)); + echo str_repeat("\x08", strlen($done)); + + $done = ($i >> 10) . ' KiB'; + echo $done; + } + fclose($fpr); + fclose($fpw); + + echo "\n"; +} + +?>
\ No newline at end of file diff --git a/phpBB/develop/unicode_testing.php b/phpBB/develop/unicode_testing.php new file mode 100644 index 0000000000..25a13d1325 --- /dev/null +++ b/phpBB/develop/unicode_testing.php @@ -0,0 +1,120 @@ +<?php +// +// This file provides some useful functions for debugging the unicode/UTF-8 library +// It requires utf_tools.php to be loaded +// +die("Please read the first lines of this script for instructions on how to enable it"); + +if (!headers_sent()) +{ + header('Content-type: text/html; charset=UTF-8'); +} + +/** + * Converts unicode escape sequences (\u0123) into UTF-8 characters + * + * @param string A unicode sequence + * @return string UTF-8 representation of the given unicode sequence + */ +function unicode_to_utf8($string) +{ + $utf8 = ''; + $chars = array(); + for ($i = 0; $i < strlen($string); $i++) + { + if (isset($string[$i + 5]) && substr($string, $i, 2) == '\\u' && ctype_xdigit(substr($string, $i + 2, 4))) + { + $utf8 .= utf8_from_unicode(array(base_convert(substr($string, $i + 2, 4), 16, 10))); + $i += 5; + } + else + { + $utf8 .= $string[$i]; + } + } + return $utf8; +} + +/** + * Takes an array of ints representing the Unicode characters and returns + * a UTF-8 string. + * + * @param array $array array of unicode code points representing a string + * @return string UTF-8 character string + */ +function utf8_from_unicode($array) +{ + $str = ''; + foreach ($array as $value) + { + $str .= utf8_chr($value); + } + return $str; +} + +/** +* Converts a UTF-8 string to unicode code points +* +* @param string $text UTF-8 string +* @return string Unicode code points +*/ +function utf8_to_unicode($text) +{ + return preg_replace_callback( + '#[\\xC2-\\xF4][\\x80-\\xBF]?[\\x80-\\xBF]?[\\x80-\\xBF]#', + 'utf8_to_unicode_callback', + preg_replace_callback( + '#[\\x00-\\x7f]#', + 'utf8_to_unicode_callback', + $text + ) + ); +} + +/** +* Takes a UTF-8 char and replaces it with its unicode escape sequence. Attention, $m is an array +* +* @param array $m 0-based numerically indexed array passed by preg_replace_callback() +* @return string A unicode escape sequence +*/ +function utf8_to_unicode_callback($m) +{ + return '\u' . str_pad(base_convert(utf8_ord($m[0]), 10, 16), 4, '0', STR_PAD_LEFT) . ''; +} + +/** +* A wrapper function for the normalizer which takes care of including the class if required and modifies the passed strings +* to be in NFKC +* +* @param mixed $strings a string or an array of strings to normalize +* @return mixed the normalized content, preserving array keys if array given. +*/ +function utf8_normalize_nfkc($strings) +{ + if (empty($strings)) + { + return $strings; + } + + if (!class_exists('utf_normalizer')) + { + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/utf/utf_normalizer.' . $phpEx); + } + + if (!is_array($strings)) + { + utf_normalizer::nfkc($strings); + } + else if (is_array($strings)) + { + foreach ($strings as $key => $string) + { + utf_normalizer::nfkc($strings[$key]); + } + } + + return $strings; +} + +?>
\ No newline at end of file |
