aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-08-22 21:26:06 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-08-22 21:26:06 +0000
commit1d42d1b9817050974c8bc8b91bc34a6c3cfbfef8 (patch)
treea5788f8c1db67b7ea6cfb870b1400e28df15ee3a /phpBB
parentb0afc8e6320598734ae20e664be9f840ca501f91 (diff)
downloadforums-1d42d1b9817050974c8bc8b91bc34a6c3cfbfef8.tar
forums-1d42d1b9817050974c8bc8b91bc34a6c3cfbfef8.tar.gz
forums-1d42d1b9817050974c8bc8b91bc34a6c3cfbfef8.tar.bz2
forums-1d42d1b9817050974c8bc8b91bc34a6c3cfbfef8.tar.xz
forums-1d42d1b9817050974c8bc8b91bc34a6c3cfbfef8.zip
some updates. Also adjusted the utf tools and normalizer more to our coding guidelines.
git-svn-id: file:///svn/phpbb/trunk@6312 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/adm/style/acp_language.html4
-rw-r--r--phpBB/docs/AUTHORS2
-rw-r--r--phpBB/includes/acm/acm_file.php26
-rw-r--r--phpBB/includes/acp/acp_database.php2
-rw-r--r--phpBB/includes/acp/acp_language.php2
-rw-r--r--phpBB/includes/acp/acp_profile.php2
-rw-r--r--phpBB/includes/db/dbal.php2
-rw-r--r--phpBB/includes/db/firebird.php10
-rw-r--r--phpBB/includes/db/mssql.php10
-rw-r--r--phpBB/includes/db/mssql_odbc.php10
-rw-r--r--phpBB/includes/db/mysql.php12
-rw-r--r--phpBB/includes/db/mysql4.php10
-rw-r--r--phpBB/includes/db/mysqli.php10
-rw-r--r--phpBB/includes/db/oracle.php8
-rw-r--r--phpBB/includes/db/postgres.php10
-rw-r--r--phpBB/includes/db/sqlite.php10
-rw-r--r--phpBB/includes/functions.php5
-rw-r--r--phpBB/includes/functions_admin.php2
-rw-r--r--phpBB/includes/functions_jabber.php22
-rw-r--r--phpBB/includes/functions_messenger.php2
-rw-r--r--phpBB/includes/functions_profile_fields.php28
-rw-r--r--phpBB/includes/functions_template.php24
-rw-r--r--phpBB/includes/functions_transfer.php74
-rw-r--r--phpBB/includes/functions_upload.php2
-rw-r--r--phpBB/includes/message_parser.php2
-rw-r--r--phpBB/includes/session.php5
-rw-r--r--phpBB/includes/template.php26
-rw-r--r--phpBB/includes/utf/utf_normalizer.php2665
-rw-r--r--phpBB/includes/utf/utf_tools.php34
-rwxr-xr-xphpBB/language/en/install.php1
30 files changed, 1346 insertions, 1676 deletions
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index 5f32855f48..76eb7c7b84 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -177,8 +177,8 @@
</dl>
<!-- BEGIN data -->
<dl>
- <dt><label for="store">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt>
- <dd><input type="text" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" checked="checked" /></dd>
+ <dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt>
+ <dd><input type="text" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
</dl>
<!-- END data -->
</fieldset>
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index a14d037a96..8120424fc5 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -34,6 +34,8 @@ Text_Diff-0.2.1 http://pear.php.net/package/Text_Diff
GPL licenced:
phpMyAdmin © 2001,2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/
Jabber class © 2003 Carlo Zottmann, http://phpjabber.g-blog.net
+Chora: Copyright 2000-2006, The Horde Project. http://horde.org/chora/
+Horde Project: Copyright 2000-2006, The Horde Project. http://horde.org/
PHP License, version 3.0:
Pear © 2001-2004 PHP Group, http://pear.php.net
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php
index 175ef0ad81..f79a94c987 100644
--- a/phpBB/includes/acm/acm_file.php
+++ b/phpBB/includes/acm/acm_file.php
@@ -176,6 +176,32 @@ class acm
}
/**
+ * Purge cache data
+ */
+ function purge()
+ {
+ // Purge sql data
+ $dir = opendir($this->cache_dir);
+ while (($entry = readdir($dir)) !== false)
+ {
+ if (strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && strpos($entry, 'tpl_') !== 0)
+ {
+ continue;
+ }
+
+ @unlink($this->cache_dir . $entry);
+ }
+ @closedir($dir);
+
+ unset($this->vars);
+ unset($this->var_expires);
+ unset($this->sql_rowset);
+ unset($this->sql_row_pointer);
+
+ $this->is_modified = false;
+ }
+
+ /**
* Destroy cache data
*/
function destroy($var_name, $table = '')
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index 4a5382b67a..00ffebc6e5 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -433,7 +433,7 @@ class acp_database
$column_list = array();
$table_cols = explode(',', trim($matches[1]));
- foreach($table_cols as $declaration)
+ foreach ($table_cols as $declaration)
{
$entities = preg_split('#\s+#', trim($declaration));
$column_name = preg_replace('/"?([^"]+)"?/', '\1', $entities[0]);
diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php
index 29aabe240f..e2431749d1 100644
--- a/phpBB/includes/acp/acp_language.php
+++ b/phpBB/includes/acp/acp_language.php
@@ -838,7 +838,7 @@ class acp_language
$compress->close();
$compress->download('lang_' . $row['lang_iso']);
- @unlink($phpbb_root_path . 'store/lang_' . $row['lang_iso'] . '.' . $use_method);
+ @unlink($phpbb_root_path . 'store/lang_' . $row['lang_iso'] . $use_method);
exit;
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index c361c47c2e..5ab70f609f 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -129,7 +129,7 @@ class acp_profile
$new_table_cols = trim($matches[1]);
$old_table_cols = explode(',', $new_table_cols);
$column_list = array();
- foreach($old_table_cols as $declaration)
+ foreach ($old_table_cols as $declaration)
{
$entities = preg_split('#\s+#', trim($declaration));
if ($entities[0] !== '_' . $field_ident)
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 4732f3c3a6..6f6b5ddce4 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -131,7 +131,7 @@ class dbal
/**
* SQL Transaction
- * @access: private
+ * @access private
*/
function sql_transaction($status = 'begin')
{
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 7ea5dd3612..3446513e19 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -66,7 +66,7 @@ class dbal_firebird extends dbal
/**
* SQL Transaction
- * @access: private
+ * @access private
*/
function _sql_transaction($status = 'begin')
{
@@ -360,7 +360,7 @@ class dbal_firebird extends dbal
/**
* Build db-specific query data
- * @access: private
+ * @access private
*/
function _sql_custom_build($stage, $data)
{
@@ -369,7 +369,7 @@ class dbal_firebird extends dbal
/**
* return sql error array
- * @access: private
+ * @access private
*/
function _sql_error()
{
@@ -381,7 +381,7 @@ class dbal_firebird extends dbal
/**
* Close sql connection
- * @access: private
+ * @access private
*/
function _sql_close()
{
@@ -395,7 +395,7 @@ class dbal_firebird extends dbal
/**
* Build db-specific report
- * @access: private
+ * @access private
*/
function _sql_report($mode, $query = '')
{
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
index fe6cf75b12..11548998ba 100644
--- a/phpBB/includes/db/mssql.php
+++ b/phpBB/includes/db/mssql.php
@@ -79,7 +79,7 @@ class dbal_mssql extends dbal
/**
* SQL Transaction
- * @access: private
+ * @access private
*/
function _sql_transaction($status = 'begin')
{
@@ -371,7 +371,7 @@ class dbal_mssql extends dbal
/**
* return sql error array
- * @access: private
+ * @access private
*/
function _sql_error()
{
@@ -410,7 +410,7 @@ class dbal_mssql extends dbal
/**
* Build db-specific query data
- * @access: private
+ * @access private
*/
function _sql_custom_build($stage, $data)
{
@@ -419,7 +419,7 @@ class dbal_mssql extends dbal
/**
* Close sql connection
- * @access: private
+ * @access private
*/
function _sql_close()
{
@@ -428,7 +428,7 @@ class dbal_mssql extends dbal
/**
* Build db-specific report
- * @access: private
+ * @access private
*/
function _sql_report($mode, $query = '')
{
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index e1b2675a23..54655c389a 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -73,7 +73,7 @@ class dbal_mssql_odbc extends dbal
/**
* SQL Transaction
- * @access: private
+ * @access private
*/
function _sql_transaction($status = 'begin')
{
@@ -381,7 +381,7 @@ class dbal_mssql_odbc extends dbal
/**
* Build db-specific query data
- * @access: private
+ * @access private
*/
function _sql_custom_build($stage, $data)
{
@@ -390,7 +390,7 @@ class dbal_mssql_odbc extends dbal
/**
* return sql error array
- * @access: private
+ * @access private
*/
function _sql_error()
{
@@ -402,7 +402,7 @@ class dbal_mssql_odbc extends dbal
/**
* Close sql connection
- * @access: private
+ * @access private
*/
function _sql_close()
{
@@ -411,7 +411,7 @@ class dbal_mssql_odbc extends dbal
/**
* Build db-specific report
- * @access: private
+ * @access private
*/
function _sql_report($mode, $query = '')
{
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 7e363721a9..48ae9e9773 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -33,7 +33,7 @@ class dbal_mysql extends dbal
{
/**
* Connect to server
- * @access: public
+ * @access public
*/
function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
{
@@ -65,7 +65,7 @@ class dbal_mysql extends dbal
/**
* SQL Transaction
- * @access: private
+ * @access private
*/
function _sql_transaction($status = 'begin')
{
@@ -330,7 +330,7 @@ class dbal_mysql extends dbal
/**
* Build db-specific query data
- * @access: private
+ * @access private
*/
function _sql_custom_build($stage, $data)
{
@@ -346,7 +346,7 @@ class dbal_mysql extends dbal
/**
* return sql error array
- * @access: private
+ * @access private
*/
function _sql_error()
{
@@ -366,7 +366,7 @@ class dbal_mysql extends dbal
/**
* Close sql connection
- * @access: private
+ * @access private
*/
function _sql_close()
{
@@ -375,7 +375,7 @@ class dbal_mysql extends dbal
/**
* Build db-specific report
- * @access: private
+ * @access private
*/
function _sql_report($mode, $query = '')
{
diff --git a/phpBB/includes/db/mysql4.php b/phpBB/includes/db/mysql4.php
index 071f4c4b55..dd89de5e5c 100644
--- a/phpBB/includes/db/mysql4.php
+++ b/phpBB/includes/db/mysql4.php
@@ -67,7 +67,7 @@ class dbal_mysql4 extends dbal
/**
* SQL Transaction
- * @access: private
+ * @access private
*/
function _sql_transaction($status = 'begin')
{
@@ -333,7 +333,7 @@ class dbal_mysql4 extends dbal
/**
* Build db-specific query data
- * @access: private
+ * @access private
*/
function _sql_custom_build($stage, $data)
{
@@ -349,7 +349,7 @@ class dbal_mysql4 extends dbal
/**
* return sql error array
- * @access: private
+ * @access private
*/
function _sql_error()
{
@@ -369,7 +369,7 @@ class dbal_mysql4 extends dbal
/**
* Close sql connection
- * @access: private
+ * @access private
*/
function _sql_close()
{
@@ -378,7 +378,7 @@ class dbal_mysql4 extends dbal
/**
* Build db-specific report
- * @access: private
+ * @access private
*/
function _sql_report($mode, $query = '')
{
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index fa4d3ffdc7..66bbd9beda 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -67,7 +67,7 @@ class dbal_mysqli extends dbal
/**
* SQL Transaction
- * @access: private
+ * @access private
*/
function _sql_transaction($status = 'begin')
{
@@ -313,7 +313,7 @@ class dbal_mysqli extends dbal
/**
* Build db-specific query data
- * @access: private
+ * @access private
*/
function _sql_custom_build($stage, $data)
{
@@ -329,7 +329,7 @@ class dbal_mysqli extends dbal
/**
* return sql error array
- * @access: private
+ * @access private
*/
function _sql_error()
{
@@ -349,7 +349,7 @@ class dbal_mysqli extends dbal
/**
* Close sql connection
- * @access: private
+ * @access private
*/
function _sql_close()
{
@@ -358,7 +358,7 @@ class dbal_mysqli extends dbal
/**
* Build db-specific report
- * @access: private
+ * @access private
*/
function _sql_report($mode, $query = '')
{
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index fc5bf6f78e..e87b7aa1f9 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -57,7 +57,7 @@ class dbal_oracle extends dbal
/**
* SQL Transaction
- * @access: private
+ * @access private
*/
function _sql_transaction($status = 'begin')
{
@@ -443,7 +443,7 @@ class dbal_oracle extends dbal
/**
* return sql error array
- * @access: private
+ * @access private
*/
function _sql_error()
{
@@ -465,7 +465,7 @@ class dbal_oracle extends dbal
/**
* Close sql connection
- * @access: private
+ * @access private
*/
function _sql_close()
{
@@ -474,7 +474,7 @@ class dbal_oracle extends dbal
/**
* Build db-specific report
- * @access: private
+ * @access private
*/
function _sql_report($mode, $query = '')
{
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index 1836952346..a91a8e81bb 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -105,7 +105,7 @@ class dbal_postgres extends dbal
/**
* SQL Transaction
- * @access: private
+ * @access private
*/
function _sql_transaction($status = 'begin')
{
@@ -189,7 +189,7 @@ class dbal_postgres extends dbal
/**
* Build db-specific query data
- * @access: private
+ * @access private
*/
function _sql_custom_build($stage, $data)
{
@@ -398,7 +398,7 @@ class dbal_postgres extends dbal
/**
* return sql error array
- * @access: private
+ * @access private
*/
function _sql_error()
{
@@ -410,7 +410,7 @@ class dbal_postgres extends dbal
/**
* Close sql connection
- * @access: private
+ * @access private
*/
function _sql_close()
{
@@ -419,7 +419,7 @@ class dbal_postgres extends dbal
/**
* Build db-specific report
- * @access: private
+ * @access private
*/
function _sql_report($mode, $query = '')
{
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index cd6d40e3c7..65be2fef64 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -63,7 +63,7 @@ class dbal_sqlite extends dbal
/**
* SQL Transaction
- * @access: private
+ * @access private
*/
function _sql_transaction($status = 'begin')
{
@@ -310,7 +310,7 @@ class dbal_sqlite extends dbal
/**
* return sql error array
- * @access: private
+ * @access private
*/
function _sql_error()
{
@@ -322,7 +322,7 @@ class dbal_sqlite extends dbal
/**
* Build db-specific query data
- * @access: private
+ * @access private
*/
function _sql_custom_build($stage, $data)
{
@@ -331,7 +331,7 @@ class dbal_sqlite extends dbal
/**
* Close sql connection
- * @access: private
+ * @access private
*/
function _sql_close()
{
@@ -340,7 +340,7 @@ class dbal_sqlite extends dbal
/**
* Build db-specific report
- * @access: private
+ * @access private
*/
function _sql_report($mode, $query = '')
{
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 84de408eb9..8affabc8c9 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -15,7 +15,7 @@
*
* Set variable, used by {@link request_var the request_var function}
*
-* @access: private
+* @access private
*/
function set_var(&$result, $var, $type, $multibyte = false)
{
@@ -1865,7 +1865,8 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
if (!$redirect)
{
// We just use what the session code determined...
- $redirect = $user->page['page_name'] . (($user->page['query_string']) ? '?' . $user->page['query_string'] : '');
+ // We do not append the phpbb_root_path directory because we are within the root dir if the redirect happens and not within the current directory.
+ $redirect = (($user->page['page_dir']) ? $user->page['page_dir'] . '/' : '') . $user->page['page_name'] . (($user->page['query_string']) ? '?' . $user->page['query_string'] : '');
}
$s_hidden_fields = build_hidden_fields(array('redirect' => $redirect, 'sid' => $user->session_id));
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index ffcf91b2bb..85ed30db18 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2467,7 +2467,7 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port
}
else if (strpos($line, '404 Not Found') !== false)
{
- $errstr = $user->lang['FILE_NOT_FOUND'];
+ $errstr = $user->lang['FILE_NOT_FOUND'] . ': ' . $filename;
return false;
}
}
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php
index d98293dd0f..96d2e686e4 100644
--- a/phpBB/includes/functions_jabber.php
+++ b/phpBB/includes/functions_jabber.php
@@ -627,7 +627,7 @@ class jabber
/**
* Send auth
- * @access: private
+ * @access private
*/
function _sendauth_ok($zerok_token, $zerok_sequence)
{
@@ -655,7 +655,7 @@ class jabber
/**
* Send auth digest
- * @access: private
+ * @access private
*/
function _sendauth_digest()
{
@@ -671,7 +671,7 @@ class jabber
/**
* Send auth plain
- * @access: private
+ * @access private
*/
function _sendauth_plaintext()
{
@@ -687,7 +687,7 @@ class jabber
/**
* Listen on socket
- * @access: private
+ * @access private
*/
function _listen_incoming()
{
@@ -704,7 +704,7 @@ class jabber
/**
* Check if connected
- * @access: private
+ * @access private
*/
function _check_connected()
{
@@ -733,7 +733,7 @@ class jabber
/**
* Split incoming packet
- * @access: private
+ * @access private
*/
function _split_incoming($incoming)
{
@@ -750,7 +750,7 @@ class jabber
/**
* Get packet type
- * @access: private
+ * @access private
*/
function _get_packet_type($packet = NULL)
{
@@ -765,7 +765,7 @@ class jabber
/**
* Recursively prepares the strings in an array to be used in XML data.
- * @access: private
+ * @access private
*/
function _array_xmlspecialchars(&$array)
{
@@ -787,7 +787,7 @@ class jabber
/**
* Prepares a string for usage in XML data.
- * @access: private
+ * @access private
*/
function _xmlspecialchars(&$string)
{
@@ -797,7 +797,7 @@ class jabber
/**
* Recursively converts all elements in an array to UTF-8 from the encoding stored in {@link encoding the encoding attribute}.
- * @access: private
+ * @access private
*/
function _array_conv_utf8(&$array)
{
@@ -830,7 +830,7 @@ class jabber
*
* @return boolean True on success, false on failure.
*
- * @access: private
+ * @access private
*/
function _conv_utf8(&$string)
{
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 052f372443..207ff00b8d 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -706,7 +706,7 @@ class queue
/**
* Format array
- * @access: private
+ * @access private
*/
function format_array($array)
{
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 6f71724754..95723f8181 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -21,7 +21,7 @@ class custom_profile
/**
* Assign editable fields to template, mode can be profile (for profile change) or register (for registration)
* Called by ucp_profile and ucp_register
- * @access: public
+ * @access public
*/
function generate_profile_fields($mode, $lang_id)
{
@@ -74,7 +74,7 @@ class custom_profile
/**
* Validate entered profile field data
- * @access: public
+ * @access public
*/
function validate_profile_field($field_type, &$field_value, $field_data)
{
@@ -186,7 +186,7 @@ class custom_profile
/**
* Build profile cache, used for display
- * @access: private
+ * @access private
*/
function build_cache()
{
@@ -248,7 +248,7 @@ class custom_profile
/**
* Submit profile field
- * @access: public
+ * @access public
*/
function submit_cp_field($mode, $lang_id, &$cp_data, &$cp_error)
{
@@ -340,7 +340,7 @@ class custom_profile
/**
* Assign fields to template, used for viewprofile, viewtopic and memberlist (if load setting is enabled)
* This is directly connected to the user -> mode == grab is to grab the user specific fields, mode == show is for assigning the row to the template
- * @access: public
+ * @access public
*/
function generate_profile_fields_template($mode, $user_id = 0, $profile_row = false)
{
@@ -535,7 +535,7 @@ class custom_profile
/**
* Get field value for registration/profile
- * @access: private
+ * @access private
*/
function get_var($field_validation, &$profile_row, $default_value, $preview)
{
@@ -590,7 +590,7 @@ class custom_profile
/**
* Process int-type
- * @access: private
+ * @access private
*/
function generate_int($profile_row, $preview = false)
{
@@ -602,7 +602,7 @@ class custom_profile
/**
* Process date-type
- * @access: private
+ * @access private
*/
function generate_date($profile_row, $preview = false)
{
@@ -661,7 +661,7 @@ class custom_profile
/**
* Process bool-type
- * @access: private
+ * @access private
*/
function generate_bool($profile_row, $preview = false)
{
@@ -692,7 +692,7 @@ class custom_profile
/**
* Process string-type
- * @access: private
+ * @access private
*/
function generate_string($profile_row, $preview = false)
{
@@ -704,7 +704,7 @@ class custom_profile
/**
* Process text-type
- * @access: private
+ * @access private
*/
function generate_text($profile_row, $preview = false)
{
@@ -721,7 +721,7 @@ class custom_profile
/**
* Process dropdown-type
- * @access: private
+ * @access private
*/
function generate_dropdown($profile_row, $preview = false)
{
@@ -750,7 +750,7 @@ class custom_profile
/**
* Return Templated value/field. Possible values for $mode are:
* change == user is able to set/enter profile values; preview == just show the value
- * @access: private
+ * @access private
*/
function process_field_row($mode, $profile_row)
{
@@ -814,7 +814,7 @@ class custom_profile
/**
* Get profile field value on submit
- * @access: private
+ * @access private
*/
function get_profile_field($profile_row)
{
diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php
index fa93df7318..dacfafefa6 100644
--- a/phpBB/includes/functions_template.php
+++ b/phpBB/includes/functions_template.php
@@ -52,7 +52,7 @@ class template_compile
/**
* Load template source from file
- * @access: private
+ * @access private
*/
function _tpl_load_file($handle)
{
@@ -153,7 +153,7 @@ class template_compile
/**
* The all seeing all doing compile method. Parts are inspired by or directly from Smarty
- * @access: private
+ * @access private
*/
function compile($code, $no_echo = false, $echo_var = '')
{
@@ -280,7 +280,7 @@ class template_compile
/**
* Compile variables
- * @access: private
+ * @access private
*/
function compile_var_tags(&$text_blocks)
{
@@ -322,7 +322,7 @@ class template_compile
/**
* Compile blocks
- * @access: private
+ * @access private
*/
function compile_tag_block($tag_args)
{
@@ -413,7 +413,7 @@ class template_compile
/**
* Compile IF tags - much of this is from Smarty with
* some adaptions for our block level methods
- * @access: private
+ * @access private
*/
function compile_tag_if($tag_args, $elseif)
{
@@ -540,7 +540,7 @@ class template_compile
/**
* Compile DEFINE tags
- * @access: private
+ * @access private
*/
function compile_tag_define($tag_args, $op)
{
@@ -593,7 +593,7 @@ class template_compile
/**
* Compile INCLUDE tag
- * @access: private
+ * @access private
*/
function compile_tag_include($tag_args)
{
@@ -602,7 +602,7 @@ class template_compile
/**
* Compile INCLUDE_PHP tag
- * @access: private
+ * @access private
*/
function compile_tag_include_php($tag_args)
{
@@ -612,7 +612,7 @@ class template_compile
/**
* parse expression
* This is from Smarty
- * @access: private
+ * @access private
*/
function _parse_is_expr($is_arg, $tokens)
{
@@ -683,7 +683,7 @@ class template_compile
* ' . $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['varname'] . '
* It's ready to be inserted into an "echo" line in one of the templates.
* NOTE: expects a trailing "." on the namespace.
- * @access: private
+ * @access private
*/
function generate_block_varref($namespace, $varname, $echo = true, $defop = false)
{
@@ -708,7 +708,7 @@ class template_compile
*
* If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
* NOTE: does not expect a trailing "." on the blockname.
- * @access: private
+ * @access private
*/
function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
{
@@ -737,7 +737,7 @@ class template_compile
/**
* Write compiled file to cache directory
- * @access: private
+ * @access private
*/
function compile_write(&$handle, $data)
{
diff --git a/phpBB/includes/functions_transfer.php b/phpBB/includes/functions_transfer.php
index d2cc95f728..b147052c9c 100644
--- a/phpBB/includes/functions_transfer.php
+++ b/phpBB/includes/functions_transfer.php
@@ -189,6 +189,24 @@ class transfer
}
/**
+ * Check if a specified file exist...
+ */
+ function file_exists($directory, $filename)
+ {
+ global $phpbb_root_path;
+
+ $directory = $this->root_path . str_replace($phpbb_root_path, '', $directory);
+ $result = $this->_ls($directory);
+
+ if ($result !== false && is_array($result))
+ {
+ return (in_array($filename, $result)) ? true : false;
+ }
+
+ return false;
+ }
+
+ /**
* Open session
*/
function open_session()
@@ -272,7 +290,7 @@ class ftp extends transfer
/**
* Init FTP Session
- * @access: private
+ * @access private
*/
function _init()
{
@@ -304,7 +322,7 @@ class ftp extends transfer
/**
* Create Directory (MKDIR)
- * @access: private
+ * @access private
*/
function _mkdir($dir)
{
@@ -313,7 +331,7 @@ class ftp extends transfer
/**
* Remove directory (RMDIR)
- * @access: private
+ * @access private
*/
function _rmdir($dir)
{
@@ -322,7 +340,7 @@ class ftp extends transfer
/**
* Rename file
- * @access: private
+ * @access private
*/
function _rename($old_handle, $new_handle)
{
@@ -331,7 +349,7 @@ class ftp extends transfer
/**
* Change current working directory (CHDIR)
- * @access: private
+ * @access private
*/
function _chdir($dir = '')
{
@@ -345,7 +363,7 @@ class ftp extends transfer
/**
* change file permissions (CHMOD)
- * @access: private
+ * @access private
*/
function _chmod($file, $perms)
{
@@ -364,7 +382,7 @@ class ftp extends transfer
/**
* Upload file to location (PUT)
- * @access: private
+ * @access private
*/
function _put($from_file, $to_file)
{
@@ -386,7 +404,7 @@ class ftp extends transfer
/**
* Delete file (DELETE)
- * @access: private
+ * @access private
*/
function _delete($file)
{
@@ -395,7 +413,7 @@ class ftp extends transfer
/**
* Close ftp session (CLOSE)
- * @access: private
+ * @access private
*/
function _close()
{
@@ -410,7 +428,7 @@ class ftp extends transfer
/**
* Return current working directory (CWD)
* At the moment not used by parent class
- * @access: private
+ * @access private
*/
function _cwd()
{
@@ -419,8 +437,7 @@ class ftp extends transfer
/**
* Return list of files in a given directory (LS)
- * At the moment not used by parent class
- * @access: private
+ * @access private
*/
function _ls($dir = './')
{
@@ -429,7 +446,7 @@ class ftp extends transfer
/**
* FTP SITE command (ftp-only function)
- * @access: private
+ * @access private
*/
function _site($command)
{
@@ -487,7 +504,7 @@ class ftp_fsock extends transfer
/**
* Init FTP Session
- * @access: private
+ * @access private
*/
function _init()
{
@@ -526,7 +543,7 @@ class ftp_fsock extends transfer
/**
* Create Directory (MKDIR)
- * @access: private
+ * @access private
*/
function _mkdir($dir)
{
@@ -535,7 +552,7 @@ class ftp_fsock extends transfer
/**
* Remove directory (RMDIR)
- * @access: private
+ * @access private
*/
function _rmdir($dir)
{
@@ -544,7 +561,7 @@ class ftp_fsock extends transfer
/**
* Rename File
- * @access: private
+ * @access private
*/
function _rename($old_handle, $new_handle)
{
@@ -554,7 +571,7 @@ class ftp_fsock extends transfer
/**
* Change current working directory (CHDIR)
- * @access: private
+ * @access private
*/
function _chdir($dir = '')
{
@@ -568,7 +585,7 @@ class ftp_fsock extends transfer
/**
* change file permissions (CHMOD)
- * @access: private
+ * @access private
*/
function _chmod($file, $perms)
{
@@ -577,7 +594,7 @@ class ftp_fsock extends transfer
/**
* Upload file to location (PUT)
- * @access: private
+ * @access private
*/
function _put($from_file, $to_file)
{
@@ -613,7 +630,7 @@ class ftp_fsock extends transfer
/**
* Delete file (DELETE)
- * @access: private
+ * @access private
*/
function _delete($file)
{
@@ -622,7 +639,7 @@ class ftp_fsock extends transfer
/**
* Close ftp session (CLOSE)
- * @access: private
+ * @access private
*/
function _close()
{
@@ -637,7 +654,7 @@ class ftp_fsock extends transfer
/**
* Return current working directory (CWD)
* At the moment not used by parent class
- * @access: private
+ * @access private
*/
function _cwd()
{
@@ -647,8 +664,7 @@ class ftp_fsock extends transfer
/**
* Return list of files in a given directory (LS)
- * At the moment not used by parent class
- * @access: private
+ * @access private
*/
function _ls($dir = './')
{
@@ -671,7 +687,7 @@ class ftp_fsock extends transfer
/**
* Send a command to server (FTP fsock only function)
- * @access: private
+ * @access private
*/
function _send_command($command, $args = '', $check = true)
{
@@ -692,7 +708,7 @@ class ftp_fsock extends transfer
/**
* Opens a connection to send data (FTP fosck only function)
- * @access: private
+ * @access private
*/
function _open_data_connection()
{
@@ -727,7 +743,7 @@ class ftp_fsock extends transfer
/**
* Closes a connection used to send data
- * @access: private
+ * @access private
*/
function _close_data_connection()
{
@@ -736,7 +752,7 @@ class ftp_fsock extends transfer
/**
* Check to make sure command was successful (FTP fsock only function)
- * @access: private
+ * @access private
*/
function _check_command($return = false)
{
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index 28701339e4..ca2618c96a 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -38,7 +38,7 @@ class filespec
/**
* File Class
- * @access: private
+ * @access private
*/
function filespec($upload_ary, $upload_namespace)
{
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 9ce4c1d6da..3cdd3ec0b2 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -803,7 +803,7 @@ class bbcode_firstpass extends bbcode
* @param string $url the url to check
* @return true if the url is pointing to this domain/script_path/php-file, false if not
*
- * @access: private
+ * @access private
*/
function path_in_domain($url)
{
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 64a203e0bf..0e934edb8a 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -588,6 +588,9 @@ class session
$SID = '?sid=';
$this->session_id = $_SID = '';
+ // To make sure a valid session is created we create one for the anonymous user
+ $this->session_create(ANONYMOUS);
+
return true;
}
@@ -1207,7 +1210,7 @@ class user extends session
/**
* Set language entry (called by add_lang)
- * @access: private
+ * @access private
*/
function set_lang(&$lang, &$help, $lang_file, $use_db = false, $use_help = false)
{
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index 5281860ac5..abacd2d118 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -39,7 +39,7 @@ class template
/**
* Set template location
- * @access: public
+ * @access public
*/
function set_template()
{
@@ -60,7 +60,7 @@ class template
/**
* Set custom template location (able to use directory outside of phpBB)
- * @access: public
+ * @access public
*/
function set_custom_template($template_path, $template_name)
{
@@ -75,7 +75,7 @@ class template
/**
* Sets the template filenames for handles. $filename_array
* should be a hash of handle => filename pairs.
- * @access: public
+ * @access public
*/
function set_filenames($filename_array)
{
@@ -100,7 +100,7 @@ class template
/**
* Destroy template data set
- * @access: public
+ * @access public
*/
function destroy()
{
@@ -109,7 +109,7 @@ class template
/**
* Reset/empty complete block
- * @access: public
+ * @access public
*/
function destroy_block_vars($blockname)
{
@@ -139,7 +139,7 @@ class template
/**
* Display handle
- * @access: public
+ * @access public
*/
function display($handle, $include_once = true)
{
@@ -159,7 +159,7 @@ class template
/**
* Display the handle and assign the output to a template variable or return the compiled result.
- * @access: public
+ * @access public
*/
function assign_display($handle, $template_var = '', $return_content = true, $include_once = false)
{
@@ -179,7 +179,7 @@ class template
/**
* Load a compiled template if possible, if not, recompile it
- * @access: private
+ * @access private
*/
function _tpl_load(&$handle)
{
@@ -271,7 +271,7 @@ class template
/**
* Assign key variable pairs from an array
- * @access: public
+ * @access public
*/
function assign_vars($vararray)
{
@@ -285,7 +285,7 @@ class template
/**
* Assign a single variable to a single key
- * @access: public
+ * @access public
*/
function assign_var($varname, $varval)
{
@@ -296,7 +296,7 @@ class template
/**
* Assign key variable pairs from an array to a specified block
- * @access: public
+ * @access public
*/
function assign_block_vars($blockname, $vararray)
{
@@ -398,7 +398,7 @@ class template
* and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
*
* @return false on error, true on success
- * @access: public
+ * @access public
*/
function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert')
{
@@ -484,7 +484,7 @@ class template
/**
* Include a seperate template
- * @access: private
+ * @access private
*/
function _tpl_include($filename, $include = true)
{
diff --git a/phpBB/includes/utf/utf_normalizer.php b/phpBB/includes/utf/utf_normalizer.php
index 0b567fad6b..613a1098a7 100644
--- a/phpBB/includes/utf/utf_normalizer.php
+++ b/phpBB/includes/utf/utf_normalizer.php
@@ -28,1443 +28,1184 @@ define('UTF8_CJK_B_FIRST', "\xF0\xA0\x80\x80");
define('UTF8_CJK_B_LAST', "\xF0\xAA\x9B\x96");
+// Wrapper for the utfnormal extension, ICU wrapper
if (function_exists('utf8_normalize'))
{
+ define('UNORM_NONE', 1);
+ define('UNORM_NFD', 2);
+ define('UNORM_NFKD', 3);
+ define('UNORM_NFC', 4);
+ define('UNORM_NFKC', 5);
+ define('UNORM_FCD', 6);
+ define('UNORM_DEFAULT', UNORM_NFC);
-////////////////////////////////////////////////////////////////////////////////
-// Wrapper for the utfnormal extension, ICU wrapper //
-////////////////////////////////////////////////////////////////////////////////
-
-define('UNORM_NONE', 1);
-define('UNORM_NFD', 2);
-define('UNORM_NFKD', 3);
-define('UNORM_NFC', 4);
-define('UNORM_NFKC', 5);
-define('UNORM_FCD', 6);
-define('UNORM_DEFAULT', UNORM_NFC);
-
-/**
-* utf_normalizer class for the utfnormal extension
-*
-* @ignore
-*/
-class utf_normalizer
-{
- function cleanup($str)
+ /**
+ * utf_normalizer class for the utfnormal extension
+ *
+ * @ignore
+ */
+ class utf_normalizer
{
- /**
- * The string below is the list of all autorized characters, sorted by
- * frequency in latin text
- */
- $pos = strspn(
- $str,
- "\x20\x65\x69\x61\x73\x6E\x74\x72\x6F\x6C\x75\x64\x5D\x5B\x63\x6D\x70\x27\x0A\x67\x7C\x68\x76\x2E\x66\x62\x2C\x3A\x3D\x2D\x71\x31\x30\x43\x32\x2A\x79\x78\x29\x28\x4C\x39\x41\x53\x2F\x50\x22\x45\x6A\x4D\x49\x6B\x33\x3E\x35\x54\x3C\x44\x34\x7D\x42\x7B\x38\x46\x77\x52\x36\x37\x55\x47\x4E\x3B\x4A\x7A\x56\x23\x48\x4F\x57\x5F\x26\x21\x4B\x3F\x58\x51\x25\x59\x5C\x09\x5A\x2B\x7E\x5E\x24\x40\x60\x7F\x0D"
- );
-
- if (!isset($str[$pos]))
+ function cleanup($str)
{
/**
- * ASCII strings with no special chars return immediately
+ * The string below is the list of all autorized characters, sorted by
+ * frequency in latin text
*/
- return $str;
- }
+ $pos = strspn($str, "\x20\x65\x69\x61\x73\x6E\x74\x72\x6F\x6C\x75\x64\x5D\x5B\x63\x6D\x70\x27\x0A\x67\x7C\x68\x76\x2E\x66\x62\x2C\x3A\x3D\x2D\x71\x31\x30\x43\x32\x2A\x79\x78\x29\x28\x4C\x39\x41\x53\x2F\x50\x22\x45\x6A\x4D\x49\x6B\x33\x3E\x35\x54\x3C\x44\x34\x7D\x42\x7B\x38\x46\x77\x52\x36\x37\x55\x47\x4E\x3B\x4A\x7A\x56\x23\x48\x4F\x57\x5F\x26\x21\x4B\x3F\x58\x51\x25\x59\x5C\x09\x5A\x2B\x7E\x5E\x24\x40\x60\x7F\x0D");
- /**
- * Check if there is potentially a U+FFFE or U+FFFF char (UTF sequence
- * 0xEFBFBE or 0xEFBFBF) and replace them
- *
- * Note: we start searching at position $pos
- */
- if (is_int(strpos($str, "\xEF\xBF", $pos)))
- {
- $str = str_replace(
- array("\xEF\xBF\xBE", "\xEF\xBF\xBF"),
- array(UTF8_REPLACEMENT, UTF8_REPLACEMENT),
- $str
+ if (!isset($str[$pos]))
+ {
+ // ASCII strings with no special chars return immediately
+ return $str;
+ }
+
+ // Check if there is potentially a U+FFFE or U+FFFF char (UTF sequence 0xEFBFBE or 0xEFBFBF) and replace them
+ // Note: we start searching at position $pos
+ if (is_int(strpos($str, "\xEF\xBF", $pos)))
+ {
+ $str = str_replace(
+ array("\xEF\xBF\xBE", "\xEF\xBF\xBF"),
+ array(UTF8_REPLACEMENT, UTF8_REPLACEMENT),
+ $str
+ );
+ }
+
+ // Replace any byte in the range 0x00..0x1F, except for \r, \n and \t
+ // We replace those characters with a 0xFF byte, which is illegal in
+ // UTF-8 and will in turn be replaced with a Unicode replacement char
+ $str = strtr(
+ $str,
+ "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F",
+ "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
);
- }
- /**
- * Replace any byte in the range 0x00..0x1F, except for \r, \n and \t
- *
- * We replace those characters with a 0xFF byte, which is illegal in
- * UTF-8 and will in turn be replaced with a Unicode replacement char
- */
- $str = strtr(
- $str,
- "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F",
- "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
- );
+ // As per the original implementation, "the UnicodeString constructor fails if the string ends with a head byte".
+ // Therefore, if the string ends with a leading byte we replace it with 0xFF, which is illegal too and will be
+ // replaced with a Unicode replacement character
+ if (substr($str, -1) >= "\xC0")
+ {
+ $str[strlen($str) - 1] = "\xFF";
+ }
- /**
- * As per the original implementation, "the UnicodeString constructor fails
- * if the string ends with a head byte". Therefore, if the string ends with
- * a leading byte we replace it with 0xFF, which is illegal too and will be
- * replaced with a Unicode replacement character
- */
- if (substr($str, -1) >= "\xC0")
- {
- $str[strlen($str) - 1] = "\xFF";
+ return utf8_normalize($str, UNORM_NFC);
}
- return utf8_normalize($str, UNORM_NFC);
- }
-
- function nfc($str)
- {
- return utf8_normalize($str, UNORM_NFC);
- }
+ function nfc($str)
+ {
+ return utf8_normalize($str, UNORM_NFC);
+ }
- function nfkc($str)
- {
- return utf8_normalize($str, UNORM_NFKC);
- }
+ function nfkc($str)
+ {
+ return utf8_normalize($str, UNORM_NFKC);
+ }
- function nfd($str)
- {
- return utf8_normalize($str, UNORM_NFD);
- }
+ function nfd($str)
+ {
+ return utf8_normalize($str, UNORM_NFD);
+ }
- function nfkd($str)
- {
- return utf8_normalize($str, UNORM_NFKD);
+ function nfkd($str)
+ {
+ return utf8_normalize($str, UNORM_NFKD);
+ }
}
}
-
-////////////////////////////////////////////////////////////////////////////////
-// End of the ICU wrapper //
-////////////////////////////////////////////////////////////////////////////////
-
-
-}
else
{
+ // This block will NOT be loaded if the utfnormal extension is
+
+ // Unset global variables
+ unset($GLOBALS['utf_jamo_index'], $GLOBALS['utf_jamo_type'], $GLOBALS['utf_nfc_qc'], $GLOBALS['utf_combining_class'], $GLOBALS['utf_canonical_comp'], $GLOBALS['utf_canonical_decomp'], $GLOBALS['utf_nfkc_qc'], $GLOBALS['utf_compatibility_decomp']);
+
+ // NFC_QC and NFKC_QC values
+ define('UNICODE_QC_MAYBE', 0);
+ define('UNICODE_QC_NO', 1);
+
+ // Contains all the ASCII characters appearing in UTF-8, sorted by frequency
+ define('UTF8_ASCII_RANGE', "\x20\x65\x69\x61\x73\x6E\x74\x72\x6F\x6C\x75\x64\x5D\x5B\x63\x6D\x70\x27\x0A\x67\x7C\x68\x76\x2E\x66\x62\x2C\x3A\x3D\x2D\x71\x31\x30\x43\x32\x2A\x79\x78\x29\x28\x4C\x39\x41\x53\x2F\x50\x22\x45\x6A\x4D\x49\x6B\x33\x3E\x35\x54\x3C\x44\x34\x7D\x42\x7B\x38\x46\x77\x52\x36\x37\x55\x47\x4E\x3B\x4A\x7A\x56\x23\x48\x4F\x57\x5F\x26\x21\x4B\x3F\x58\x51\x25\x59\x5C\x09\x5A\x2B\x7E\x5E\x24\x40\x60\x7F\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F");
+
+ // Contains all the tail bytes that can appear in the composition of a UTF-8 char
+ define('UTF8_TRAILING_BYTES', "\xA9\xA0\xA8\x80\xAA\x99\xA7\xBB\xAB\x89\x94\x82\xB4\xA2\xAE\x83\xB0\xB9\xB8\x93\xAF\xBC\xB3\x81\xA4\xB2\x9C\xA1\xB5\xBE\xBD\xBA\x98\xAD\xB1\x84\x95\xA6\xB6\x88\x8D\x90\xB7\xBF\x92\x85\xA5\x97\x8C\x86\xA3\x8E\x9F\x8F\x87\x91\x9D\xAC\x9E\x8B\x96\x9B\x8A\x9A");
+
+ // Constants used by the Hangul [de]composition algorithms
+ define('UNICODE_HANGUL_SBASE', 0xAC00);
+ define('UNICODE_HANGUL_LBASE', 0x1100);
+ define('UNICODE_HANGUL_VBASE', 0x1161);
+ define('UNICODE_HANGUL_TBASE', 0x11A7);
+ define('UNICODE_HANGUL_SCOUNT', 11172);
+ define('UNICODE_HANGUL_LCOUNT', 19);
+ define('UNICODE_HANGUL_VCOUNT', 21);
+ define('UNICODE_HANGUL_TCOUNT', 28);
+ define('UNICODE_HANGUL_NCOUNT', 588);
+ define('UNICODE_JAMO_L', 0);
+ define('UNICODE_JAMO_V', 1);
+ define('UNICODE_JAMO_T', 2);
-
-////////////////////////////////////////////////////////////////////////////////
-// This block will NOT be loaded if the utfnormal extension is //
-////////////////////////////////////////////////////////////////////////////////
-
-/**
-* Unset global variables
-*/
-unset($GLOBALS['utf_jamo_index'], $GLOBALS['utf_jamo_type'], $GLOBALS['utf_nfc_qc'], $GLOBALS['utf_combining_class'], $GLOBALS['utf_canonical_comp'], $GLOBALS['utf_canonical_decomp'], $GLOBALS['utf_nfkc_qc'], $GLOBALS['utf_compatibility_decomp']);
-
-/**
-* NFC_QC and NFKC_QC values
-*/
-define('UNICODE_QC_MAYBE', 0);
-define('UNICODE_QC_NO', 1);
-
-/**
-* Contains all the ASCII characters appearing in UTF-8, sorted by frequency
-*/
-define('UTF8_ASCII_RANGE', "\x20\x65\x69\x61\x73\x6E\x74\x72\x6F\x6C\x75\x64\x5D\x5B\x63\x6D\x70\x27\x0A\x67\x7C\x68\x76\x2E\x66\x62\x2C\x3A\x3D\x2D\x71\x31\x30\x43\x32\x2A\x79\x78\x29\x28\x4C\x39\x41\x53\x2F\x50\x22\x45\x6A\x4D\x49\x6B\x33\x3E\x35\x54\x3C\x44\x34\x7D\x42\x7B\x38\x46\x77\x52\x36\x37\x55\x47\x4E\x3B\x4A\x7A\x56\x23\x48\x4F\x57\x5F\x26\x21\x4B\x3F\x58\x51\x25\x59\x5C\x09\x5A\x2B\x7E\x5E\x24\x40\x60\x7F\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F");
-
-/**
-* Contains all the tail bytes that can appear in the composition of a UTF-8 char
-*/
-define('UTF8_TRAILING_BYTES', "\xA9\xA0\xA8\x80\xAA\x99\xA7\xBB\xAB\x89\x94\x82\xB4\xA2\xAE\x83\xB0\xB9\xB8\x93\xAF\xBC\xB3\x81\xA4\xB2\x9C\xA1\xB5\xBE\xBD\xBA\x98\xAD\xB1\x84\x95\xA6\xB6\x88\x8D\x90\xB7\xBF\x92\x85\xA5\x97\x8C\x86\xA3\x8E\x9F\x8F\x87\x91\x9D\xAC\x9E\x8B\x96\x9B\x8A\x9A");
-
-/**
-* Constants used by the Hangul [de]composition algorithms
-*/
-define('UNICODE_HANGUL_SBASE', 0xAC00);
-define('UNICODE_HANGUL_LBASE', 0x1100);
-define('UNICODE_HANGUL_VBASE', 0x1161);
-define('UNICODE_HANGUL_TBASE', 0x11A7);
-define('UNICODE_HANGUL_SCOUNT', 11172);
-define('UNICODE_HANGUL_LCOUNT', 19);
-define('UNICODE_HANGUL_VCOUNT', 21);
-define('UNICODE_HANGUL_TCOUNT', 28);
-define('UNICODE_HANGUL_NCOUNT', 588);
-define('UNICODE_JAMO_L', 0);
-define('UNICODE_JAMO_V', 1);
-define('UNICODE_JAMO_T', 2);
-
-/**
-* Unicode normalization routines
-*
-* @package phpBB3
-*/
-class utf_normalizer
-{
/**
- * Validate, cleanup and normalize a string
- *
- * The ultimate convenience function! Clean up invalid UTF-8 sequences,
- * and convert to Normal Form C, canonical composition.
+ * Unicode normalization routines
*
- * @param string $str The dirty string
- * @return string The same string, all shiny and cleaned-up
+ * @package phpBB3
*/
- function cleanup($str)
+ class utf_normalizer
{
/**
- * The string below is the list of all autorized characters, sorted by
- * frequency in latin text
+ * Validate, cleanup and normalize a string
+ *
+ * The ultimate convenience function! Clean up invalid UTF-8 sequences,
+ * and convert to Normal Form C, canonical composition.
+ *
+ * @param string $str The dirty string
+ * @return string The same string, all shiny and cleaned-up
*/
- $pos = strspn($str, "\x20\x65\x69\x61\x73\x6E\x74\x72\x6F\x6C\x75\x64\x5D\x5B\x63\x6D\x70\x27\x0A\x67\x7C\x68\x76\x2E\x66\x62\x2C\x3A\x3D\x2D\x71\x31\x30\x43\x32\x2A\x79\x78\x29\x28\x4C\x39\x41\x53\x2F\x50\x22\x45\x6A\x4D\x49\x6B\x33\x3E\x35\x54\x3C\x44\x34\x7D\x42\x7B\x38\x46\x77\x52\x36\x37\x55\x47\x4E\x3B\x4A\x7A\x56\x23\x48\x4F\x57\x5F\x26\x21\x4B\x3F\x58\x51\x25\x59\x5C\x09\x5A\x2B\x7E\x5E\x24\x40\x60\x7F\x0D");
- $len = strlen($str);
-
- if ($pos == $len)
+ function cleanup($str)
{
- /**
- * ASCII strings with no special chars return immediately
- */
- return $str;
- }
+ // The string below is the list of all autorized characters, sorted by frequency in latin text
+ $pos = strspn($str, "\x20\x65\x69\x61\x73\x6E\x74\x72\x6F\x6C\x75\x64\x5D\x5B\x63\x6D\x70\x27\x0A\x67\x7C\x68\x76\x2E\x66\x62\x2C\x3A\x3D\x2D\x71\x31\x30\x43\x32\x2A\x79\x78\x29\x28\x4C\x39\x41\x53\x2F\x50\x22\x45\x6A\x4D\x49\x6B\x33\x3E\x35\x54\x3C\x44\x34\x7D\x42\x7B\x38\x46\x77\x52\x36\x37\x55\x47\x4E\x3B\x4A\x7A\x56\x23\x48\x4F\x57\x5F\x26\x21\x4B\x3F\x58\x51\x25\x59\x5C\x09\x5A\x2B\x7E\x5E\x24\x40\x60\x7F\x0D");
+ $len = strlen($str);
- /**
- * Note: we do not check for $GLOBALS['utf_canonical_decomp']. It is assumed
- * they are always loaded together
- */
- if (!isset($GLOBALS['utf_nfc_qc']))
- {
- global $phpbb_root_path, $phpEx;
- include($phpbb_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx);
+ if ($pos == $len)
+ {
+ // ASCII strings with no special chars return immediately
+ return $str;
+ }
+
+ // Note: we do not check for $GLOBALS['utf_canonical_decomp']. It is assumed they are always loaded together
+ if (!isset($GLOBALS['utf_nfc_qc']))
+ {
+ global $phpbb_root_path, $phpEx;
+ include($phpbb_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx);
+ }
+
+ // Replace any byte in the range 0x00..0x1F, except for \r, \n and \t
+ // We replace those characters with a 0xFF byte, which is illegal in UTF-8 and will in turn be replaced with a UTF replacement char
+ return utf_normalizer::recompose(
+ strtr(
+ $str,
+ "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F",
+ "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
+ ),
+ $pos, $len, $GLOBALS['utf_nfc_qc'], $GLOBALS['utf_canonical_decomp']
+ );
}
/**
- * Replace any byte in the range 0x00..0x1F, except for \r, \n and \t
+ * Validate and normalize a UTF string to NFC
*
- * We replace those characters with a 0xFF byte, which is illegal in
- * UTF-8 and will in turn be replaced with a UTF replacement char
+ * @param string $str Unchecked UTF string
+ * @return string The string, validated and in normal form
*/
- return utf_normalizer::recompose(
- strtr(
- $str,
- "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F",
- "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
- ),
- $pos, $len, $GLOBALS['utf_nfc_qc'], $GLOBALS['utf_canonical_decomp']
- );
- }
-
- /**
- * Validate and normalize a UTF string to NFC
- *
- * @param string $str Unchecked UTF string
- * @return string The string, validated and in normal form
- */
- function nfc($str)
- {
- $pos = strspn($str, UTF8_ASCII_RANGE);
- $len = strlen($str);
-
- if ($pos == $len)
+ function nfc($str)
{
- /**
- * ASCII strings return immediately
- */
- return $str;
- }
+ $pos = strspn($str, UTF8_ASCII_RANGE);
+ $len = strlen($str);
- if (!isset($GLOBALS['utf_nfc_qc']))
- {
- global $phpbb_root_path, $phpEx;
- include($phpbb_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx);
- }
-
- return utf_normalizer::recompose($str, $pos, $len, $GLOBALS['utf_nfc_qc'], $GLOBALS['utf_canonical_decomp']);
- }
+ if ($pos == $len)
+ {
+ // ASCII strings return immediately
+ return $str;
+ }
- /**
- * Validate and normalize a UTF string to NFKC
- *
- * @param string $str Unchecked UTF string
- * @return string The string, validated and in normal form
- */
- function nfkc($str)
- {
- $pos = strspn($str, UTF8_ASCII_RANGE);
- $len = strlen($str);
+ if (!isset($GLOBALS['utf_nfc_qc']))
+ {
+ global $phpbb_root_path, $phpEx;
+ include($phpbb_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx);
+ }
- if ($pos == $len)
- {
- /**
- * ASCII strings return immediately
- */
- return $str;
+ return utf_normalizer::recompose($str, $pos, $len, $GLOBALS['utf_nfc_qc'], $GLOBALS['utf_canonical_decomp']);
}
- if (!isset($GLOBALS['utf_nfkc_qc']))
- {
- global $phpbb_root_path, $phpEx;
- include($phpbb_root_path . 'includes/utf/data/utf_nfkc_qc.' . $phpEx);
- }
- if (!isset($GLOBALS['utf_canonical_comp']))
+ /**
+ * Validate and normalize a UTF string to NFKC
+ *
+ * @param string $str Unchecked UTF string
+ * @return string The string, validated and in normal form
+ */
+ function nfkc($str)
{
- global $phpbb_root_path, $phpEx;
- include($phpbb_root_path . 'includes/utf/data/utf_canonical_comp.' . $phpEx);
- }
+ $pos = strspn($str, UTF8_ASCII_RANGE);
+ $len = strlen($str);
- return utf_normalizer::recompose($str, $pos, $len, $GLOBALS['utf_nfkc_qc'], $GLOBALS['utf_compatibility_decomp']);
- }
+ if ($pos == $len)
+ {
+ // ASCII strings return immediately
+ return $str;
+ }
- /**
- * Validate and normalize a UTF string to NFD
- *
- * @param string $str Unchecked UTF string
- * @return string The string, validated and in normal form
- */
- function nfd($str)
- {
- $pos = strspn($str, UTF8_ASCII_RANGE);
- $len = strlen($str);
+ if (!isset($GLOBALS['utf_nfkc_qc']))
+ {
+ global $phpbb_root_path, $phpEx;
+ include($phpbb_root_path . 'includes/utf/data/utf_nfkc_qc.' . $phpEx);
+ }
- if ($pos == $len)
- {
- /**
- * ASCII strings return immediately
- */
- return $str;
+ if (!isset($GLOBALS['utf_canonical_comp']))
+ {
+ global $phpbb_root_path, $phpEx;
+ include($phpbb_root_path . 'includes/utf/data/utf_canonical_comp.' . $phpEx);
+ }
+
+ return utf_normalizer::recompose($str, $pos, $len, $GLOBALS['utf_nfkc_qc'], $GLOBALS['utf_compatibility_decomp']);
}
- if (!isset($GLOBALS['utf_canonical_decomp']))
+ /**
+ * Validate and normalize a UTF string to NFD
+ *
+ * @param string $str Unchecked UTF string
+ * @return string The string, validated and in normal form
+ */
+ function nfd($str)
{
- global $phpbb_root_path, $phpEx;
- include($phpbb_root_path . 'includes/utf/data/utf_canonical_decomp.' . $phpEx);
- }
+ $pos = strspn($str, UTF8_ASCII_RANGE);
+ $len = strlen($str);
- return utf_normalizer::decompose($str, $pos, $len, $GLOBALS['utf_canonical_decomp']);
- }
+ if ($pos == $len)
+ {
+ // ASCII strings return immediately
+ return $str;
+ }
- /**
- * Validate and normalize a UTF string to NFKD
- *
- * @param string $str Unchecked UTF string
- * @return string The string, validated and in normal form
- */
- function nfkd($str)
- {
- $pos = strspn($str, UTF8_ASCII_RANGE);
- $len = strlen($str);
+ if (!isset($GLOBALS['utf_canonical_decomp']))
+ {
+ global $phpbb_root_path, $phpEx;
+ include($phpbb_root_path . 'includes/utf/data/utf_canonical_decomp.' . $phpEx);
+ }
- if ($pos == $len)
- {
- /**
- * ASCII strings return immediately
- */
- return $str;
+ return utf_normalizer::decompose($str, $pos, $len, $GLOBALS['utf_canonical_decomp']);
}
- if (!isset($GLOBALS['utf_compatibility_decomp']))
+ /**
+ * Validate and normalize a UTF string to NFKD
+ *
+ * @param string $str Unchecked UTF string
+ * @return string The string, validated and in normal form
+ */
+ function nfkd($str)
{
- global $phpbb_root_path, $phpEx;
- include($phpbb_root_path . 'includes/utf/data/utf_compatibility_decomp.' . $phpEx);
- }
+ $pos = strspn($str, UTF8_ASCII_RANGE);
+ $len = strlen($str);
- return utf_normalizer::decompose($str, $pos, $len, $GLOBALS['utf_compatibility_decomp']);
- }
+ if ($pos == $len)
+ {
+ // ASCII strings return immediately
+ return $str;
+ }
+ if (!isset($GLOBALS['utf_compatibility_decomp']))
+ {
+ global $phpbb_root_path, $phpEx;
+ include($phpbb_root_path . 'includes/utf/data/utf_compatibility_decomp.' . $phpEx);
+ }
- ////////////////////////////////////////////////////////////////////////////
- // Internal functions //
- ////////////////////////////////////////////////////////////////////////////
+ return utf_normalizer::decompose($str, $pos, $len, $GLOBALS['utf_compatibility_decomp']);
+ }
- /**
- * Recompose a UTF string
- *
- * @param string $str Unchecked UTF string
- * @param integer $pos Position of the first UTF char (in bytes)
- * @param integer $len Length of the string (in bytes)
- * @param array $qc Quick-check array, passed by reference but never modified
- * @param array $decomp_map Decomposition mapping, passed by reference but never modified
- * @return string The string, validated and recomposed
- *
- * @access private
- */
- function recompose($str, $pos, $len, &$qc, &$decomp_map)
- {
- global $utf_combining_class, $utf_canonical_comp, $utf_jamo_type, $utf_jamo_index;
/**
- * Load some commonly-used tables
+ * Recompose a UTF string
+ *
+ * @param string $str Unchecked UTF string
+ * @param integer $pos Position of the first UTF char (in bytes)
+ * @param integer $len Length of the string (in bytes)
+ * @param array $qc Quick-check array, passed by reference but never modified
+ * @param array $decomp_map Decomposition mapping, passed by reference but never modified
+ * @return string The string, validated and recomposed
+ *
+ * @access private
*/
- if (!isset($utf_jamo_index, $utf_jamo_type, $utf_combining_class))
+ function recompose($str, $pos, $len, &$qc, &$decomp_map)
{
- global $phpbb_root_path;
- include($phpbb_root_path . 'includes/utf/data/utf_normalizer_common.php');
- }
+ global $utf_combining_class, $utf_canonical_comp, $utf_jamo_type, $utf_jamo_index;
- /**
- * Buffer the last ASCII char before the UTF-8 stuff if applicable
- */
- $tmp = '';
- $i = $tmp_pos = $last_cc = 0;
+ // Load some commonly-used tables
+ if (!isset($utf_jamo_index, $utf_jamo_type, $utf_combining_class))
+ {
+ global $phpbb_root_path;
+ include($phpbb_root_path . 'includes/utf/data/utf_normalizer_common.php');
+ }
- if ($pos)
- {
- $buffer = array(++$i => $str[$pos - 1]);
- }
- else
- {
- $buffer = array();
- }
+ // Buffer the last ASCII char before the UTF-8 stuff if applicable
+ $tmp = '';
+ $i = $tmp_pos = $last_cc = 0;
- /**
- * UTF char length array
- *
- * This array is used to determine the length of a UTF character. Be $c the
- * result of ($str[$pos] & "\xF0") --where $str is the string we're operating
- * on and $pos the position of the cursor--, if $utf_len_mask[$c] does not
- * exist, the byte is an ASCII char. Otherwise, if $utf_len_mask[$c] is greater
- * than 0, we have a the leading byte of a multibyte character whose length is
- * $utf_len_mask[$c] and if it is equal to 0, the byte is a trailing byte.
- */
- $utf_len_mask = array(
- /**
- * Leading bytes masks
- */
- "\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4,
+ if ($pos)
+ {
+ $buffer = array(++$i => $str[$pos - 1]);
+ }
+ else
+ {
+ $buffer = array();
+ }
- /**
- * Trailing bytes masks
- */
- "\x80" => 0, "\x90" => 0, "\xA0" => 0, "\xB0" => 0
- );
-
- $extra_check = array(
- "\xED"=>1, "\xEF"=>1, "\xC0"=>1, "\xC1"=>1, "\xE0"=>1, "\xF0"=>1,
- "\xF4"=>1, "\xF5"=>1, "\xF6"=>1, "\xF7"=>1, "\xF8"=>1, "\xF9"=>1,
- "\xFA"=>1, "\xFB"=>1, "\xFC"=>1, "\xFD"=>1, "\xFE"=>1, "\xFF"=>1
- );
-
- $utf_validation_mask = array(
- 2 => "\xE0\xC0",
- 3 => "\xF0\xC0\xC0",
- 4 => "\xF8\xC0\xC0\xC0"
- );
-
- $utf_validation_check = array(
- 2 => "\xC0\x80",
- 3 => "\xE0\x80\x80",
- 4 => "\xF0\x80\x80\x80"
- );
-
- ////////////////////////////////////////////////////////////////////////
- // Main loop //
- ////////////////////////////////////////////////////////////////////////
-
- do
- {
- ////////////////////////////////////////////////////////////////////
- // STEP 0: Capture the current char and buffer it //
- ////////////////////////////////////////////////////////////////////
+ // UTF char length array
+ // This array is used to determine the length of a UTF character.
+ // Be $c the result of ($str[$pos] & "\xF0") --where $str is the string we're operating on and $pos
+ // the position of the cursor--, if $utf_len_mask[$c] does not exist, the byte is an ASCII char.
+ // Otherwise, if $utf_len_mask[$c] is greater than 0, we have a the leading byte of a multibyte character
+ // whose length is $utf_len_mask[$c] and if it is equal to 0, the byte is a trailing byte.
+ $utf_len_mask = array(
+ // Leading bytes masks
+ "\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4,
+ // Trailing bytes masks
+ "\x80" => 0, "\x90" => 0, "\xA0" => 0, "\xB0" => 0
+ );
+
+ $extra_check = array(
+ "\xED" => 1, "\xEF" => 1, "\xC0" => 1, "\xC1" => 1, "\xE0" => 1, "\xF0" => 1,
+ "\xF4" => 1, "\xF5" => 1, "\xF6" => 1, "\xF7" => 1, "\xF8" => 1, "\xF9" => 1,
+ "\xFA" => 1, "\xFB" => 1, "\xFC" => 1, "\xFD" => 1, "\xFE" => 1, "\xFF" => 1
+ );
+
+ $utf_validation_mask = array(
+ 2 => "\xE0\xC0",
+ 3 => "\xF0\xC0\xC0",
+ 4 => "\xF8\xC0\xC0\xC0"
+ );
- $c = $str[$pos];
- $c_mask = $c & "\xF0";
+ $utf_validation_check = array(
+ 2 => "\xC0\x80",
+ 3 => "\xE0\x80\x80",
+ 4 => "\xF0\x80\x80\x80"
+ );
- if (isset($utf_len_mask[$c_mask]))
+ // Main loop
+ do
{
- /**
- * Byte at $pos is either a leading byte or a missplaced trailing byte
- */
- if ($utf_len = $utf_len_mask[$c_mask])
+ // STEP 0: Capture the current char and buffer it
+ $c = $str[$pos];
+ $c_mask = $c & "\xF0";
+
+ if (isset($utf_len_mask[$c_mask]))
{
- /**
- * Capture the char
- */
- $buffer[++$i & 7] = $utf_char = substr($str, $pos, $utf_len);
-
- /**
- * Let's find out if a thorough check is needed
- */
- if (isset($qc[$utf_char]))
- {
- /**
- * If the UTF char is in the qc array then it may not be in normal
- * form. We do nothing here, the actual processing is below this
- * "if" block
- */
- }
- elseif (isset($utf_combining_class[$utf_char]))
+ // Byte at $pos is either a leading byte or a missplaced trailing byte
+ if ($utf_len = $utf_len_mask[$c_mask])
{
- if ($utf_combining_class[$utf_char] < $last_cc)
+ // Capture the char
+ $buffer[++$i & 7] = $utf_char = substr($str, $pos, $utf_len);
+
+ // Let's find out if a thorough check is needed
+ if (isset($qc[$utf_char]))
{
- /**
- * A combining character that is NOT canonically ordered
- */
+ // If the UTF char is in the qc array then it may not be in normal form. We do nothing here, the actual processing is below this "if" block
}
- else
+ else if (isset($utf_combining_class[$utf_char]))
{
- /**
- * A combining character that IS canonically ordered, skip
- * to the next char
- */
- $last_cc = $utf_combining_class[$utf_char];
-
- $pos += $utf_len;
- continue;
- }
- }
- else
- {
- /**
- * At this point, $utf_char holds a UTF char that we know
- * is not a NF[K]C_QC and is not a combining character. It can
- * be a singleton, a canonical composite, a replacement char or
- * an even an ill-formed bunch of bytes. Let's find out
- */
- $last_cc = 0;
-
- /**
- * Check that we have the correct number of trailing bytes
- */
- if (($utf_char & $utf_validation_mask[$utf_len]) != $utf_validation_check[$utf_len])
- {
- /**
- * Current char isn't well-formed or legal: either one or
- * several trailing bytes are missing, or the Unicode char
- * has been encoded in a five- or six- byte sequence
- */
- if ($utf_char[0] >= "\xF8")
+ if ($utf_combining_class[$utf_char] < $last_cc)
{
- if ($utf_char[0] < "\xF8")
- {
- $trailing_bytes = 3;
- }
- elseif ($utf_char[0] < "\xFC")
- {
- $trailing_bytes = 4;
- }
- if ($utf_char[0] > "\xFD")
- {
- $trailing_bytes = 0;
- }
- else
- {
- $trailing_bytes = 5;
- }
+ // A combining character that is NOT canonically ordered
}
else
{
- $trailing_bytes = $utf_len - 1;
- }
-
- $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
- $pos += strspn($str, UTF8_TRAILING_BYTES, ++$pos, $trailing_bytes);
- $tmp_pos = $pos;
+ // A combining character that IS canonically ordered, skip to the next char
+ $last_cc = $utf_combining_class[$utf_char];
- continue;
+ $pos += $utf_len;
+ continue;
+ }
}
-
- if (isset($extra_check[$c]))
+ else
{
- switch($c)
+ // At this point, $utf_char holds a UTF char that we know is not a NF[K]C_QC and is not a combining character.
+ // It can be a singleton, a canonical composite, a replacement char or an even an ill-formed bunch of bytes. Let's find out
+ $last_cc = 0;
+
+ // Check that we have the correct number of trailing bytes
+ if (($utf_char & $utf_validation_mask[$utf_len]) != $utf_validation_check[$utf_len])
{
- /**
- * Note: 0xED is quite common in Korean
- */
- case "\xED":
- if ($utf_char >= "\xED\xA0\x80")
+ // Current char isn't well-formed or legal: either one or several trailing bytes are missing, or the Unicode char
+ // has been encoded in a five- or six- byte sequence
+ if ($utf_char[0] >= "\xF8")
+ {
+ if ($utf_char[0] < "\xF8")
{
- /**
- * Surrogates (U+D800..U+DFFF) are not allowed in UTF-8
- * (UTF sequence 0xEDA080..0xEDBFBF)
- */
- $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
- $pos += $utf_len;
- $tmp_pos = $pos;
- continue 2;
+ $trailing_bytes = 3;
}
- break;
-
- /**
- * Note: 0xEF is quite common in Japanese
- */
- case "\xEF":
- if ($utf_char == "\xEF\xBF\xBE" || $utf_char == "\xEF\xBF\xBF")
+ else if ($utf_char[0] < "\xFC")
{
- /**
- * U+FFFE and U+FFFF are explicitly disallowed
- * (UTF sequence 0xEFBFBE..0xEFBFBF)
- */
- $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
- $pos += $utf_len;
- $tmp_pos = $pos;
- continue 2;
+ $trailing_bytes = 4;
}
- break;
- case "\xC0":
- case "\xC1":
- if ($utf_char <= "\xC1\xBF")
+ if ($utf_char[0] > "\xFD")
{
- /**
- * Overlong sequence: Unicode char U+0000..U+007F encoded as a
- * double-byte UTF char
- */
- $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
- $pos += $utf_len;
- $tmp_pos = $pos;
- continue 2;
+ $trailing_bytes = 0;
}
- break;
-
- case "\xE0":
- if ($utf_char <= "\xE0\x9F\xBF")
+ else
{
- /**
- * Unicode char U+0000..U+07FF encoded in 3 bytes
- */
- $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
- $pos += $utf_len;
- $tmp_pos = $pos;
- continue 2;
+ $trailing_bytes = 5;
}
- break;
+ }
+ else
+ {
+ $trailing_bytes = $utf_len - 1;
+ }
- case "\xF0":
- if ($utf_char <= "\xF0\x8F\xBF\xBF")
- {
- /**
- * Unicode char U+0000..U+FFFF encoded in 4 bytes
- */
- $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
- $pos += $utf_len;
- $tmp_pos = $pos;
- continue 2;
- }
+ $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
+ $pos += strspn($str, UTF8_TRAILING_BYTES, ++$pos, $trailing_bytes);
+ $tmp_pos = $pos;
+
+ continue;
+ }
+
+ if (isset($extra_check[$c]))
+ {
+ switch ($c)
+ {
+ // Note: 0xED is quite common in Korean
+ case "\xED":
+ if ($utf_char >= "\xED\xA0\x80")
+ {
+ // Surrogates (U+D800..U+DFFF) are not allowed in UTF-8 (UTF sequence 0xEDA080..0xEDBFBF)
+ $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
+ $pos += $utf_len;
+ $tmp_pos = $pos;
+ continue 2;
+ }
break;
- default:
- /**
- * Five- and six- byte sequences do not need being checked for here anymore
- */
- if ($utf_char > UTF8_MAX)
- {
- /**
- * Out of the Unicode range
- */
- if ($utf_char[0] < "\xF8")
+ // Note: 0xEF is quite common in Japanese
+ case "\xEF":
+ if ($utf_char == "\xEF\xBF\xBE" || $utf_char == "\xEF\xBF\xBF")
{
- $trailing_bytes = 3;
+ // U+FFFE and U+FFFF are explicitly disallowed (UTF sequence 0xEFBFBE..0xEFBFBF)
+ $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
+ $pos += $utf_len;
+ $tmp_pos = $pos;
+ continue 2;
}
- elseif ($utf_char[0] < "\xFC")
+ break;
+
+ case "\xC0":
+ case "\xC1":
+ if ($utf_char <= "\xC1\xBF")
{
- $trailing_bytes = 4;
+ // Overlong sequence: Unicode char U+0000..U+007F encoded as a double-byte UTF char
+ $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
+ $pos += $utf_len;
+ $tmp_pos = $pos;
+ continue 2;
}
- elseif ($utf_char[0] > "\xFD")
+ break;
+
+ case "\xE0":
+ if ($utf_char <= "\xE0\x9F\xBF")
{
- $trailing_bytes = 0;
+ // Unicode char U+0000..U+07FF encoded in 3 bytes
+ $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
+ $pos += $utf_len;
+ $tmp_pos = $pos;
+ continue 2;
}
- else
+ break;
+
+ case "\xF0":
+ if ($utf_char <= "\xF0\x8F\xBF\xBF")
{
- $trailing_bytes = 5;
+ // Unicode char U+0000..U+FFFF encoded in 4 bytes
+ $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
+ $pos += $utf_len;
+ $tmp_pos = $pos;
+ continue 2;
}
+ break;
- $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
- $pos += strspn($str, UTF8_TRAILING_BYTES, ++$pos, $trailing_bytes);
- $tmp_pos = $pos;
- continue 2;
- }
+ default:
+ // Five- and six- byte sequences do not need being checked for here anymore
+ if ($utf_char > UTF8_MAX)
+ {
+ // Out of the Unicode range
+ if ($utf_char[0] < "\xF8")
+ {
+ $trailing_bytes = 3;
+ }
+ else if ($utf_char[0] < "\xFC")
+ {
+ $trailing_bytes = 4;
+ }
+ else if ($utf_char[0] > "\xFD")
+ {
+ $trailing_bytes = 0;
+ }
+ else
+ {
+ $trailing_bytes = 5;
+ }
+
+ $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . UTF8_REPLACEMENT;
+ $pos += strspn($str, UTF8_TRAILING_BYTES, ++$pos, $trailing_bytes);
+ $tmp_pos = $pos;
+ continue 2;
+ }
+ break;
+ }
}
+
+ // The char is a valid starter, move the cursor and go on
+ $pos += $utf_len;
+ continue;
}
+ }
+ else
+ {
+ // A trailing byte came out of nowhere, we will advance the cursor and treat the this byte and all following trailing bytes as if
+ // each of them was a Unicode replacement char
+ $spn = strspn($str, UTF8_TRAILING_BYTES, $pos);
+ $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . str_repeat(UTF8_REPLACEMENT, $spn);
- /**
- * The char is a valid starter, move the cursor and go on
- */
- $pos += $utf_len;
+ $pos += $spn;
+ $tmp_pos = $pos;
continue;
}
- }
- else
- {
- /**
- * A trailing byte came out of nowhere, we will advance the cursor
- * and treat the this byte and all following trailing bytes as if
- * each of them was a Unicode replacement char
- */
- $spn = strspn($str, UTF8_TRAILING_BYTES, $pos);
- $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . str_repeat(UTF8_REPLACEMENT, $spn);
-
- $pos += $spn;
- $tmp_pos = $pos;
- continue;
- }
- ////////////////////////////////////////////////////////////////////
- // STEP 1: Decompose current char //
- ////////////////////////////////////////////////////////////////////
-
- /**
- * We have found a character that is either:
- * - in the NFC_QC/NFKC_QC list
- * - a non-starter char that is not canonically ordered
- *
- * We are going to capture the shortest UTF sequence that satisfies
- * these two conditions:
- *
- * 1 - If the sequence does not start at the begginning of the string,
- * it must begin with a starter, and that starter must not have the
- * NF[K]C_QC property equal to "MAYBE"
- *
- * 2 - If the sequence does not end at the end of the string, it must end
- * with a non-starter and be immediately followed by a starter that
- * is not on the QC list
- */
- $utf_seq = array();
- $last_cc = 0;
- $lpos = $pos;
- $pos += $utf_len;
-
- if (isset($decomp_map[$utf_char]))
- {
- $_pos = 0;
- $_len = strlen($decomp_map[$utf_char]);
- do
+ // STEP 1: Decompose current char
+
+ // We have found a character that is either:
+ // - in the NFC_QC/NFKC_QC list
+ // - a non-starter char that is not canonically ordered
+ //
+ // We are going to capture the shortest UTF sequence that satisfies these two conditions:
+ //
+ // 1 - If the sequence does not start at the begginning of the string, it must begin with a starter,
+ // and that starter must not have the NF[K]C_QC property equal to "MAYBE"
+ //
+ // 2 - If the sequence does not end at the end of the string, it must end with a non-starter and be
+ // immediately followed by a starter that is not on the QC list
+ //
+ $utf_seq = array();
+ $last_cc = 0;
+ $lpos = $pos;
+ $pos += $utf_len;
+
+ if (isset($decomp_map[$utf_char]))
{
- $_utf_len =& $utf_len_mask[$decomp_map[$utf_char][$_pos] & "\xF0"];
+ $_pos = 0;
+ $_len = strlen($decomp_map[$utf_char]);
- if (isset($_utf_len))
- {
- $utf_seq[] = substr($decomp_map[$utf_char], $_pos, $_utf_len);
- $_pos += $_utf_len;
- }
- else
+ do
{
- $utf_seq[] = $decomp_map[$utf_char][$_pos];
- ++$_pos;
+ $_utf_len =& $utf_len_mask[$decomp_map[$utf_char][$_pos] & "\xF0"];
+
+ if (isset($_utf_len))
+ {
+ $utf_seq[] = substr($decomp_map[$utf_char], $_pos, $_utf_len);
+ $_pos += $_utf_len;
+ }
+ else
+ {
+ $utf_seq[] = $decomp_map[$utf_char][$_pos];
+ ++$_pos;
+ }
}
+ while ($_pos < $_len);
+ }
+ else
+ {
+ // The char is not decomposable
+ $utf_seq = array($utf_char);
}
- while($_pos < $_len);
- }
- else
- {
- /**
- * The char is not decomposable
- */
- $utf_seq = array($utf_char);
- }
- ////////////////////////////////////////////////////////////////
- // STEP 2: Capture the starter //
- ////////////////////////////////////////////////////////////////
+ // STEP 2: Capture the starter
- /**
- * Check out the combining class of the first character of the UTF sequence
- */
- $k = 0;
- if (isset($utf_combining_class[$utf_seq[0]]) || $qc[$utf_char] == UNICODE_QC_MAYBE)
- {
- /**
- * Not a starter, inspect previous characters
- *
- * The last 8 characters are kept in a buffer so that we don't have
- * to capture them everytime. This is enough for all real-life strings
- * but even if it wasn't, we can capture characters in backward mode,
- * although it is slower than this method.
- *
- * In the following loop, $j starts at the previous buffered character
- * ($i - 1, because current character is at offset $i) and process them
- * in backward mode until we find a starter.
- *
- * $k is the index on each UTF character inside of our UTF sequence.
- * At this time, $utf_seq contains one or more characters numbered 0 to
- * n. $k starts at 0 and for each char we prepend we pre-decrement it
- * and for numbering
- */
- $starter_found = 0;
- $j_min = max(1, $i - 7);
- for($j = $i - 1; $j >= $j_min && $lpos > $tmp_pos; --$j)
+ // Check out the combining class of the first character of the UTF sequence
+ $k = 0;
+ if (isset($utf_combining_class[$utf_seq[0]]) || $qc[$utf_char] == UNICODE_QC_MAYBE)
{
- $utf_char = $buffer[$j & 7];
- $lpos -= strlen($utf_char);
-
- if (isset($decomp_map[$utf_char]))
+ // Not a starter, inspect previous characters
+ // The last 8 characters are kept in a buffer so that we don't have to capture them everytime.
+ // This is enough for all real-life strings but even if it wasn't, we can capture characters in backward mode,
+ // although it is slower than this method.
+ //
+ // In the following loop, $j starts at the previous buffered character ($i - 1, because current character is
+ // at offset $i) and process them in backward mode until we find a starter.
+ //
+ // $k is the index on each UTF character inside of our UTF sequence. At this time, $utf_seq contains one or more
+ // characters numbered 0 to n. $k starts at 0 and for each char we prepend we pre-decrement it and for numbering
+ $starter_found = 0;
+ $j_min = max(1, $i - 7);
+
+ for ($j = $i - 1; $j >= $j_min && $lpos > $tmp_pos; --$j)
{
- /**
- * The char is a composite, decompose for storage
- */
- $decomp_seq = array();
- $_pos = 0;
- $_len = strlen($decomp_map[$utf_char]);
- do
+ $utf_char = $buffer[$j & 7];
+ $lpos -= strlen($utf_char);
+
+ if (isset($decomp_map[$utf_char]))
{
- $c = $decomp_map[$utf_char][$_pos];
- $_utf_len =& $utf_len_mask[$c & "\xF0"];
+ // The char is a composite, decompose for storage
+ $decomp_seq = array();
+ $_pos = 0;
+ $_len = strlen($decomp_map[$utf_char]);
- if (isset($_utf_len))
+ do
{
- $decomp_seq[] = substr($decomp_map[$utf_char], $_pos, $_utf_len);
- $_pos += $_utf_len;
+ $c = $decomp_map[$utf_char][$_pos];
+ $_utf_len =& $utf_len_mask[$c & "\xF0"];
+
+ if (isset($_utf_len))
+ {
+ $decomp_seq[] = substr($decomp_map[$utf_char], $_pos, $_utf_len);
+ $_pos += $_utf_len;
+ }
+ else
+ {
+ $decomp_seq[] = $c;
+ ++$_pos;
+ }
}
- else
+ while ($_pos < $_len);
+
+ // Prepend the UTF sequence with our decomposed sequence
+ if (isset($decomp_seq[1]))
{
- $decomp_seq[] = $c;
- ++$_pos;
- }
- }
- while($_pos < $_len);
+ // The char expanded into several chars
+ $decomp_cnt = sizeof($decomp_seq);
- /**
- * Prepend the UTF sequence with our decomposed sequence
- */
- if (isset($decomp_seq[1]))
- {
- /**
- * The char expanded into several chars
- */
- $decomp_cnt = count($decomp_seq);
- foreach($decomp_seq as $decomp_i => $decomp_char)
+ foreach ($decomp_seq as $decomp_i => $decomp_char)
+ {
+ $utf_seq[$k + $decomp_i - $decomp_cnt] = $decomp_char;
+ }
+ $k -= $decomp_cnt;
+ }
+ else
{
- $utf_seq[$k + $decomp_i - $decomp_cnt] = $decomp_char;
+ // Decomposed to a single char, easier to prepend
+ $utf_seq[--$k] = $decomp_seq[0];
}
- $k -= $decomp_cnt;
}
else
{
- /**
- * Decomposed to a single char, easier to prepend
- */
- $utf_seq[--$k] = $decomp_seq[0];
+ $utf_seq[--$k] = $utf_char;
}
- }
- else
- {
- $utf_seq[--$k] = $utf_char;
- }
- if (!isset($utf_combining_class[$utf_seq[$k]]))
- {
- /**
- * We have found our starter
- */
- $starter_found = 1;
- break;
+ if (!isset($utf_combining_class[$utf_seq[$k]]))
+ {
+ // We have found our starter
+ $starter_found = 1;
+ break;
+ }
}
- }
- if (!$starter_found && $lpos > $tmp_pos)
- {
- /**
- * The starter was not found in the buffer, let's rewind some more
- */
- do
+ if (!$starter_found && $lpos > $tmp_pos)
{
- /**
- * $utf_len_mask contains the masks of both leading bytes and
- * trailing bytes. If $utf_en > 0 then it's a leading byte,
- * otherwise it's a trailing byte.
- */
- $c = $str[--$lpos];
- $c_mask = $c & "\xF0";
-
- if (isset($utf_len_mask[$c_mask]))
+ // The starter was not found in the buffer, let's rewind some more
+ do
{
- /**
- * UTF byte
- */
- if ($utf_len = $utf_len_mask[$c_mask])
- {
- /**
- * UTF *leading* byte
- */
- $utf_char = substr($str, $lpos, $utf_len);
+ // $utf_len_mask contains the masks of both leading bytes and trailing bytes. If $utf_en > 0 then it's a leading byte, otherwise it's a trailing byte.
+ $c = $str[--$lpos];
+ $c_mask = $c & "\xF0";
- if (isset($decomp_map[$utf_char]))
+ if (isset($utf_len_mask[$c_mask]))
+ {
+ // UTF byte
+ if ($utf_len = $utf_len_mask[$c_mask])
{
- /**
- * Decompose the character
- */
- $decomp_seq = array();
- $_pos = 0;
- $_len = strlen($decomp_map[$utf_char]);
- do
+ // UTF *leading* byte
+ $utf_char = substr($str, $lpos, $utf_len);
+
+ if (isset($decomp_map[$utf_char]))
{
- $c = $decomp_map[$utf_char][$_pos];
- $_utf_len =& $utf_len_mask[$c & "\xF0"];
+ // Decompose the character
+ $decomp_seq = array();
+ $_pos = 0;
+ $_len = strlen($decomp_map[$utf_char]);
- if (isset($_utf_len))
+ do
{
- $decomp_seq[] = substr($decomp_map[$utf_char], $_pos, $_utf_len);
- $_pos += $_utf_len;
+ $c = $decomp_map[$utf_char][$_pos];
+ $_utf_len =& $utf_len_mask[$c & "\xF0"];
+
+ if (isset($_utf_len))
+ {
+ $decomp_seq[] = substr($decomp_map[$utf_char], $_pos, $_utf_len);
+ $_pos += $_utf_len;
+ }
+ else
+ {
+ $decomp_seq[] = $c;
+ ++$_pos;
+ }
}
- else
+ while ($_pos < $_len);
+
+ // Prepend the UTF sequence with our decomposed sequence
+ if (isset($decomp_seq[1]))
{
- $decomp_seq[] = $c;
- ++$_pos;
+ // The char expanded into several chars
+ $decomp_cnt = sizeof($decomp_seq);
+ foreach ($decomp_seq as $decomp_i => $utf_char)
+ {
+ $utf_seq[$k + $decomp_i - $decomp_cnt] = $utf_char;
+ }
+ $k -= $decomp_cnt;
}
- }
- while($_pos < $_len);
-
- /**
- * Prepend the UTF sequence with our decomposed sequence
- */
- if (isset($decomp_seq[1]))
- {
- /**
- * The char expanded into several chars
- */
- $decomp_cnt = count($decomp_seq);
- foreach($decomp_seq as $decomp_i => $utf_char)
+ else
{
- $utf_seq[$k + $decomp_i - $decomp_cnt] = $utf_char;
+ // Decomposed to a single char, easier to prepend
+ $utf_seq[--$k] = $decomp_seq[0];
}
- $k -= $decomp_cnt;
}
else
{
- /**
- * Decomposed to a single char, easier to prepend
- */
- $utf_seq[--$k] = $decomp_seq[0];
+ $utf_seq[--$k] = $utf_char;
}
}
- else
- {
- $utf_seq[--$k] = $utf_char;
- }
+ }
+ else
+ {
+ // ASCII char
+ $utf_seq[--$k] = $c;
}
}
- else
- {
- /**
- * ASCII char
- */
- $utf_seq[--$k] = $c;
- }
+ while ($lpos > $tmp_pos);
}
- while($lpos > $tmp_pos);
}
- }
- ////////////////////////////////////////////////////////////////
- // STEP 3: Capture following combining modifiers //
- ////////////////////////////////////////////////////////////////
+ // STEP 3: Capture following combining modifiers
- while($pos < $len)
- {
- $c_mask = $str[$pos] & "\xF0";
-
- if (isset($utf_len_mask[$c_mask]))
+ while ($pos < $len)
{
- if ($utf_len = $utf_len_mask[$c_mask])
- {
- $utf_char = substr($str, $pos, $utf_len);
- }
- else
- {
- /**
- * A trailing byte came out of nowhere
- *
- * Trailing bytes are replaced with Unicode replacement chars,
- * we will just ignore it for now, break out of the loop
- * as if it was a starter (replacement chars ARE starters)
- * and let the next loop replace it
- */
- break;
- }
+ $c_mask = $str[$pos] & "\xF0";
- if (isset($utf_combining_class[$utf_char]) || isset($qc[$utf_char]))
+ if (isset($utf_len_mask[$c_mask]))
{
- /**
- * Combining character, add it to the sequence and move the cursor
- */
- if (isset($decomp_map[$utf_char]))
+ if ($utf_len = $utf_len_mask[$c_mask])
{
- /**
- * Decompose the character
- */
- $_pos = 0;
- $_len = strlen($decomp_map[$utf_char]);
- do
+ $utf_char = substr($str, $pos, $utf_len);
+ }
+ else
+ {
+ // A trailing byte came out of nowhere
+ // Trailing bytes are replaced with Unicode replacement chars, we will just ignore it for now, break out of the loop
+ // as if it was a starter (replacement chars ARE starters) and let the next loop replace it
+ break;
+ }
+
+ if (isset($utf_combining_class[$utf_char]) || isset($qc[$utf_char]))
+ {
+ // Combining character, add it to the sequence and move the cursor
+ if (isset($decomp_map[$utf_char]))
{
- $c = $decomp_map[$utf_char][$_pos];
- $_utf_len =& $utf_len_mask[$c & "\xF0"];
+ // Decompose the character
+ $_pos = 0;
+ $_len = strlen($decomp_map[$utf_char]);
- if (isset($_utf_len))
+ do
{
- $utf_seq[] = substr($decomp_map[$utf_char], $_pos, $_utf_len);
- $_pos += $_utf_len;
- }
- else
- {
- $utf_seq[] = $c;
- ++$_pos;
+ $c = $decomp_map[$utf_char][$_pos];
+ $_utf_len =& $utf_len_mask[$c & "\xF0"];
+
+ if (isset($_utf_len))
+ {
+ $utf_seq[] = substr($decomp_map[$utf_char], $_pos, $_utf_len);
+ $_pos += $_utf_len;
+ }
+ else
+ {
+ $utf_seq[] = $c;
+ ++$_pos;
+ }
}
+ while ($_pos < $_len);
}
- while($_pos < $_len);
+ else
+ {
+ $utf_seq[] = $utf_char;
+ }
+
+ $pos += $utf_len;
}
else
{
- $utf_seq[] = $utf_char;
+ // Combining class 0 and no QC, break out of the loop
+ // Note: we do not know if that character is valid. If it's not, the next iteration will replace it
+ break;
}
-
- $pos += $utf_len;
}
else
{
- /**
- * Combining class 0 and no QC, break out of the loop
- *
- * Note: we do not know if that character is valid. If
- * it's not, the next iteration will replace it
- */
+ // ASCII chars are starters
break;
}
}
- else
- {
- /**
- * ASCII chars are starters
- */
- break;
- }
- }
- ////////////////////////////////////////////////////////////////
- // STEP 4: Sort and combine //
- ////////////////////////////////////////////////////////////////
+ // STEP 4: Sort and combine
- /**
- * Here we sort...
- */
- $k_max = $k + count($utf_seq);
- if (!$k && $k_max == 1)
- {
- /**
- * There is only one char in the UTF sequence, add it then
- * jump to the next iteration of main loop
- *
- * Note: the two commented lines below can be enabled under PHP5
- * for a very small performance gain in most cases
- */
-// if (substr_compare($str, $utf_seq[0], $lpos, $pos - $lpos))
-// {
- $tmp .= substr($str, $tmp_pos, $lpos - $tmp_pos) . $utf_seq[0];
- $tmp_pos = $pos;
-// }
+ // Here we sort...
+ $k_max = $k + sizeof($utf_seq);
- continue;
- }
-
- /**
- * ...there we combine
- */
- if (isset($utf_combining_class[$utf_seq[$k]]))
- {
- $starter = $nf_seq = '';
- }
- else
- {
- $starter = $utf_seq[$k++];
- $nf_seq = '';
- }
- $utf_sort = array();
-
- /**
- * We add an empty char at the end of the UTF char sequence.
- * It will act as a starter and trigger the sort/combine routine
- * at the end of the string without altering it
- */
- $utf_seq[] = '';
+ if (!$k && $k_max == 1)
+ {
+ // There is only one char in the UTF sequence, add it then jump to the next iteration of main loop
+ // Note: the two commented lines below can be enabled under PHP5 for a very small performance gain in most cases
+// if (substr_compare($str, $utf_seq[0], $lpos, $pos - $lpos))
+// {
+ $tmp .= substr($str, $tmp_pos, $lpos - $tmp_pos) . $utf_seq[0];
+ $tmp_pos = $pos;
+// }
- do
- {
- $utf_char = $utf_seq[$k++];
+ continue;
+ }
- if (isset($utf_combining_class[$utf_char]))
+ // ...there we combine
+ if (isset($utf_combining_class[$utf_seq[$k]]))
{
- $utf_sort[$utf_combining_class[$utf_char]][] = $utf_char;
+ $starter = $nf_seq = '';
}
else
{
- if (empty($utf_sort))
+ $starter = $utf_seq[$k++];
+ $nf_seq = '';
+ }
+ $utf_sort = array();
+
+ // We add an empty char at the end of the UTF char sequence. It will act as a starter and trigger the sort/combine routine
+ // at the end of the string without altering it
+ $utf_seq[] = '';
+
+ do
+ {
+ $utf_char = $utf_seq[$k++];
+
+ if (isset($utf_combining_class[$utf_char]))
{
- /**
- * No combining characters... check for a composite
- * of the two starters
- */
- if (isset($utf_canonical_comp[$starter . $utf_char]))
- {
- /**
- * Good ol' composite character
- */
- $starter = $utf_canonical_comp[$starter . $utf_char];
- }
- elseif (isset($utf_jamo_type[$utf_char]))
+ $utf_sort[$utf_combining_class[$utf_char]][] = $utf_char;
+ }
+ else
+ {
+ if (empty($utf_sort))
{
- /**
- * Current char is a composable jamo
- */
- if (isset($utf_jamo_type[$starter])
- && $utf_jamo_type[$starter] == UNICODE_JAMO_L
- && $utf_jamo_type[$utf_char] == UNICODE_JAMO_V)
+ // No combining characters... check for a composite of the two starters
+ if (isset($utf_canonical_comp[$starter . $utf_char]))
{
- /**
- * We have a L jamo followed by a V jamo, we are going
- * to prefetch the next char to see if it's a T jamo
- */
- if (isset($utf_jamo_type[$utf_seq[$k]]) && $utf_jamo_type[$utf_seq[$k]] == UNICODE_JAMO_T)
+ // Good ol' composite character
+ $starter = $utf_canonical_comp[$starter . $utf_char];
+ }
+ else if (isset($utf_jamo_type[$utf_char]))
+ {
+ // Current char is a composable jamo
+ if (isset($utf_jamo_type[$starter]) && $utf_jamo_type[$starter] == UNICODE_JAMO_L && $utf_jamo_type[$utf_char] == UNICODE_JAMO_V)
{
- /**
- * L+V+T jamos, combine to a LVT Hangul syllable
- * ($k is incremented)
- */
- $cp = $utf_jamo_index[$starter] + $utf_jamo_index[$utf_char] + $utf_jamo_index[$utf_seq[$k]];
+ // We have a L jamo followed by a V jamo, we are going to prefetch the next char to see if it's a T jamo
+ if (isset($utf_jamo_type[$utf_seq[$k]]) && $utf_jamo_type[$utf_seq[$k]] == UNICODE_JAMO_T)
+ {
+ // L+V+T jamos, combine to a LVT Hangul syllable ($k is incremented)
+ $cp = $utf_jamo_index[$starter] + $utf_jamo_index[$utf_char] + $utf_jamo_index[$utf_seq[$k]];
+ ++$k;
+ }
+ else
+ {
+ // L+V jamos, combine to a LV Hangul syllable
+ $cp = $utf_jamo_index[$starter] + $utf_jamo_index[$utf_char];
+ }
- ++$k;
+ $starter = chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
}
else
{
- /**
- * L+V jamos, combine to a LV Hangul syllable
- */
- $cp = $utf_jamo_index[$starter] + $utf_jamo_index[$utf_char];
+ // Non-composable jamo, just add it to the sequence
+ $nf_seq .= $starter;
+ $starter = $utf_char;
}
-
- $starter = chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
}
else
{
- /**
- * Non-composable jamo, just add it to the sequence
- */
+ // No composite, just add the first starter to the sequence then continue with the other one
$nf_seq .= $starter;
$starter = $utf_char;
}
}
else
{
- /**
- * No composite, just add the first starter to the sequence
- * then continue with the other one
- */
- $nf_seq .= $starter;
- $starter = $utf_char;
- }
- }
- else
- {
- ksort($utf_sort);
-
- /**
- * For each class of combining characters
- */
- foreach($utf_sort as $cc => $utf_chars)
- {
- $j = 0;
+ ksort($utf_sort);
- do
+ // For each class of combining characters
+ foreach ($utf_sort as $cc => $utf_chars)
{
- /**
- * Look for a composite
- */
- if (isset($utf_canonical_comp[$starter . $utf_chars[$j]]))
- {
- /**
- * Found a composite, replace the starter
- */
- $starter = $utf_canonical_comp[$starter . $utf_chars[$j]];
- unset($utf_sort[$cc][$j]);
- }
- else
+ $j = 0;
+
+ do
{
- /**
- * No composite, all following characters in that
- * class are blocked
- */
- break;
+ // Look for a composite
+ if (isset($utf_canonical_comp[$starter . $utf_chars[$j]]))
+ {
+ // Found a composite, replace the starter
+ $starter = $utf_canonical_comp[$starter . $utf_chars[$j]];
+ unset($utf_sort[$cc][$j]);
+ }
+ else
+ {
+ // No composite, all following characters in that class are blocked
+ break;
+ }
}
+ while (isset($utf_sort[$cc][++$j]));
}
- while(isset($utf_sort[$cc][++$j]));
- }
- /**
- * Add the starter to the normalized sequence, followed by
- * non-starters in canonical order
- */
- $nf_seq .= $starter;
- foreach($utf_sort as $utf_chars)
- {
- if (!empty($utf_chars))
+ // Add the starter to the normalized sequence, followed by non-starters in canonical order
+ $nf_seq .= $starter;
+
+ foreach ($utf_sort as $utf_chars)
{
- $nf_seq .= implode('', $utf_chars);
+ if (!empty($utf_chars))
+ {
+ $nf_seq .= implode('', $utf_chars);
+ }
}
+
+ // Reset the array and go on
+ $utf_sort = array();
+ $starter = $utf_char;
}
+ }
+ }
+ while ($k <= $k_max);
- /**
- * Reset the array and go on
- */
- $utf_sort = array();
- $starter = $utf_char;
+ $tmp .= substr($str, $tmp_pos, $lpos - $tmp_pos) . $nf_seq;
+ $tmp_pos = $pos;
+ }
+ else
+ {
+ // Only a ASCII char can make the program get here
+ //
+ // First we skip the current byte with ++$pos, then we quickly skip following ASCII chars with strspn().
+ //
+ // The first two "if"'s here can be removed, with the consequences of being faster on latin text (lots of ASCII) and slower on
+ // multi-byte text (where the only ASCII chars are spaces and punctuation)
+ if (++$pos != $len)
+ {
+ if ($str[$pos] < "\x80")
+ {
+ $pos += strspn($str, UTF8_ASCII_RANGE, ++$pos);
+ $buffer[++$i & 7] = $str[$pos - 1];
+ }
+ else
+ {
+ $buffer[++$i & 7] = $c;
}
}
}
- while($k <= $k_max);
-
- $tmp .= substr($str, $tmp_pos, $lpos - $tmp_pos) . $nf_seq;
- $tmp_pos = $pos;
}
- else
+ while ($pos < $len);
+
+ // Now is time to return the string
+ if ($tmp_pos)
{
- /**
- * Only a ASCII char can make the program get here
- *
- * First we skip the current byte with ++$pos, then we quickly
- * skip following ASCII chars with strspn().
- *
- * The first two "if"'s here can be removed, with the consequences
- * of being faster on latin text (lots of ASCII) and slower on
- * multi-byte text (where the only ASCII chars are spaces and punctuation)
- */
- if (++$pos != $len)
+ // If the $tmp_pos cursor is not at the beggining of the string then at least one character was not in normal form. Replace $str with the fixed version
+ if ($tmp_pos == $len)
{
- if ($str[$pos] < "\x80")
- {
- $pos += strspn($str, UTF8_ASCII_RANGE, ++$pos);
- $buffer[++$i & 7] = $str[$pos - 1];
- }
- else
- {
- $buffer[++$i & 7] = $c;
- }
+ // The $tmp_pos cursor is at the end of $str, therefore $tmp holds the whole $str
+ return $tmp;
+ }
+ else
+ {
+ // The rightmost chunk of $str has not been appended to $tmp yet
+ return $tmp . substr($str, $tmp_pos);
}
}
+
+ // The string was already in normal form
+ return $str;
}
- while($pos < $len);
/**
- * Now is time to return the string
+ * Decompose a UTF string
+ *
+ * @param string $str UTF string
+ * @param integer $pos Position of the first UTF char (in bytes)
+ * @param integer $len Length of the string (in bytes)
+ * @param array $decomp_map Decomposition mapping, passed by reference but never modified
+ * @return string The string, decomposed and sorted canonically
+ *
+ * @access private
*/
- if ($tmp_pos)
+ function decompose($str, $pos, $len, &$decomp_map)
{
- /**
- * If the $tmp_pos cursor is not at the beggining of the string then at least
- * one character was not in normal form. Replace $str with the fixed version
- */
- if ($tmp_pos == $len)
- {
- /**
- * The $tmp_pos cursor is at the end of $str, therefore $tmp holds the
- * whole $str
- */
- return $tmp;
- }
- else
+ global $utf_combining_class, $utf_canonical_decomp, $phpbb_root_path;
+
+ // Load some commonly-used tables
+ if (!isset($utf_combining_class))
{
- /**
- * The rightmost chunk of $str has not been appended to $tmp yet
- */
- return $tmp . substr($str, $tmp_pos);
+ include($phpbb_root_path . 'includes/utf/data/utf_normalizer_common.php');
}
- }
-
- /**
- * The string was already in normal form
- */
- return $str;
- }
- /**
- * Decompose a UTF string
- *
- * @param string $str UTF string
- * @param integer $pos Position of the first UTF char (in bytes)
- * @param integer $len Length of the string (in bytes)
- * @param array $decomp_map Decomposition mapping, passed by reference but never modified
- * @return string The string, decomposed and sorted canonically
- *
- * @access private
- */
- function decompose($str, $pos, $len, &$decomp_map)
- {
- global $utf_combining_class, $utf_canonical_decomp, $phpbb_root_path;
+ // UTF char length array
+ $utf_len_mask = array(
+ // Leading bytes masks
+ "\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4,
+ // Trailing bytes masks
+ "\x80" => 0, "\x90" => 0, "\xA0" => 0, "\xB0" => 0
+ );
- /**
- * Load some commonly-used tables
- */
- if (!isset($utf_combining_class))
- {
- include($phpbb_root_path . 'includes/utf/data/utf_normalizer_common.php');
- }
+ // Some extra checks are triggered on the first byte of a UTF sequence
+ $extra_check = array(
+ "\xED" => 1, "\xEF" => 1, "\xC0" => 1, "\xC1" => 1, "\xE0" => 1, "\xF0" => 1,
+ "\xF4" => 1, "\xF5" => 1, "\xF6" => 1, "\xF7" => 1, "\xF8" => 1, "\xF9" => 1,
+ "\xFA" => 1, "\xFB" => 1, "\xFC" => 1, "\xFD" => 1, "\xFE" => 1, "\xFF" => 1
+ );
- /**
- * UTF char length array
- */
- $utf_len_mask = array(
- /**
- * Leading bytes masks
- */
- "\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4,
+ // These masks are used to check if a UTF sequence is well formed. Here are the only 3 lengths we acknowledge:
+ // - 2-byte: 110? ???? 10?? ????
+ // - 3-byte: 1110 ???? 10?? ???? 10?? ????
+ // - 4-byte: 1111 0??? 10?? ???? 10?? ???? 10?? ????
+ // Note that 5- and 6- byte sequences are automatically discarded
+ $utf_validation_mask = array(
+ 2 => "\xE0\xC0",
+ 3 => "\xF0\xC0\xC0",
+ 4 => "\xF8\xC0\xC0\xC0"
+ );
- /**
- * Trailing bytes masks
- */
- "\x80" => 0, "\x90" => 0, "\xA0" => 0, "\xB0" => 0
- );
+ $utf_validation_check = array(
+ 2 => "\xC0\x80",
+ 3 => "\xE0\x80\x80",
+ 4 => "\xF0\x80\x80\x80"
+ );
- /**
- * Some extra checks are triggered on the first byte of a UTF sequence
- */
- $extra_check = array(
- "\xED"=>1, "\xEF"=>1, "\xC0"=>1, "\xC1"=>1, "\xE0"=>1, "\xF0"=>1,
- "\xF4"=>1, "\xF5"=>1, "\xF6"=>1, "\xF7"=>1, "\xF8"=>1, "\xF9"=>1,
- "\xFA"=>1, "\xFB"=>1, "\xFC"=>1, "\xFD"=>1, "\xFE"=>1, "\xFF"=>1
- );
+ $tmp = '';
+ $starter_pos = $pos;
+ $tmp_pos = $last_cc = $sort = $dump = 0;
+ $utf_sort = array();
- /**
- * These masks are used to check if a UTF sequence is well formed.
- * Here are the only 3 lengths we acknowledge:
- * - 2-byte: 110? ???? 10?? ????
- * - 3-byte: 1110 ???? 10?? ???? 10?? ????
- * - 4-byte: 1111 0??? 10?? ???? 10?? ???? 10?? ????
- *
- * Note that 5- and 6- byte sequences are automatically discarded
- */
- $utf_validation_mask = array(
- 2 => "\xE0\xC0",
- 3 => "\xF0\xC0\xC0",
- 4 => "\xF8\xC0\xC0\xC0"
- );
- $utf_validation_check = array(
- 2 => "\xC0\x80",
- 3 => "\xE0\x80\x80",
- 4 => "\xF0\x80\x80\x80"
- );
-
- $tmp = '';
- $starter_pos = $pos;
- $tmp_pos = $last_cc = $sort = $dump = 0;
- $utf_sort = array();
-
-
- ////////////////////////////////////////////////////////////////////////
- // Main loop //
- ////////////////////////////////////////////////////////////////////////
-
- do
- {
- ////////////////////////////////////////////////////////////////////
- // STEP 0: Capture the current char //
- ////////////////////////////////////////////////////////////////////
- $cur_mask = $str[$pos] & "\xF0";
- if (isset($utf_len_mask[$cur_mask]))
+ // Main loop
+ do
{
- if ($utf_len = $utf_len_mask[$cur_mask])
- {
- /**
- * Multibyte char
- */
- $utf_char = substr($str, $pos, $utf_len);
- $pos += $utf_len;
- }
- else
- {
- /**
- * A trailing byte came out of nowhere, we will treat it and all
- * following trailing bytes as if each of them was a Unicode
- * replacement char and we will advance the cursor
- */
- $spn = strspn($str, UTF8_TRAILING_BYTES, $pos);
+ // STEP 0: Capture the current char
- if ($dump)
+ $cur_mask = $str[$pos] & "\xF0";
+ if (isset($utf_len_mask[$cur_mask]))
+ {
+ if ($utf_len = $utf_len_mask[$cur_mask])
{
- $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
+ // Multibyte char
+ $utf_char = substr($str, $pos, $utf_len);
+ $pos += $utf_len;
+ }
+ else
+ {
+ // A trailing byte came out of nowhere, we will treat it and all following trailing bytes as if each of them was a Unicode
+ // replacement char and we will advance the cursor
+ $spn = strspn($str, UTF8_TRAILING_BYTES, $pos);
- /**
- * Dump combiners
- */
- if (!empty($utf_sort))
+ if ($dump)
{
- if ($sort)
- {
- ksort($utf_sort);
- }
+ $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
- foreach($utf_sort as $utf_chars)
+ // Dump combiners
+ if (!empty($utf_sort))
{
- $tmp .= implode('', $utf_chars);
- }
- }
+ if ($sort)
+ {
+ ksort($utf_sort);
+ }
- $tmp .= str_repeat(UTF8_REPLACEMENT, $spn);
- $dump = $sort = 0;
- }
- else
- {
- $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . str_repeat(UTF8_REPLACEMENT, $spn);
- }
+ foreach($utf_sort as $utf_chars)
+ {
+ $tmp .= implode('', $utf_chars);
+ }
+ }
- $pos += $spn;
- $tmp_pos = $starter_pos = $pos;
+ $tmp .= str_repeat(UTF8_REPLACEMENT, $spn);
+ $dump = $sort = 0;
+ }
+ else
+ {
+ $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . str_repeat(UTF8_REPLACEMENT, $spn);
+ }
- $utf_sort = array();
- $last_cc = 0;
+ $pos += $spn;
+ $tmp_pos = $starter_pos = $pos;
- continue;
- }
+ $utf_sort = array();
+ $last_cc = 0;
+ continue;
+ }
- ////////////////////////////////////////////////////////////////////
- // STEP 1: Decide what to do with current char //
- ////////////////////////////////////////////////////////////////////
- /**
- * Now, in that order:
- * - check if that character is decomposable
- * - check if that character is a non-starter
- * - check if that character requires extra checks to be performed
- */
- if (isset($decomp_map[$utf_char]))
- {
- /**
- * Decompose the char
- */
- $_pos = 0;
- $_len = strlen($decomp_map[$utf_char]);
+ // STEP 1: Decide what to do with current char
- do
+ // Now, in that order:
+ // - check if that character is decomposable
+ // - check if that character is a non-starter
+ // - check if that character requires extra checks to be performed
+ if (isset($decomp_map[$utf_char]))
{
- $c = $decomp_map[$utf_char][$_pos];
- $_utf_len =& $utf_len_mask[$c & "\xF0"];
+ // Decompose the char
+ $_pos = 0;
+ $_len = strlen($decomp_map[$utf_char]);
- if (isset($_utf_len))
+ do
{
- $_utf_char = substr($decomp_map[$utf_char], $_pos, $_utf_len);
- $_pos += $_utf_len;
+ $c = $decomp_map[$utf_char][$_pos];
+ $_utf_len =& $utf_len_mask[$c & "\xF0"];
- if (isset($utf_combining_class[$_utf_char]))
+ if (isset($_utf_len))
{
- /**
- * The character decomposed to a non-starter, buffer it for sorting
- */
- $utf_sort[$utf_combining_class[$_utf_char]][] = $_utf_char;
+ $_utf_char = substr($decomp_map[$utf_char], $_pos, $_utf_len);
+ $_pos += $_utf_len;
- if ($utf_combining_class[$_utf_char] < $last_cc)
+ if (isset($utf_combining_class[$_utf_char]))
{
- /**
- * Not canonically ordered, will require sorting
- */
- $sort = $dump = 1;
+ // The character decomposed to a non-starter, buffer it for sorting
+ $utf_sort[$utf_combining_class[$_utf_char]][] = $_utf_char;
+
+ if ($utf_combining_class[$_utf_char] < $last_cc)
+ {
+ // Not canonically ordered, will require sorting
+ $sort = $dump = 1;
+ }
+ else
+ {
+ $dump = 1;
+ $last_cc = $utf_combining_class[$_utf_char];
+ }
}
else
{
- $dump = 1;
- $last_cc = $utf_combining_class[$_utf_char];
+ // This character decomposition contains a starter, dump the buffer and continue
+ if ($dump)
+ {
+ $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
+
+ // Dump combiners
+ if (!empty($utf_sort))
+ {
+ if ($sort)
+ {
+ ksort($utf_sort);
+ }
+
+ foreach ($utf_sort as $utf_chars)
+ {
+ $tmp .= implode('', $utf_chars);
+ }
+ }
+
+ $tmp .= $_utf_char;
+ $dump = $sort = 0;
+ }
+ else
+ {
+ $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos) . $_utf_char;
+ }
+
+ $tmp_pos = $starter_pos = $pos;
+ $utf_sort = array();
+ $last_cc = 0;
}
}
else
{
- /**
- * This character decomposition contains a starter,
- * dump the buffer and continue
- */
+ // This character decomposition contains an ASCII char, which is a starter. Dump the buffer and continue
+ ++$_pos;
+
if ($dump)
{
$tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
- /**
- * Dump combiners
- */
+ // Dump combiners
if (!empty($utf_sort))
{
if ($sort)
@@ -1472,18 +1213,18 @@ class utf_normalizer
ksort($utf_sort);
}
- foreach($utf_sort as $utf_chars)
+ foreach ($utf_sort as $utf_chars)
{
$tmp .= implode('', $utf_chars);
}
}
- $tmp .= $_utf_char;
+ $tmp .= $c;
$dump = $sort = 0;
}
else
{
- $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos) . $_utf_char;
+ $tmp .= substr($str, $tmp_pos, $pos - $utf_len - $tmp_pos) . $c;
}
$tmp_pos = $starter_pos = $pos;
@@ -1491,350 +1232,290 @@ class utf_normalizer
$last_cc = 0;
}
}
+ while ($_pos < $_len);
+ }
+ else if (isset($utf_combining_class[$utf_char]))
+ {
+ // Combining character
+ if ($utf_combining_class[$utf_char] < $last_cc)
+ {
+ // Not in canonical order
+ $sort = $dump = 1;
+ }
else
{
- /**
- * This character decomposition contains an ASCII char,
- * which is a starter. Dump the buffer and continue
- */
- ++$_pos;
- if ($dump)
+ $last_cc = $utf_combining_class[$utf_char];
+ }
+
+ $utf_sort[$utf_combining_class[$utf_char]][] = $utf_char;
+ }
+ else
+ {
+ // Non-decomposable starter, check out if it's a Hangul syllable
+ if ($utf_char < UTF8_HANGUL_FIRST || $utf_char > UTF8_HANGUL_LAST)
+ {
+ // Nope, regular UTF char, check that we have the correct number of trailing bytes
+ if (($utf_char & $utf_validation_mask[$utf_len]) != $utf_validation_check[$utf_len])
{
+ // Current char isn't well-formed or legal: either one or several trailing bytes are missing, or the Unicode char
+ // has been encoded in a five- or six- byte sequence.
+ // Move the cursor back to its original position then advance it to the position it should really be at
+ $pos -= $utf_len;
$tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
- /**
- * Dump combiners
- */
if (!empty($utf_sort))
{
- if ($sort)
- {
- ksort($utf_sort);
- }
+ ksort($utf_sort);
- foreach($utf_sort as $utf_chars)
+ foreach ($utf_sort as $utf_chars)
{
$tmp .= implode('', $utf_chars);
}
+ $utf_sort = array();
}
- $tmp .= $c;
- $dump = $sort = 0;
- }
- else
- {
- $tmp .= substr($str, $tmp_pos, $pos - $utf_len - $tmp_pos) . $c;
- }
-
- $tmp_pos = $starter_pos = $pos;
- $utf_sort = array();
- $last_cc = 0;
- }
- }
- while($_pos < $_len);
- }
- elseif (isset($utf_combining_class[$utf_char]))
- {
- /**
- * Combining character
- */
- if ($utf_combining_class[$utf_char] < $last_cc)
- {
- /**
- * Not in canonical order
- */
- $sort = $dump = 1;
- }
- else
- {
- $last_cc = $utf_combining_class[$utf_char];
- }
-
- $utf_sort[$utf_combining_class[$utf_char]][] = $utf_char;
- }
- else
- {
- /**
- * Non-decomposable starter, check out if it's a Hangul syllable
- */
- if ($utf_char < UTF8_HANGUL_FIRST || $utf_char > UTF8_HANGUL_LAST)
- {
- /**
- * Nope, regular UTF char, check that we have the correct number of trailing bytes
- */
- if (($utf_char & $utf_validation_mask[$utf_len]) != $utf_validation_check[$utf_len])
- {
- /**
- * Current char isn't well-formed or legal: either one or
- * several trailing bytes are missing, or the Unicode char
- * has been encoded in a five- or six- byte sequence.
- *
- * Move the cursor back to its original position then advance
- * it to the position it should really be at
- */
- $pos -= $utf_len;
- $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
+ // Add a replacement char then another replacement char for every trailing byte.
+ //
+ // @todo I'm not entirely sure that's how we're supposed to mark invalidated byte sequences, check this
+ $spn = strspn($str, UTF8_TRAILING_BYTES, ++$pos);
+ $tmp .= str_repeat(UTF8_REPLACEMENT, $spn + 1);
- if (!empty($utf_sort))
- {
- ksort($utf_sort);
+ $dump = $sort = 0;
- foreach($utf_sort as $utf_chars)
- {
- $tmp .= implode('', $utf_chars);
- }
- $utf_sort = array();
+ $pos += $spn;
+ $tmp_pos = $pos;
+ continue;
}
- /**
- * Add a replacement char then another replacement char for
- * every trailing byte.
- *
- * @todo I'm not entirely sure that's how we're supposed to
- * mark invalidated byte sequences, check this
- */
- $spn = strspn($str, UTF8_TRAILING_BYTES, ++$pos);
- $tmp .= str_repeat(UTF8_REPLACEMENT, $spn + 1);
-
- $dump = $sort = 0;
-
- $pos += $spn;
- $tmp_pos = $pos;
- continue;
- }
-
- if (isset($extra_check[$utf_char[0]]))
- {
- switch($utf_char[0])
+ if (isset($extra_check[$utf_char[0]]))
{
- /**
- * Note: 0xED is quite common in Korean
- */
- case "\xED":
- if ($utf_char >= "\xED\xA0\x80")
- {
- /**
- * Surrogates (U+D800..U+DFFF) are not allowed in UTF-8
- * (UTF sequence 0xEDA080..0xEDBFBF)
- */
- $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
-
- if (!empty($utf_sort))
+ switch ($utf_char[0])
+ {
+ // Note: 0xED is quite common in Korean
+ case "\xED":
+ if ($utf_char >= "\xED\xA0\x80")
{
- ksort($utf_sort);
+ // Surrogates (U+D800..U+DFFF) are not allowed in UTF-8 (UTF sequence 0xEDA080..0xEDBFBF)
+ $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
- foreach($utf_sort as $utf_chars)
+ if (!empty($utf_sort))
{
- $tmp .= implode('', $utf_chars);
+ ksort($utf_sort);
+
+ foreach ($utf_sort as $utf_chars)
+ {
+ $tmp .= implode('', $utf_chars);
+ }
+ $utf_sort = array();
}
- $utf_sort = array();
- }
- $tmp .= UTF8_REPLACEMENT;
- $dump = $sort = 0;
+ $tmp .= UTF8_REPLACEMENT;
+ $dump = $sort = 0;
- $tmp_pos = $starter_pos = $pos;
- continue 2;
- }
+ $tmp_pos = $starter_pos = $pos;
+ continue 2;
+ }
break;
- /**
- * Note: 0xEF is quite common in Japanese
- */
- case "\xEF":
- if ($utf_char == "\xEF\xBF\xBE" || $utf_char == "\xEF\xBF\xBF")
- {
- /**
- * U+FFFE and U+FFFF are explicitly disallowed
- * (UTF sequence 0xEFBFBE..0xEFBFBF)
- */
- $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
-
- if (!empty($utf_sort))
+ // Note: 0xEF is quite common in Japanese
+ case "\xEF":
+ if ($utf_char == "\xEF\xBF\xBE" || $utf_char == "\xEF\xBF\xBF")
{
- ksort($utf_sort);
+ // U+FFFE and U+FFFF are explicitly disallowed (UTF sequence 0xEFBFBE..0xEFBFBF)
+ $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
- foreach($utf_sort as $utf_chars)
+ if (!empty($utf_sort))
{
- $tmp .= implode('', $utf_chars);
+ ksort($utf_sort);
+
+ foreach ($utf_sort as $utf_chars)
+ {
+ $tmp .= implode('', $utf_chars);
+ }
+ $utf_sort = array();
}
- $utf_sort = array();
- }
- $tmp .= UTF8_REPLACEMENT;
- $dump = $sort = 0;
+ $tmp .= UTF8_REPLACEMENT;
+ $dump = $sort = 0;
- $tmp_pos = $starter_pos = $pos;
- continue 2;
- }
+ $tmp_pos = $starter_pos = $pos;
+ continue 2;
+ }
break;
- case "\xC0":
- case "\xC1":
- if ($utf_char <= "\xC1\xBF")
- {
- /**
- * Overlong sequence: Unicode char U+0000..U+007F encoded as a
- * double-byte UTF char
- */
- $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
-
- if (!empty($utf_sort))
+ case "\xC0":
+ case "\xC1":
+ if ($utf_char <= "\xC1\xBF")
{
- ksort($utf_sort);
+ // Overlong sequence: Unicode char U+0000..U+007F encoded as a double-byte UTF char
+ $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
- foreach($utf_sort as $utf_chars)
+ if (!empty($utf_sort))
{
- $tmp .= implode('', $utf_chars);
+ ksort($utf_sort);
+
+ foreach ($utf_sort as $utf_chars)
+ {
+ $tmp .= implode('', $utf_chars);
+ }
+ $utf_sort = array();
}
- $utf_sort = array();
- }
- $tmp .= UTF8_REPLACEMENT;
- $dump = $sort = 0;
+ $tmp .= UTF8_REPLACEMENT;
+ $dump = $sort = 0;
- $tmp_pos = $starter_pos = $pos;
- continue 2;
- }
+ $tmp_pos = $starter_pos = $pos;
+ continue 2;
+ }
break;
- case "\xE0":
- if ($utf_char <= "\xE0\x9F\xBF")
- {
- /**
- * Unicode char U+0000..U+07FF encoded in 3 bytes
- */
- $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
-
- if (!empty($utf_sort))
+ case "\xE0":
+ if ($utf_char <= "\xE0\x9F\xBF")
{
- ksort($utf_sort);
+ // Unicode char U+0000..U+07FF encoded in 3 bytes
+ $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
- foreach($utf_sort as $utf_chars)
+ if (!empty($utf_sort))
{
- $tmp .= implode('', $utf_chars);
+ ksort($utf_sort);
+
+ foreach ($utf_sort as $utf_chars)
+ {
+ $tmp .= implode('', $utf_chars);
+ }
+ $utf_sort = array();
}
- $utf_sort = array();
- }
- $tmp .= UTF8_REPLACEMENT;
- $dump = $sort = 0;
+ $tmp .= UTF8_REPLACEMENT;
+ $dump = $sort = 0;
- $tmp_pos = $starter_pos = $pos;
- continue 2;
- }
+ $tmp_pos = $starter_pos = $pos;
+ continue 2;
+ }
break;
- case "\xF0":
- if ($utf_char <= "\xF0\x8F\xBF\xBF")
- {
- /**
- * Unicode char U+0000..U+FFFF encoded in 4 bytes
- */
- $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
-
- if (!empty($utf_sort))
+ case "\xF0":
+ if ($utf_char <= "\xF0\x8F\xBF\xBF")
{
- ksort($utf_sort);
+ // Unicode char U+0000..U+FFFF encoded in 4 bytes
+ $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
- foreach($utf_sort as $utf_chars)
+ if (!empty($utf_sort))
{
- $tmp .= implode('', $utf_chars);
+ ksort($utf_sort);
+
+ foreach ($utf_sort as $utf_chars)
+ {
+ $tmp .= implode('', $utf_chars);
+ }
+ $utf_sort = array();
}
- $utf_sort = array();
- }
- $tmp .= UTF8_REPLACEMENT;
- $dump = $sort = 0;
+ $tmp .= UTF8_REPLACEMENT;
+ $dump = $sort = 0;
- $tmp_pos = $starter_pos = $pos;
- continue 2;
- }
+ $tmp_pos = $starter_pos = $pos;
+ continue 2;
+ }
break;
- default:
- if ($utf_char > UTF8_MAX)
- {
- /**
- * Out of the Unicode range
- */
- $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
-
- if (!empty($utf_sort))
+ default:
+ if ($utf_char > UTF8_MAX)
{
- ksort($utf_sort);
+ // Out of the Unicode range
+ $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
- foreach($utf_sort as $utf_chars)
+ if (!empty($utf_sort))
{
- $tmp .= implode('', $utf_chars);
+ ksort($utf_sort);
+
+ foreach ($utf_sort as $utf_chars)
+ {
+ $tmp .= implode('', $utf_chars);
+ }
+ $utf_sort = array();
}
- $utf_sort = array();
- }
- $tmp .= UTF8_REPLACEMENT;
- $dump = $sort = 0;
+ $tmp .= UTF8_REPLACEMENT;
+ $dump = $sort = 0;
- $tmp_pos = $starter_pos = $pos;
- continue 2;
- }
+ $tmp_pos = $starter_pos = $pos;
+ continue 2;
+ }
+ break;
+ }
}
}
- }
- else
- {
- /**
- * Hangul syllable
- */
- $idx = (((ord($utf_char[0]) & 0x0F) << 12) | ((ord($utf_char[1]) & 0x3F) << 6) | (ord($utf_char[2]) & 0x3F)) - UNICODE_HANGUL_SBASE;
-
- /**
- * LIndex can only range from 0 to 18, therefore it cannot influence
- * the first two bytes of the L Jamo, which allows us to hardcode
- * them (based on LBase).
- *
- * The same goes for VIndex, but for TIndex there's a catch: the value
- * of the third byte could exceed 0xBF and we would have to increment
- * the second byte
- */
- if ($tIndex = $idx % UNICODE_HANGUL_TCOUNT)
+ else
{
- if ($tIndex < 25)
+ // Hangul syllable
+ $idx = (((ord($utf_char[0]) & 0x0F) << 12) | ((ord($utf_char[1]) & 0x3F) << 6) | (ord($utf_char[2]) & 0x3F)) - UNICODE_HANGUL_SBASE;
+
+ // LIndex can only range from 0 to 18, therefore it cannot influence the first two bytes of the L Jamo, which allows us to hardcode them (based on LBase).
+ //
+ // The same goes for VIndex, but for TIndex there's a catch: the value of the third byte could exceed 0xBF and we would have to increment the second byte
+ if ($tIndex = $idx % UNICODE_HANGUL_TCOUNT)
{
- $utf_char = "\xE1\x84\x00\xE1\x85\x00\xE1\x86\x00";
- $utf_char[8] = chr(0xA7 + $tIndex);
+ if ($tIndex < 25)
+ {
+ $utf_char = "\xE1\x84\x00\xE1\x85\x00\xE1\x86\x00";
+ $utf_char[8] = chr(0xA7 + $tIndex);
+ }
+ else
+ {
+ $utf_char = "\xE1\x84\x00\xE1\x85\x00\xE1\x87\x00";
+ $utf_char[8] = chr(0x67 + $tIndex);
+ }
}
else
{
- $utf_char = "\xE1\x84\x00\xE1\x85\x00\xE1\x87\x00";
- $utf_char[8] = chr(0x67 + $tIndex);
+ $utf_char = "\xE1\x84\x00\xE1\x85\x00";
}
+
+ $utf_char[2] = chr(0x80 + (int) ($idx / UNICODE_HANGUL_NCOUNT));
+ $utf_char[5] = chr(0xA1 + (int) (($idx % UNICODE_HANGUL_NCOUNT) / UNICODE_HANGUL_TCOUNT));
+
+ // Just like other decompositions, the resulting Jamos must be dumped to the tmp string
+ $dump = 1;
}
- else
+
+ // Do we need to dump stuff to the tmp string?
+ if ($dump)
{
- $utf_char = "\xE1\x84\x00\xE1\x85\x00";
- }
+ $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
- $utf_char[2] = chr(0x80 + (int) ($idx / UNICODE_HANGUL_NCOUNT));
- $utf_char[5] = chr(0xA1 + (int) (($idx % UNICODE_HANGUL_NCOUNT) / UNICODE_HANGUL_TCOUNT));
+ // Dump combiners
+ if (!empty($utf_sort))
+ {
+ if ($sort)
+ {
+ ksort($utf_sort);
+ }
+ foreach ($utf_sort as $utf_chars)
+ {
+ $tmp .= implode('', $utf_chars);
+ }
+ }
- /**
- * Just like other decompositions, the resulting Jamos must
- * be dumped to the tmp string
- */
- $dump = 1;
- }
+ $tmp .= $utf_char;
+ $dump = $sort = 0;
+ $tmp_pos = $pos;
+ }
- /**
- * Do we need to dump stuff to the tmp string?
- */
+ $last_cc = 0;
+ $utf_sort = array();
+ $starter_pos = $pos;
+ }
+ }
+ else
+ {
+ // ASCII char, which happens to be a starter (as any other ASCII char)
if ($dump)
{
$tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
- /**
- * Dump combiners
- */
+ // Dump combiners
if (!empty($utf_sort))
{
if ($sort)
@@ -1842,15 +1523,21 @@ class utf_normalizer
ksort($utf_sort);
}
- foreach($utf_sort as $utf_chars)
+ foreach ($utf_sort as $utf_chars)
{
$tmp .= implode('', $utf_chars);
}
}
- $tmp .= $utf_char;
+ $tmp .= $str[$pos];
$dump = $sort = 0;
- $tmp_pos = $pos;
+ $tmp_pos = ++$pos;
+
+ $pos += strspn($str, UTF8_ASCII_RANGE, $pos);
+ }
+ else
+ {
+ $pos += strspn($str, UTF8_ASCII_RANGE, ++$pos);
}
$last_cc = 0;
@@ -1858,103 +1545,49 @@ class utf_normalizer
$starter_pos = $pos;
}
}
- else
+ while ($pos < $len);
+
+ // Now is time to return the string
+ if ($dump)
{
- /**
- * ASCII char, which happens to be a starter (as any other ASCII char)
- */
- if ($dump)
- {
- $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
+ $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
- /**
- * Dump combiners
- */
- if (!empty($utf_sort))
+ // Dump combiners
+ if (!empty($utf_sort))
+ {
+ if ($sort)
{
- if ($sort)
- {
- ksort($utf_sort);
- }
-
- foreach($utf_sort as $utf_chars)
- {
- $tmp .= implode('', $utf_chars);
- }
+ ksort($utf_sort);
}
- $tmp .= $str[$pos];
- $dump = $sort = 0;
- $tmp_pos = ++$pos;
-
- $pos += strspn($str, UTF8_ASCII_RANGE, $pos);
- }
- else
- {
- $pos += strspn($str, UTF8_ASCII_RANGE, ++$pos);
+ foreach ($utf_sort as $utf_chars)
+ {
+ $tmp .= implode('', $utf_chars);
+ }
}
- $last_cc = 0;
- $utf_sort = array();
- $starter_pos = $pos;
- }
- }
- while($pos < $len);
-
- /**
- * Now is time to return the string
- */
- if ($dump)
- {
- $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos);
+ return $tmp;
- /**
- * Dump combiners
- */
- if (!empty($utf_sort))
+ }
+ else if ($tmp_pos)
{
- if ($sort)
+ // If the $tmp_pos cursor was moved then at least one character was not in normal form. Replace $str with the fixed version
+ if ($tmp_pos == $len)
{
- ksort($utf_sort);
+ // The $tmp_pos cursor is at the end of $str, therefore $tmp holds the whole $str
+ return $tmp;
}
-
- foreach($utf_sort as $utf_chars)
+ else
{
- $tmp .= implode('', $utf_chars);
+ // The rightmost chunk of $str has not been appended to $tmp yet
+ return $tmp . substr($str, $tmp_pos);
}
}
- return $tmp;
-
- }
- elseif ($tmp_pos)
- {
- /**
- * If the $tmp_pos cursor was moved then at least one character was not in
- * normal form. Replace $str with the fixed version
- */
- if ($tmp_pos == $len)
- {
- /**
- * The $tmp_pos cursor is at the end of $str, therefore $tmp holds
- * the whole $str
- */
- return $tmp;
- }
- else
- {
- /**
- * The rightmost chunk of $str has not been appended to $tmp yet
- */
- return $tmp . substr($str, $tmp_pos);
- }
+ // The string was already in normal form
+ return $str;
}
-
- /**
- * The string was already in normal form
- */
- return $str;
}
}
-} \ No newline at end of file
+?> \ No newline at end of file
diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php
index b3c3c5ed5e..ede1dd85ea 100644
--- a/phpBB/includes/utf/utf_tools.php
+++ b/phpBB/includes/utf/utf_tools.php
@@ -59,17 +59,13 @@ function utf8_recode($string, $encoding)
return $string;
}
- /**
- * PHP has a built-in function for encoding from iso-8859-1, let's use that
- */
+ // PHP has a built-in function for encoding from iso-8859-1, let's use that
if ($encoding == 'iso-8859-1')
{
return utf8_encode($string);
}
- /**
- * First, try iconv()
- */
+ // First, try iconv()
if (function_exists('iconv'))
{
$ret = @iconv($encoding, 'utf-8', $string);
@@ -80,9 +76,7 @@ function utf8_recode($string, $encoding)
}
}
- /**
- * Try the mb_string extension
- */
+ // Try the mb_string extension
if (function_exists('mb_convert_encoding'))
{
$ret = @mb_convert_encoding($string, 'utf-8', $encoding);
@@ -93,9 +87,7 @@ function utf8_recode($string, $encoding)
}
}
- /**
- * Try the recode extension
- */
+ // Try the recode extension
if (function_exists('recode_string'))
{
$ret = @recode_string($encoding . '..utf-8', $string);
@@ -106,25 +98,21 @@ function utf8_recode($string, $encoding)
}
}
- /**
- * If nothing works, check if we have a custom transcoder available
- */
+ // If nothing works, check if we have a custom transcoder available
if (!preg_match('#^[a-z0-9\\-]+$#', $encoding))
{
- /**
- * Make sure the encoding name is alphanumeric, we don't want it
- * to be abused into loading arbitrary files
- */
- trigger_error('Unknown encoding: ' . $encoding);
+ // Make sure the encoding name is alphanumeric, we don't want it to be abused into loading arbitrary files
+ trigger_error('Unknown encoding: ' . $encoding, E_USER_ERROR);
}
global $phpbb_root_path;
+
if (!file_exists($phpbb_root_path . 'includes/utf/data/'))
{
return $string;
}
- die('Finish me!! '.basename(__FILE__).' at line '.__LINE__);
+ die('Finish me!! ' . basename(__FILE__) . ' at line ' . __LINE__);
}
/**
@@ -200,11 +188,11 @@ function utf8_decode_ncr_callback($m)
{
return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
}
- elseif ($cp > 0x7FF)
+ else if ($cp > 0x7FF)
{
return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
}
- elseif ($cp > 0x7F)
+ else if ($cp > 0x7F)
{
return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
}
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 4edb29e097..032a5e90bf 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -271,6 +271,7 @@ $lang = array_merge($lang, array(
'CURRENT_FILE' => 'Current original file',
'CURRENT_VERSION' => 'Current version',
+ 'DATABASE_UPDATE_INFO_OLD' => 'The latest version is newer than the database info stored. Please download the correct archive.',
'DESTINATION' => 'Destination file',
'DIFF_INLINE' => 'Inline',
'DIFF_RAW' => 'Raw unified diff',