4 files changed, 2911 insertions, 11 deletions
diff --git a/phpBB/develop/add_permissions.php b/phpBB/develop/add_permissions.php
index f368da5944..bc8c317c12 100644
--- a/phpBB/develop/add_permissions.php
+++ b/phpBB/develop/add_permissions.php
@@ -33,9 +33,9 @@ require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.'.$phpEx);
 require($phpbb_root_path . 'includes/db/' . $dbms . '.'.$phpEx);
 include($phpbb_root_path . 'includes/functions.'.$phpEx);
 
-define('ACL_NO', 0);
+define('ACL_NEVER', 0);
 define('ACL_YES', 1);
-define('ACL_UNSET', -1);
+define('ACL_NO', -1);
 
 define('ACL_GROUPS_TABLE', $table_prefix.'acl_groups');
 define('ACL_OPTIONS_TABLE', $table_prefix.'acl_options');
@@ -212,14 +212,14 @@ foreach ($prefixes as $prefix)
 		
 			echo "<p><b>Adding $auth_option...</b></p>\n";
 
-			mass_auth('group', 0, 'guests', $auth_option, ACL_NO);
-			mass_auth('group', 0, 'inactive', $auth_option, ACL_NO);
-			mass_auth('group', 0, 'inactive_coppa', $auth_option, ACL_NO);
-			mass_auth('group', 0, 'registered_coppa', $auth_option, ACL_NO);
-			mass_auth('group', 0, 'registered', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NO));
-			mass_auth('group', 0, 'global_moderators', $auth_option, (($prefix != 'a_') ? ACL_YES : ACL_NO));
+			mass_auth('group', 0, 'guests', $auth_option, ACL_NEVER);
+			mass_auth('group', 0, 'inactive', $auth_option, ACL_NEVER);
+			mass_auth('group', 0, 'inactive_coppa', $auth_option, ACL_NEVER);
+			mass_auth('group', 0, 'registered_coppa', $auth_option, ACL_NEVER);
+			mass_auth('group', 0, 'registered', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NEVER));
+			mass_auth('group', 0, 'global_moderators', $auth_option, (($prefix != 'a_') ? ACL_YES : ACL_NEVER));
 			mass_auth('group', 0, 'administrators', $auth_option, ACL_YES);
-			mass_auth('group', 0, 'bots', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NO));
+			mass_auth('group', 0, 'bots', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NEVER));
 		}
 	}
 }
@@ -236,7 +236,7 @@ echo "<p><b>Done</b></p>\n";
 	$forum_id = forum ids (array|int|0) -> 0 == all forums
 	$ug_id = [int] user_id|group_id : [string] usergroup name
 	$acl_list = [string] acl entry : [array] acl entries
-	$setting = ACL_YES|ACL_NO|ACL_UNSET
+	$setting = ACL_YES|ACL_NEVER|ACL_NO
 */
 function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 {
@@ -337,7 +337,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 
 			switch ($setting)
 			{
-				case ACL_UNSET:
+				case ACL_NO:
 					if (isset($cur_auth[$forum][$auth_option_id]))
 					{
 						$sql_ary['delete'][] = "DELETE FROM $table 
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
new file mode 100644
index 0000000000..1cc5494e53
--- /dev/null
+++ b/phpBB/develop/create_schema_files.php
@@ -0,0 +1,1961 @@
+<?php
+/** 
+*
+* @package phpBB3
+* @version $Id$
+* @copyright (c) 2006 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+* This file creates new schema files for every database.
+* The filenames will be prefixed with an underscore to not overwrite the current schema files.
+*
+* If you overwrite the original schema files please make sure you save the file with UNIX linefeeds.
+*/
+
+die("Please read the first lines of this script for instructions on how to enable it");
+
+set_time_limit(0);
+
+$schema_path = './../install/schemas/';
+
+if (!is_writeable($schema_path))
+{
+	die('Schema path not writeable');
+}
+
+$schema_data = get_schema_struct();
+$dbms_type_map = array(
+	'mysql'		=> array(
+		'INT:'		=> 'int(%d)',
+		'BINT'		=> 'bigint(20)',
+		'UINT'		=> 'mediumint(8) UNSIGNED',
+		'UINT:'		=> 'int(%d) UNSIGNED',
+		'TINT:'		=> 'tinyint(%d)',
+		'USINT'		=> 'smallint(4) UNSIGNED',
+		'BOOL'		=> 'tinyint(1) UNSIGNED',
+		'VCHAR'		=> 'varchar(255)',
+		'VCHAR:'	=> 'varchar(%d)',
+		'CHAR:'		=> 'char(%d)',
+		'XSTEXT'	=> 'text',
+		'STEXT'		=> 'text',
+		'TEXT'		=> 'text',
+		'MTEXT'		=> 'mediumtext',
+		'TIMESTAMP'	=> 'int(11) UNSIGNED',
+		'DECIMAL'	=> 'decimal(5,2)',
+		'VCHAR_BIN'	=> 'varchar(252) /*!40101 CHARACTER SET utf8 */ BINARY',
+		'VCHAR_CI'	=> 'varchar(252)',
+		'VARBINARY'	=> 'varbinary(255)',
+	),
+
+	'firebird'	=> array(
+		'INT:'		=> 'INTEGER',
+		'BINT'		=> 'DOUBLE PRECISION',
+		'UINT'		=> 'INTEGER',
+		'UINT:'		=> 'INTEGER',
+		'TINT:'		=> 'INTEGER',
+		'USINT'		=> 'INTEGER',
+		'BOOL'		=> 'INTEGER',
+		'VCHAR'		=> 'VARCHAR(255)',
+		'VCHAR:'	=> 'VARCHAR(%d)',
+		'CHAR:'		=> 'CHAR(%d)',
+		'XSTEXT'	=> 'BLOB SUB_TYPE TEXT',
+		'STEXT'		=> 'BLOB SUB_TYPE TEXT',
+		'TEXT'		=> 'BLOB SUB_TYPE TEXT',
+		'MTEXT'		=> 'BLOB SUB_TYPE TEXT',
+		'TIMESTAMP'	=> 'INTEGER',
+		'DECIMAL'	=> 'DOUBLE PRECISION',
+		'VCHAR_BIN'	=> 'VARCHAR(84) CHARACTER SET UNICODE_FSS',
+		'VCHAR_CI'	=> 'VARCHAR(252)',
+		'VARBINARY'	=> 'CHAR(255)',
+	),
+
+	'mssql'		=> array(
+		'INT:'		=> '[int]',
+		'BINT'		=> '[float]',
+		'UINT'		=> '[int]',
+		'UINT:'		=> '[int]',
+		'TINT:'		=> '[int]',
+		'USINT'		=> '[int]',
+		'BOOL'		=> '[int]',
+		'VCHAR'		=> '[varchar] (255)',
+		'VCHAR:'	=> '[varchar] (%d)',
+		'CHAR:'		=> '[char] (%d)',
+		'XSTEXT'	=> '[varchar] (1000)',
+		'STEXT'		=> '[varchar] (3000)',
+		'TEXT'		=> '[varchar] (8000)',
+		'MTEXT'		=> '[text]',
+		'TIMESTAMP'	=> '[int]',
+		'DECIMAL'	=> '[float]',
+		'VCHAR_BIN'	=> '[nvarchar] (252)',
+		'VCHAR_CI'	=> '[varchar] (252)',
+		'VARBINARY'	=> '[varbinary] (255)',
+	),
+
+	'oracle'	=> array(
+		'INT:'		=> 'number(%d)',
+		'BINT'		=> 'number(20)',
+		'UINT'		=> 'number(8)',
+		'UINT:'		=> 'number(%d)',
+		'TINT:'		=> 'number(%d)',
+		'USINT'		=> 'number(4)',
+		'BOOL'		=> 'number(1)',
+		'VCHAR'		=> 'varchar2(255)',
+		'VCHAR:'	=> 'varchar2(%d)',
+		'CHAR:'		=> 'char(%d)',
+		'XSTEXT'	=> 'varchar2(1000)',
+		'STEXT'		=> 'varchar2(3000)',
+		'TEXT'		=> 'clob',
+		'MTEXT'		=> 'clob',
+		'TIMESTAMP'	=> 'number(11)',
+		'DECIMAL'	=> 'number(5, 2)',
+		'VCHAR_BIN'	=> 'nvarchar2(252)',
+		'VCHAR_CI'	=> 'varchar2(252)',
+		'VARBINARY'	=> 'raw(255)',
+	),
+
+	'sqlite'	=> array(
+		'INT:'		=> 'int(%d)',
+		'BINT'		=> 'bigint(20)',
+		'UINT'		=> 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED',
+		'UINT:'		=> 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED',
+		'TINT:'		=> 'tinyint(%d)',
+		'USINT'		=> 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED',
+		'BOOL'		=> 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED',
+		'VCHAR'		=> 'varchar(255)',
+		'VCHAR:'	=> 'varchar(%d)',
+		'CHAR:'		=> 'char(%d)',
+		'XSTEXT'	=> 'text(65535)',
+		'STEXT'		=> 'text(65535)',
+		'TEXT'		=> 'text(65535)',
+		'MTEXT'		=> 'mediumtext(16777215)',
+		'TIMESTAMP'	=> 'INTEGER UNSIGNED', //'int(11) UNSIGNED',
+		'DECIMAL'	=> 'decimal(5,2)',
+		'VCHAR_BIN'	=> 'nvarchar(252)',
+		'VCHAR_CI'	=> 'varchar(252)',
+		'VARBINARY'	=> 'blob',
+	),
+
+	'postgres'	=> array(
+		'INT:'		=> 'INT4',
+		'BINT'		=> 'INT8',
+		'UINT'		=> 'INT4', // unsigned
+		'UINT:'		=> 'INT4', // unsigned
+		'USINT'		=> 'INT2', // unsigned
+		'BOOL'		=> 'INT2', // unsigned
+		'TINT:'		=> 'INT2',
+		'VCHAR'		=> 'varchar(255)',
+		'VCHAR:'	=> 'varchar(%d)',
+		'CHAR:'		=> 'char(%d)',
+		'XSTEXT'	=> 'varchar(1000)',
+		'STEXT'		=> 'varchar(3000)',
+		'TEXT'		=> 'varchar(8000)',
+		'MTEXT'		=> 'TEXT',
+		'TIMESTAMP'	=> 'INT4', // unsigned
+		'DECIMAL'	=> 'decimal(5,2)',
+		'VCHAR_BIN'	=> 'varchar(252)',
+		'VCHAR_CI'	=> 'varchar_ci',
+		'VARBINARY'	=> 'bytea',
+	),
+);
+
+// A list of types being unsigned for better reference in some db's
+$unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
+$supported_dbms = array('firebird', 'mssql', 'mysql', 'oracle', 'postgres', 'sqlite');
+
+foreach ($supported_dbms as $dbms)
+{
+	$fp = fopen($schema_path . '_' . $dbms . '_schema.sql', 'wt');
+
+	$line = '';
+
+	// Write Header
+	switch ($dbms)
+	{
+		case 'mysql':
+			$line = "#\n# MySQL Schema for phpBB 3.x - (c) phpBB Group, 2005\n#\n# \$I" . "d: $\n#\n\n";
+		break;
+
+		case 'firebird':
+			$line = "#\n# Firebird Schema for phpBB 3.x - (c) phpBB Group, 2005\n#\n# \$I" . "d: $\n#\n\n";
+			$line .= custom_data('firebird') . "\n";
+		break;
+
+		case 'sqlite':
+			$line = "#\n# SQLite Schema for phpBB 3.x - (c) phpBB Group, 2005\n#\n# \$I" . "d: $\n#\n\n";
+			$line .= "BEGIN TRANSACTION;\n\n";
+		break;
+
+		case 'mssql':
+			$line = "/*\n MSSQL Schema for phpBB 3.x - (c) phpBB Group, 2005\n\n \$I" . "d: $\n\n*/\n\n";
+			$line .= "BEGIN TRANSACTION\nGO\n\n";
+		break;
+
+		case 'oracle':
+			$line = "/*\n Oracle Schema for phpBB 3.x - (c) phpBB Group, 2005\n\n \$I" . "d: $\n\n*/\n\n";
+			$line .= custom_data('oracle') . "\n";
+		break;
+
+		case 'postgres':
+			$line = "/*\n PostgreSQL Schema for phpBB 3.x - (c) phpBB Group, 2005\n\n \$I" . "d: $\n\n*/\n\n";
+			$line .= "BEGIN;\n\n";
+			$line .= custom_data('postgres') . "\n";
+		break;
+	}
+
+	fwrite($fp, $line);
+
+	foreach ($schema_data as $table_name => $table_data)
+	{
+		// Write comment about table
+		switch ($dbms)
+		{
+			case 'mysql':
+			case 'firebird':
+			case 'sqlite':
+				fwrite($fp, "# Table: '{$table_name}'\n");
+			break;
+
+			case 'mssql':
+			case 'oracle':
+			case 'postgres':
+				fwrite($fp, "/*\n\tTable: '{$table_name}'\n*/\n");
+			break;
+		}
+
+		// Create Table statement
+		$generator = $textimage = false;
+		$line = '';
+
+		switch ($dbms)
+		{
+			case 'mysql':
+			case 'firebird':
+			case 'oracle':
+			case 'sqlite':
+			case 'postgres':
+				$line = "CREATE TABLE {$table_name} (\n";
+			break;
+
+			case 'mssql':
+				$line = "CREATE TABLE [{$table_name}] (\n";
+			break;
+		}
+
+		// Write columns one by one...
+		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
+		{
+			// Get type
+			if (strpos($column_data[0], ':') !== false)
+			{
+				list($orig_column_type, $column_length) = explode(':', $column_data[0]);
+
+				$column_type = sprintf($dbms_type_map[$dbms][$orig_column_type . ':'], $column_length);
+				$orig_column_type .= ':';
+			}
+			else
+			{
+				$orig_column_type = $column_data[0];
+				$column_type = $dbms_type_map[$dbms][$column_data[0]];
+			}
+
+			// Adjust default value if db-dependant specified
+			if (is_array($column_data[1]))
+			{
+				$column_data[1] = (isset($column_data[1][$dbms])) ? $column_data[1][$dbms] : $column_data[1]['default'];
+			}
+
+			switch ($dbms)
+			{
+				case 'mysql':
+					$line .= "\t{$column_name} {$column_type} ";
+
+					// For hexadecimal values do not use single quotes
+					if (!is_null($column_data[1]))
+					{
+						$line .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
+					}
+					$line .= 'NOT NULL';
+
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$line .= ' auto_increment';
+					}
+
+					$line .= ",\n";
+				break;
+
+				case 'sqlite':
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$line .= "\t{$column_name} INTEGER PRIMARY KEY ";
+						$generator = $column_name;
+					}
+					else
+					{
+						$line .= "\t{$column_name} {$column_type} ";
+					}
+
+					$line .= 'NOT NULL ';
+					$line .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
+					$line .= ",\n";
+				break;
+
+				case 'firebird':
+					$line .= "\t{$column_name} {$column_type} ";
+
+					if (!is_null($column_data[1]))
+					{
+						$line .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
+					}
+
+					$line .= "NOT NULL,\n";
+
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$generator = $column_name;
+					}
+				break;
+
+				case 'mssql':
+					if ($column_type == '[text]')
+					{
+						$textimage = true;
+					}
+
+					$line .= "\t[{$column_name}] {$column_type} ";
+
+					if (!is_null($column_data[1]))
+					{
+						// For hexadecimal values do not use single quotes
+						if (strpos($column_data[1], '0x') === 0)
+						{
+							$line .= 'DEFAULT (' . $column_data[1] . ') ';
+						}
+						else
+						{
+							$line .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
+						}
+					}
+
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$line .= 'IDENTITY (1, 1) ';
+					}
+
+					$line .= 'NOT NULL';
+					$line .= " ,\n";
+				break;
+
+				case 'oracle':
+					$line .= "\t{$column_name} {$column_type} ";
+					$line .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
+
+					// In Oracle empty strings ('') are treated as NULL.
+					// Therefore in oracle we allow NULL's for all DEFAULT '' entries
+					$line .= ($column_data[1] === '') ? ",\n" : "NOT NULL,\n";
+
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$generator = $column_name;
+					}
+				break;
+
+				case 'postgres':
+					$line .= "\t{$column_name} {$column_type} ";
+
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$line .= "DEFAULT nextval('{$table_name}_seq'),\n";
+
+						// Make sure the sequence will be created before creating the table
+						$line = "CREATE SEQUENCE {$table_name}_seq;\n\n" . $line;
+					}
+					else
+					{
+						$line .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
+						$line .= "NOT NULL";
+
+						// Unsigned? Then add a CHECK contraint
+						if (in_array($orig_column_type, $unsigned_types))
+						{
+							$line .= " CHECK ({$column_name} >= 0)";
+						}
+
+						$line .= ",\n";
+					}
+				break;
+			}
+		}
+
+		switch ($dbms)
+		{
+			case 'firebird':
+				// Remove last line delimiter...
+				$line = substr($line, 0, -2);
+				$line .= "\n);;\n\n";
+			break;
+
+			case 'mssql':
+				$line = substr($line, 0, -2);
+				$line .= "\n) ON [PRIMARY]" . (($textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '') . "\n";
+				$line .= "GO\n\n";
+			break;
+		}
+
+		// Write primary key
+		if (isset($table_data['PRIMARY_KEY']))
+		{
+			if (!is_array($table_data['PRIMARY_KEY']))
+			{
+				$table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']);
+			}
+
+			switch ($dbms)
+			{
+				case 'mysql':
+				case 'postgres':
+					$line .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
+				break;
+
+				case 'firebird':
+					$line .= "ALTER TABLE {$table_name} ADD PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ");;\n\n";
+				break;
+
+				case 'sqlite':
+					if ($generator === false || !in_array($generator, $table_data['PRIMARY_KEY']))
+					{
+						$line .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
+					}
+				break;
+
+				case 'mssql':
+					$line .= "ALTER TABLE [{$table_name}] WITH NOCHECK ADD \n";
+					$line .= "\tCONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED \n";
+					$line .= "\t(\n";
+					$line .= "\t\t[" . implode("],\n\t\t[", $table_data['PRIMARY_KEY']) . "]\n";
+					$line .= "\t)  ON [PRIMARY] \n";
+					$line .= "GO\n\n";
+				break;
+
+				case 'oracle':
+					$line .= "\tCONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
+				break;
+			}
+		}
+
+		switch ($dbms)
+		{
+			case 'oracle':
+				// UNIQUE contrains to be added?
+				if (isset($table_data['KEYS']))
+				{
+					foreach ($table_data['KEYS'] as $key_name => $key_data)
+					{
+						if (!is_array($key_data[1]))
+						{
+							$key_data[1] = array($key_data[1]);
+						}
+
+						if ($key_data[0] == 'UNIQUE')
+						{
+							$line .= "\tCONSTRAINT u_phpbb_{$key_name} UNIQUE (" . implode(', ', $key_data[1]) . "),\n";
+						}
+					}
+				}
+
+				// Remove last line delimiter...
+				$line = substr($line, 0, -2);
+				$line .= "\n)\n/\n\n";
+			break;
+
+			case 'postgres':
+				// Remove last line delimiter...
+				$line = substr($line, 0, -2);
+				$line .= "\n);\n\n";
+			break;
+
+			case 'sqlite':
+				// Remove last line delimiter...
+				$line = substr($line, 0, -2);
+				$line .= "\n);\n\n";
+			break;
+		}
+
+		// Write Keys
+		if (isset($table_data['KEYS']))
+		{
+			foreach ($table_data['KEYS'] as $key_name => $key_data)
+			{
+				if (!is_array($key_data[1]))
+				{
+					$key_data[1] = array($key_data[1]);
+				}
+
+				switch ($dbms)
+				{
+					case 'mysql':
+						$line .= ($key_data[0] == 'INDEX') ? "\tKEY" : '';
+						$line .= ($key_data[0] == 'UNIQUE') ? "\tUNIQUE" : '';
+						$line .= ' ' . $key_name . ' (' . implode(', ', $key_data[1]) . "),\n";
+					break;
+
+					case 'firebird':
+						$line .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
+						$line .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
+
+						$line .= ' ' . $table_name . '_' . $key_name . ' ON ' . $table_name . '(' . implode(', ', $key_data[1]) . ");;\n";
+					break;
+
+					case 'mssql':
+						$line .= ($key_data[0] == 'INDEX') ? 'CREATE  INDEX' : '';
+						$line .= ($key_data[0] == 'UNIQUE') ? 'CREATE  UNIQUE  INDEX' : '';
+						$line .= " [{$key_name}] ON [{$table_name}]([" . implode('], [', $key_data[1]) . "]) ON [PRIMARY]\n";
+						$line .= "GO\n\n";
+					break;
+
+					case 'oracle':
+						if ($key_data[0] == 'UNIQUE')
+						{
+							continue;
+						}
+
+						$line .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
+						
+						$line .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ")\n";
+						$line .= "/\n";
+					break;
+
+					case 'sqlite':
+						$line .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
+						$line .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
+
+						$line .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ");\n";
+					break;
+
+					case 'postgres':
+						$line .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
+						$line .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
+
+						$line .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ");\n";
+					break;
+				}
+			}
+		}
+
+		switch ($dbms)
+		{
+			case 'mysql':
+				// Remove last line delimiter...
+				$line = substr($line, 0, -2);
+				$line .= "\n);\n\n";
+			break;
+
+			// Create Generator
+			case 'firebird':
+				if ($generator !== false)
+				{
+					$line .= "\nCREATE GENERATOR {$table_name}_gen;;\n";
+					$line .= 'SET GENERATOR ' . $table_name . "_gen TO 0;;\n\n";
+
+					$line .= 'CREATE TRIGGER t_' . $table_name . ' FOR ' . $table_name . "\n";
+					$line .= "BEFORE INSERT\nAS\nBEGIN\n";
+					$line .= "\tNEW.{$generator} = GEN_ID({$table_name}_gen, 1);\nEND;;\n\n";
+				}
+			break;
+
+			case 'oracle':
+				if ($generator !== false)
+				{
+					$line .= "\nCREATE SEQUENCE {$table_name}_seq\n/\n\n";
+
+					$line .= "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
+					$line .= "BEFORE INSERT ON {$table_name}\n";
+					$line .= "FOR EACH ROW WHEN (\n";
+					$line .= "\tnew.{$generator} IS NULL OR new.{$generator} = 0\n";
+					$line .= ")\nBEGIN\n";
+					$line .= "\tSELECT {$table_name}_seq.nextval\n";
+					$line .= "\tINTO :new.{$generator}\n";
+					$line .= "\tFROM dual;\nEND;\n/\n\n";
+				}
+			break;
+		}
+
+		fwrite($fp, $line . "\n");
+	}
+
+	$line = '';
+
+	// Write custom function at the end for some db's
+	switch ($dbms)
+	{
+		case 'mssql':
+			$line = "\nCOMMIT\nGO\n\n";
+		break;
+
+		case 'sqlite':
+			$line = "\nCOMMIT;";
+		break;
+
+		case 'postgres':
+			$line = "\nCOMMIT;";
+		break;
+	}
+
+	fwrite($fp, $line);
+	fclose($fp);
+}
+
+
+/**
+* Define the basic structure
+* The format:
+*		array('{TABLE_NAME}' => {TABLE_DATA})
+*		{TABLE_DATA}:
+*			COLUMNS = array({column_name} = array({column_type}, {default}, {auto_increment}))
+*			PRIMARY_KEY = {column_name(s)}
+*			KEYS = array({key_name} = array({key_type}, {column_name(s)})),
+*
+*	Column Types:
+*	INT:x		=> SIGNED int(x)
+*	BINT		=> BIGINT
+*	UINT		=> mediumint(8) UNSIGNED
+*	UINT:x		=> int(x) UNSIGNED
+*	TINT:x		=> tinyint(x)
+*	USINT		=> smallint(4) UNSIGNED (for _order columns)
+*	BOOL		=> tinyint(1) UNSIGNED
+*	VCHAR		=> varchar(255)
+*	CHAR:x		=> char(x)
+*	XSTEXT		=> text for storing 1000 characters (topic_title for example)
+*	STEXT		=> text for storing 3000 characters (normal input field with a max of 255 single-byte chars)
+*	TEXT		=> text for storing 8000 characters (short text, descriptions, comments, etc.)
+*	MTEXT		=> mediumtext (post text, large text)
+*	VCHAR:x		=> varchar(x)
+*	TIMESTAMP	=> int(11) UNSIGNED
+*	DECIMAL		=> decimal number (5,2)
+*	VCHAR_BIN	=> varchar(252) BINARY
+*	VCHAR_CI	=> varchar_ci for postgresql, others VCHAR
+*/
+function get_schema_struct()
+{
+	$schema_data = array();
+
+	$schema_data['phpbb_attachments'] = array(
+		'COLUMNS'		=> array(
+			'attach_id'			=> array('UINT', NULL, 'auto_increment'),
+			'post_msg_id'		=> array('UINT', 0),
+			'topic_id'			=> array('UINT', 0),
+			'in_message'		=> array('BOOL', 0),
+			'poster_id'			=> array('UINT', 0),
+			'physical_filename'	=> array('VCHAR', ''),
+			'real_filename'		=> array('VCHAR', ''),
+			'download_count'	=> array('UINT', 0),
+			'attach_comment'	=> array('TEXT', ''),
+			'extension'			=> array('VCHAR:100', ''),
+			'mimetype'			=> array('VCHAR:100', ''),
+			'filesize'			=> array('UINT:20', 0),
+			'filetime'			=> array('TIMESTAMP', 0),
+			'thumbnail'			=> array('BOOL', 0),
+		),
+		'PRIMARY_KEY'	=> 'attach_id',
+		'KEYS'			=> array(
+			'filetime'			=> array('INDEX', 'filetime'),
+			'post_msg_id'		=> array('INDEX', 'post_msg_id'),
+			'topic_id'			=> array('INDEX', 'topic_id'),
+			'poster_id'			=> array('INDEX', 'poster_id'),
+			'filesize'			=> array('INDEX', 'filesize'),
+		),
+	);
+
+	$schema_data['phpbb_acl_groups'] = array(
+		'COLUMNS'		=> array(
+			'group_id'			=> array('UINT', 0),
+			'forum_id'			=> array('UINT', 0),
+			'auth_option_id'	=> array('UINT', 0),
+			'auth_role_id'		=> array('UINT', 0),
+			'auth_setting'		=> array('TINT:2', 0),
+		),
+		'KEYS'			=> array(
+			'group_id'		=> array('INDEX', 'group_id'),
+			'auth_opt_id'	=> array('INDEX', 'auth_option_id'),
+		),
+	);
+
+	$schema_data['phpbb_acl_options'] = array(
+		'COLUMNS'		=> array(
+			'auth_option_id'	=> array('UINT', NULL, 'auto_increment'),
+			'auth_option'		=> array('VCHAR:50', ''),
+			'is_global'			=> array('BOOL', 0),
+			'is_local'			=> array('BOOL', 0),
+			'founder_only'		=> array('BOOL', 0),
+		),
+		'PRIMARY_KEY'	=> 'auth_option_id',
+		'KEYS'			=> array(
+			'auth_option'		=> array('INDEX', 'auth_option'),
+		),
+	);
+
+	$schema_data['phpbb_acl_roles'] = array(
+		'COLUMNS'		=> array(
+			'role_id'			=> array('UINT', NULL, 'auto_increment'),
+			'role_name'			=> array('VCHAR', ''),
+			'role_description'	=> array('TEXT', ''),
+			'role_type'			=> array('VCHAR:10', ''),
+			'role_order'		=> array('USINT', 0),
+		),
+		'PRIMARY_KEY'	=> 'role_id',
+		'KEYS'			=> array(
+			'role_type'			=> array('INDEX', 'role_type'),
+			'role_order'		=> array('INDEX', 'role_order'),
+		),
+	);
+
+	$schema_data['phpbb_acl_roles_data'] = array(
+		'COLUMNS'		=> array(
+			'role_id'			=> array('UINT', 0),
+			'auth_option_id'	=> array('UINT', 0),
+			'auth_setting'		=> array('TINT:2', 0),
+		),
+		'PRIMARY_KEY'	=> array('role_id', 'auth_option_id'),
+	);
+
+	$schema_data['phpbb_acl_users'] = array(
+		'COLUMNS'		=> array(
+			'user_id'			=> array('UINT', 0),
+			'forum_id'			=> array('UINT', 0),
+			'auth_option_id'	=> array('UINT', 0),
+			'auth_role_id'		=> array('UINT', 0),
+			'auth_setting'		=> array('TINT:2', 0),
+		),
+		'KEYS'			=> array(
+			'user_id'			=> array('INDEX', 'user_id'),
+			'auth_option_id'	=> array('INDEX', 'auth_option_id'),
+		),
+	);
+
+	$schema_data['phpbb_banlist'] = array(
+		'COLUMNS'		=> array(
+			'ban_id'			=> array('UINT', NULL, 'auto_increment'),
+			'ban_userid'		=> array('UINT', 0),
+			'ban_ip'			=> array('VCHAR:40', ''),
+			'ban_email'			=> array('VCHAR:100', ''),
+			'ban_start'			=> array('TIMESTAMP', 0),
+			'ban_end'			=> array('TIMESTAMP', 0),
+			'ban_exclude'		=> array('BOOL', 0),
+			'ban_reason'		=> array('STEXT', ''),
+			'ban_give_reason'	=> array('STEXT', ''),
+		),
+		'PRIMARY_KEY'			=> 'ban_id',
+		'KEYS'			=> array(
+			'ban_end'			=> array('INDEX', 'ban_end'),
+			'ban_user'			=> array('INDEX', array('ban_userid', 'ban_exclude')),
+			'ban_email'			=> array('INDEX', array('ban_email', 'ban_exclude')),
+			'ban_ip'			=> array('INDEX', array('ban_ip', 'ban_exclude')),
+		),
+	);
+
+	$schema_data['phpbb_bbcodes'] = array(
+		'COLUMNS'		=> array(
+			'bbcode_id'				=> array('TINT:3', 0),
+			'bbcode_tag'			=> array('VCHAR:16', ''),
+			'bbcode_helpline'		=> array('VCHAR', ''),
+			'display_on_posting'	=> array('BOOL', 0),
+			'bbcode_match'			=> array('TEXT', ''),
+			'bbcode_tpl'			=> array('MTEXT', ''),
+			'first_pass_match'		=> array('MTEXT', ''),
+			'first_pass_replace'	=> array('MTEXT', ''),
+			'second_pass_match'		=> array('MTEXT', ''),
+			'second_pass_replace'	=> array('MTEXT', ''),
+		),
+		'PRIMARY_KEY'	=> 'bbcode_id',
+		'KEYS'			=> array(
+			'display_on_post'		=> array('INDEX', 'display_on_posting'),
+		),
+	);
+
+	$schema_data['phpbb_bookmarks'] = array(
+		'COLUMNS'		=> array(
+			'topic_id'			=> array('UINT', 0),
+			'user_id'			=> array('UINT', 0),
+			'order_id'			=> array('UINT', 0),
+		),
+		'KEYS'			=> array(
+			'order_id'			=> array('INDEX', 'order_id'),
+			'topic_user_id'		=> array('INDEX', array('topic_id', 'user_id')),
+		),
+	);
+
+	$schema_data['phpbb_bots'] = array(
+		'COLUMNS'		=> array(
+			'bot_id'			=> array('UINT', NULL, 'auto_increment'),
+			'bot_active'		=> array('BOOL', 1),
+			'bot_name'			=> array('STEXT', ''),
+			'user_id'			=> array('UINT', 0),
+			'bot_agent'			=> array('VCHAR', ''),
+			'bot_ip'			=> array('VCHAR', ''),
+		),
+		'PRIMARY_KEY'	=> 'bot_id',
+		'KEYS'			=> array(
+			'bot_active'		=> array('INDEX', 'bot_active'),
+		),
+	);
+
+	$schema_data['phpbb_config'] = array(
+		'COLUMNS'		=> array(
+			'config_name'		=> array('VCHAR:252', ''),
+			'config_value'		=> array('VCHAR', ''),
+			'is_dynamic'		=> array('BOOL', 0),
+		),
+		'PRIMARY_KEY'	=> 'config_name',
+		'KEYS'			=> array(
+			'is_dynamic'		=> array('INDEX', 'is_dynamic'),
+		),
+	);
+
+	$schema_data['phpbb_confirm'] = array(
+		'COLUMNS'		=> array(
+			'confirm_id'		=> array('CHAR:32', ''),
+			'session_id'		=> array('CHAR:32', ''),
+			'confirm_type'		=> array('TINT:3', 0),
+			'code'				=> array('VCHAR:8', ''),
+		),
+		'PRIMARY_KEY'	=> array('session_id', 'confirm_id'),
+		'KEYS'			=> array(
+			'confirm_type'		=> array('INDEX', 'confirm_type'),
+		),
+	);
+
+	$schema_data['phpbb_disallow'] = array(
+		'COLUMNS'		=> array(
+			'disallow_id'		=> array('UINT', NULL, 'auto_increment'),
+			'disallow_username'	=> array('VCHAR:252', ''),
+		),
+		'PRIMARY_KEY'	=> 'disallow_id',
+	);
+
+	$schema_data['phpbb_drafts'] = array(
+		'COLUMNS'		=> array(
+			'draft_id'			=> array('UINT', NULL, 'auto_increment'),
+			'user_id'			=> array('UINT', 0),
+			'topic_id'			=> array('UINT', 0),
+			'forum_id'			=> array('UINT', 0),
+			'save_time'			=> array('TIMESTAMP', 0),
+			'draft_subject'		=> array('XSTEXT', ''),
+			'draft_message'		=> array('MTEXT', ''),
+		),
+		'PRIMARY_KEY'	=> 'draft_id',
+		'KEYS'			=> array(
+			'save_time'			=> array('INDEX', 'save_time'),
+		),
+	);
+
+	$schema_data['phpbb_extensions'] = array(
+		'COLUMNS'		=> array(
+			'extension_id'		=> array('UINT', NULL, 'auto_increment'),
+			'group_id'			=> array('UINT', 0),
+			'extension'			=> array('VCHAR:100', ''),
+		),
+		'PRIMARY_KEY'	=> 'extension_id',
+	);
+
+	$schema_data['phpbb_extension_groups'] = array(
+		'COLUMNS'		=> array(
+			'group_id'			=> array('UINT', NULL, 'auto_increment'),
+			'group_name'		=> array('VCHAR', ''),
+			'cat_id'			=> array('TINT:2', 0),
+			'allow_group'		=> array('BOOL', 0),
+			'download_mode'		=> array('BOOL', 1),
+			'upload_icon'		=> array('VCHAR', ''),
+			'max_filesize'		=> array('UINT:20', 0),
+			'allowed_forums'	=> array('TEXT', ''),
+			'allow_in_pm'		=> array('BOOL', 0),
+		),
+		'PRIMARY_KEY'	=> 'group_id',
+	);
+
+	$schema_data['phpbb_forums'] = array(
+		'COLUMNS'		=> array(
+			'forum_id'				=> array('UINT', NULL, 'auto_increment'),
+			'parent_id'				=> array('UINT', 0),
+			'left_id'				=> array('UINT', 0),
+			'right_id'				=> array('UINT', 0),
+			'forum_parents'			=> array('MTEXT', ''),
+			'forum_name'			=> array('STEXT', ''),
+			'forum_desc'			=> array('TEXT', ''),
+			'forum_desc_bitfield'	=> array('VCHAR:252', ''),
+			'forum_desc_options'	=> array('UINT:11', 0),
+			'forum_desc_uid'		=> array('VCHAR:5', ''),
+			'forum_link'			=> array('VCHAR', ''),
+			'forum_password'		=> array('VCHAR:40', ''),
+			'forum_style'			=> array('TINT:4', 0),
+			'forum_image'			=> array('VCHAR', ''),
+			'forum_rules'			=> array('TEXT', ''),
+			'forum_rules_link'		=> array('VCHAR', ''),
+			'forum_rules_bitfield'	=> array('VCHAR:252', ''),
+			'forum_rules_options'	=> array('UINT:11', 0),
+			'forum_rules_uid'		=> array('VCHAR:5', ''),
+			'forum_topics_per_page'	=> array('TINT:4', 0),
+			'forum_type'			=> array('TINT:4', 0),
+			'forum_status'			=> array('TINT:4', 0),
+			'forum_posts'			=> array('UINT', 0),
+			'forum_topics'			=> array('UINT', 0),
+			'forum_topics_real'		=> array('UINT', 0),
+			'forum_last_post_id'	=> array('UINT', 0),
+			'forum_last_poster_id'	=> array('UINT', 0),
+			'forum_last_post_time'	=> array('TIMESTAMP', 0),
+			'forum_last_poster_name'=> array('VCHAR', ''),
+			'forum_flags'			=> array('TINT:4', 32),
+			'display_on_index'		=> array('BOOL', 1),
+			'enable_indexing'		=> array('BOOL', 1),
+			'enable_icons'			=> array('BOOL', 1),
+			'enable_prune'			=> array('BOOL', 0),
+			'prune_next'			=> array('TIMESTAMP', 0),
+			'prune_days'			=> array('TINT:4', 0),
+			'prune_viewed'			=> array('TINT:4', 0),
+			'prune_freq'			=> array('TINT:4', 0),
+		),
+		'PRIMARY_KEY'	=> 'forum_id',
+		'KEYS'			=> array(
+			'left_right_id'			=> array('INDEX', array('left_id', 'right_id')),
+			'forum_lastpost_id'		=> array('INDEX', 'forum_last_post_id'),
+		),
+	);
+
+	$schema_data['phpbb_forums_access'] = array(
+		'COLUMNS'		=> array(
+			'forum_id'				=> array('UINT', 0),
+			'user_id'				=> array('UINT', 0),
+			'session_id'			=> array('CHAR:32', ''),
+		),
+		'PRIMARY_KEY'	=> array('forum_id', 'user_id', 'session_id'),
+	);
+
+	$schema_data['phpbb_forums_track'] = array(
+		'COLUMNS'		=> array(
+			'user_id'				=> array('UINT', 0),
+			'forum_id'				=> array('UINT', 0),
+			'mark_time'				=> array('TIMESTAMP', 0),
+		),
+		'PRIMARY_KEY'	=> array('user_id', 'forum_id'),
+	);
+
+	$schema_data['phpbb_forums_watch'] = array(
+		'COLUMNS'		=> array(
+			'forum_id'				=> array('UINT', 0),
+			'user_id'				=> array('UINT', 0),
+			'notify_status'			=> array('BOOL', 0),
+		),
+		'KEYS'			=> array(
+			'forum_id'				=> array('INDEX', 'forum_id'),
+			'user_id'				=> array('INDEX', 'user_id'),
+			'notify_stat'			=> array('INDEX', 'notify_status'),
+		),
+	);
+
+	$schema_data['phpbb_groups'] = array(
+		'COLUMNS'		=> array(
+			'group_id'				=> array('UINT', NULL, 'auto_increment'),
+			'group_type'			=> array('TINT:4', 1),
+			'group_name'			=> array('VCHAR_CI', ''),
+			'group_desc'			=> array('TEXT', ''),
+			'group_desc_bitfield'	=> array('VCHAR:252', ''),
+			'group_desc_options'	=> array('UINT:11', 0),
+			'group_desc_uid'		=> array('VCHAR:5', ''),
+			'group_display'			=> array('BOOL', 0),
+			'group_avatar'			=> array('VCHAR', ''),
+			'group_avatar_type'		=> array('TINT:4', 0),
+			'group_avatar_width'	=> array('TINT:4', 0),
+			'group_avatar_height'	=> array('TINT:4', 0),
+			'group_rank'			=> array('UINT', 0),
+			'group_colour'			=> array('VCHAR:6', ''),
+			'group_sig_chars'		=> array('UINT', 0),
+			'group_receive_pm'		=> array('BOOL', 0),
+			'group_message_limit'	=> array('UINT', 0),
+			'group_legend'			=> array('BOOL', 1),
+		),
+		'PRIMARY_KEY'	=> 'group_id',
+		'KEYS'			=> array(
+			'group_legend'			=> array('INDEX', 'group_legend'),
+		),
+	);
+
+	$schema_data['phpbb_icons'] = array(
+		'COLUMNS'		=> array(
+			'icons_id'				=> array('UINT', NULL, 'auto_increment'),
+			'icons_url'				=> array('VCHAR', ''),
+			'icons_width'			=> array('TINT:4', 0),
+			'icons_height'			=> array('TINT:4', 0),
+			'icons_order'			=> array('UINT', 0),
+			'display_on_posting'	=> array('BOOL', 1),
+		),
+		'PRIMARY_KEY'	=> 'icons_id',
+		'KEYS'			=> array(
+			'display_on_posting'	=> array('INDEX', 'display_on_posting'),
+		),
+	);
+
+	$schema_data['phpbb_lang'] = array(
+		'COLUMNS'		=> array(
+			'lang_id'				=> array('TINT:4', NULL, 'auto_increment'),
+			'lang_iso'				=> array('VCHAR:30', ''),
+			'lang_dir'				=> array('VCHAR:30', ''),
+			'lang_english_name'		=> array('VCHAR:100', ''),
+			'lang_local_name'		=> array('VCHAR:255', ''),
+			'lang_author'			=> array('VCHAR:255', ''),
+		),
+		'PRIMARY_KEY'	=> 'lang_id',
+		'KEYS'			=> array(
+			'lang_iso'				=> array('INDEX', 'lang_iso'),
+		),
+	);
+
+	$schema_data['phpbb_log'] = array(
+		'COLUMNS'		=> array(
+			'log_id'				=> array('UINT', NULL, 'auto_increment'),
+			'log_type'				=> array('TINT:4', 0),
+			'user_id'				=> array('UINT', 0),
+			'forum_id'				=> array('UINT', 0),
+			'topic_id'				=> array('UINT', 0),
+			'reportee_id'			=> array('UINT', 0),
+			'log_ip'				=> array('VCHAR:40', ''),
+			'log_time'				=> array('TIMESTAMP', 0),
+			'log_operation'			=> array('TEXT', ''),
+			'log_data'				=> array('MTEXT', ''),
+		),
+		'PRIMARY_KEY'	=> 'log_id',
+		'KEYS'			=> array(
+			'log_type'				=> array('INDEX', 'log_type'),
+			'forum_id'				=> array('INDEX', 'forum_id'),
+			'topic_id'				=> array('INDEX', 'topic_id'),
+			'reportee_id'			=> array('INDEX', 'reportee_id'),
+			'user_id'				=> array('INDEX', 'user_id'),
+		),
+	);
+
+	$schema_data['phpbb_moderator_cache'] = array(
+		'COLUMNS'		=> array(
+			'forum_id'				=> array('UINT', 0),
+			'user_id'				=> array('UINT', 0),
+			'username'				=> array('VCHAR:252', ''),
+			'group_id'				=> array('UINT', 0),
+			'group_name'			=> array('VCHAR', ''),
+			'display_on_index'		=> array('BOOL', 1),
+		),
+		'KEYS'			=> array(
+			'disp_idx'				=> array('INDEX', 'display_on_index'),
+			'forum_id'				=> array('INDEX', 'forum_id'),
+		),
+	);
+
+	$schema_data['phpbb_modules'] = array(
+		'COLUMNS'		=> array(
+			'module_id'				=> array('UINT', NULL, 'auto_increment'),
+			'module_enabled'		=> array('BOOL', 1),
+			'module_display'		=> array('BOOL', 1),
+			'module_basename'		=> array('VCHAR', ''),
+			'module_class'			=> array('VCHAR:10', ''),
+			'parent_id'				=> array('UINT', 0),
+			'left_id'				=> array('UINT', 0),
+			'right_id'				=> array('UINT', 0),
+			'module_langname'		=> array('VCHAR', ''),
+			'module_mode'			=> array('VCHAR', ''),
+			'module_auth'			=> array('VCHAR', ''),
+		),
+		'PRIMARY_KEY'	=> 'module_id',
+		'KEYS'			=> array(
+			'left_right_id'			=> array('INDEX', array('left_id', 'right_id')),
+			'module_enabled'		=> array('INDEX', 'module_enabled'),
+			'class_left_id'			=> array('INDEX', array('module_class', 'left_id')),
+		),
+	);
+
+	$schema_data['phpbb_poll_options'] = array(
+		'COLUMNS'		=> array(
+			'poll_option_id'		=> array('TINT:4', 0),
+			'topic_id'				=> array('UINT', 0),
+			'poll_option_text'		=> array('TEXT', ''),
+			'poll_option_total'		=> array('UINT', 0),
+		),
+		'KEYS'			=> array(
+			'poll_opt_id'			=> array('INDEX', 'poll_option_id'),
+			'topic_id'				=> array('INDEX', 'topic_id'),
+		),
+	);
+
+	$schema_data['phpbb_poll_votes'] = array(
+		'COLUMNS'		=> array(
+			'topic_id'				=> array('UINT', 0),
+			'poll_option_id'		=> array('TINT:4', 0),
+			'vote_user_id'			=> array('UINT', 0),
+			'vote_user_ip'			=> array('VCHAR:40', ''),
+		),
+		'KEYS'			=> array(
+			'topic_id'				=> array('INDEX', 'topic_id'),
+			'vote_user_id'			=> array('INDEX', 'vote_user_id'),
+			'vote_user_ip'			=> array('INDEX', 'vote_user_ip'),
+		),
+	);
+
+	$schema_data['phpbb_posts'] = array(
+		'COLUMNS'		=> array(
+			'post_id'				=> array('UINT', NULL, 'auto_increment'),
+			'topic_id'				=> array('UINT', 0),
+			'forum_id'				=> array('UINT', 0),
+			'poster_id'				=> array('UINT', 0),
+			'icon_id'				=> array('UINT', 0),
+			'poster_ip'				=> array('VCHAR:40', ''),
+			'post_time'				=> array('TIMESTAMP', 0),
+			'post_approved'			=> array('BOOL', 1),
+			'post_reported'			=> array('BOOL', 0),
+			'enable_bbcode'			=> array('BOOL', 1),
+			'enable_smilies'		=> array('BOOL', 1),
+			'enable_magic_url'		=> array('BOOL', 1),
+			'enable_sig'			=> array('BOOL', 1),
+			'post_username'			=> array('VCHAR:252', ''),
+			'post_subject'			=> array('XSTEXT', ''),
+			'post_text'				=> array('MTEXT', ''),
+			'post_checksum'			=> array('VCHAR:32', ''),
+			'post_encoding'			=> array('VCHAR:20', 'iso-8859-1'),
+			'post_attachment'		=> array('BOOL', 0),
+			'bbcode_bitfield'		=> array('VCHAR:252', ''),
+			'bbcode_uid'			=> array('VCHAR:5', ''),
+			'post_postcount'		=> array('BOOL', 1),
+			'post_edit_time'		=> array('TIMESTAMP', 0),
+			'post_edit_reason'		=> array('STEXT', ''),
+			'post_edit_user'		=> array('UINT', 0),
+			'post_edit_count'		=> array('USINT', 0),
+			'post_edit_locked'		=> array('BOOL', 0),
+		),
+		'PRIMARY_KEY'	=> 'post_id',
+		'KEYS'			=> array(
+			'forum_id'				=> array('INDEX', 'forum_id'),
+			'topic_id'				=> array('INDEX', 'topic_id'),
+			'poster_ip'				=> array('INDEX', 'poster_ip'),
+			'poster_id'				=> array('INDEX', 'poster_id'),
+			'post_approved'			=> array('INDEX', 'post_approved'),
+			'post_postcount'		=> array('INDEX', 'post_postcount'),
+			'post_time'				=> array('INDEX', 'post_time'),
+		),
+	);
+
+	$schema_data['phpbb_privmsgs'] = array(
+		'COLUMNS'		=> array(
+			'msg_id'				=> array('UINT', NULL, 'auto_increment'),
+			'root_level'			=> array('UINT', 0),
+			'author_id'				=> array('UINT', 0),
+			'icon_id'				=> array('UINT', 0),
+			'author_ip'				=> array('VCHAR:40', ''),
+			'message_time'			=> array('TIMESTAMP', 0),
+			'enable_bbcode'			=> array('BOOL', 1),
+			'enable_smilies'		=> array('BOOL', 1),
+			'enable_magic_url'		=> array('BOOL', 1),
+			'enable_sig'			=> array('BOOL', 1),
+			'message_subject'		=> array('XSTEXT', ''),
+			'message_text'			=> array('MTEXT', ''),
+			'message_edit_reason'	=> array('STEXT', ''),
+			'message_edit_user'		=> array('UINT', 0),
+			'message_encoding'		=> array('VCHAR:20', 'iso-8859-1'),
+			'message_attachment'	=> array('BOOL', 0),
+			'bbcode_bitfield'		=> array('VCHAR:252', ''),
+			'bbcode_uid'			=> array('VCHAR:5', ''),
+			'message_edit_time'		=> array('TIMESTAMP', 0),
+			'message_edit_count'	=> array('USINT', 0),
+			'to_address'			=> array('TEXT', ''),
+			'bcc_address'			=> array('TEXT', ''),
+		),
+		'PRIMARY_KEY'	=> 'msg_id',
+		'KEYS'			=> array(
+			'author_ip'				=> array('INDEX', 'author_ip'),
+			'message_time'			=> array('INDEX', 'message_time'),
+			'author_id'				=> array('INDEX', 'author_id'),
+			'root_level'			=> array('INDEX', 'root_level'),
+		),
+	);
+
+	$schema_data['phpbb_privmsgs_folder'] = array(
+		'COLUMNS'		=> array(
+			'folder_id'				=> array('UINT', NULL, 'auto_increment'),
+			'user_id'				=> array('UINT', 0),
+			'folder_name'			=> array('VCHAR', ''),
+			'pm_count'				=> array('UINT', 0),
+		),
+		'PRIMARY_KEY'	=> 'folder_id',
+		'KEYS'			=> array(
+			'user_id'				=> array('INDEX', 'user_id'),
+		),
+	);
+
+	$schema_data['phpbb_privmsgs_rules'] = array(
+		'COLUMNS'		=> array(
+			'rule_id'				=> array('UINT', NULL, 'auto_increment'),
+			'user_id'				=> array('UINT', 0),
+			'rule_check'			=> array('UINT', 0),
+			'rule_connection'		=> array('UINT', 0),
+			'rule_string'			=> array('VCHAR', ''),
+			'rule_user_id'			=> array('UINT', 0),
+			'rule_group_id'			=> array('UINT', 0),
+			'rule_action'			=> array('UINT', 0),
+			'rule_folder_id'		=> array('INT:4', 0),
+		),
+		'PRIMARY_KEY'	=> 'rule_id',
+		'KEYS'			=> array(
+			'user_id'				=> array('INDEX', 'user_id'),
+		),
+	);
+
+	$schema_data['phpbb_privmsgs_to'] = array(
+		'COLUMNS'		=> array(
+			'msg_id'				=> array('UINT', 0),
+			'user_id'				=> array('UINT', 0),
+			'author_id'				=> array('UINT', 0),
+			'pm_deleted'			=> array('BOOL', 0),
+			'pm_new'				=> array('BOOL', 1),
+			'pm_unread'				=> array('BOOL', 1),
+			'pm_replied'			=> array('BOOL', 0),
+			'pm_marked'				=> array('BOOL', 0),
+			'pm_forwarded'			=> array('BOOL', 0),
+			'folder_id'				=> array('INT:4', 0),
+		),
+		'KEYS'			=> array(
+			'msg_id'				=> array('INDEX', 'msg_id'),
+			'author_id'				=> array('INDEX', 'author_id'),
+			'usr_flder_id'			=> array('INDEX', array('user_id', 'folder_id')),
+		),
+	);
+
+	$schema_data['phpbb_profile_fields'] = array(
+		'COLUMNS'		=> array(
+			'field_id'				=> array('UINT', NULL, 'auto_increment'),
+			'field_name'			=> array('VCHAR', ''),
+			'field_type'			=> array('TINT:4', 0),
+			'field_ident'			=> array('VCHAR:20', ''),
+			'field_length'			=> array('VCHAR:20', ''),
+			'field_minlen'			=> array('VCHAR', ''),
+			'field_maxlen'			=> array('VCHAR', ''),
+			'field_novalue'			=> array('VCHAR', ''),
+			'field_default_value'	=> array('VCHAR', ''),
+			'field_validation'		=> array('VCHAR:20', ''),
+			'field_required'		=> array('BOOL', 0),
+			'field_show_on_reg'		=> array('BOOL', 0),
+			'field_hide'			=> array('BOOL', 0),
+			'field_no_view'			=> array('BOOL', 0),
+			'field_active'			=> array('BOOL', 0),
+			'field_order'			=> array('UINT', 0),
+		),
+		'PRIMARY_KEY'	=> 'field_id',
+		'KEYS'			=> array(
+			'fld_type'			=> array('INDEX', 'field_type'),
+			'fld_ordr'			=> array('INDEX', 'field_order'),
+		),
+	);
+
+	$schema_data['phpbb_profile_fields_data'] = array(
+		'COLUMNS'		=> array(
+			'user_id'				=> array('UINT', 0),
+		),
+		'PRIMARY_KEY'	=> 'user_id',
+	);
+
+	$schema_data['phpbb_profile_fields_lang'] = array(
+		'COLUMNS'		=> array(
+			'field_id'				=> array('UINT', 0),
+			'lang_id'				=> array('UINT', 0),
+			'option_id'				=> array('UINT', 0),
+			'field_type'			=> array('TINT:4', 0),
+			'lang_value'			=> array('VCHAR', ''),
+		),
+		'PRIMARY_KEY'	=> array('field_id', 'lang_id', 'option_id'),
+	);
+
+	$schema_data['phpbb_profile_lang'] = array(
+		'COLUMNS'		=> array(
+			'field_id'				=> array('UINT', 0),
+			'lang_id'				=> array('UINT', 0),
+			'lang_name'				=> array('VCHAR', ''),
+			'lang_explain'			=> array('TEXT', ''),
+			'lang_default_value'	=> array('VCHAR', ''),
+		),
+		'PRIMARY_KEY'	=> array('field_id', 'lang_id'),
+	);
+
+	$schema_data['phpbb_ranks'] = array(
+		'COLUMNS'		=> array(
+			'rank_id'				=> array('UINT', NULL, 'auto_increment'),
+			'rank_title'			=> array('VCHAR', ''),
+			'rank_min'				=> array('UINT', 0),
+			'rank_special'			=> array('BOOL', 0),
+			'rank_image'			=> array('VCHAR', ''),
+		),
+		'PRIMARY_KEY'	=> 'rank_id',
+	);
+
+	$schema_data['phpbb_reports'] = array(
+		'COLUMNS'		=> array(
+			'report_id'				=> array('UINT', NULL, 'auto_increment'),
+			'reason_id'				=> array('USINT', 0),
+			'post_id'				=> array('UINT', 0),
+			'user_id'				=> array('UINT', 0),
+			'user_notify'			=> array('BOOL', 0),
+			'report_closed'			=> array('BOOL', 0),
+			'report_time'			=> array('TIMESTAMP', 0),
+			'report_text'			=> array('MTEXT', ''),
+		),
+		'PRIMARY_KEY'	=> 'report_id',
+	);
+
+	$schema_data['phpbb_reports_reasons'] = array(
+		'COLUMNS'		=> array(
+			'reason_id'				=> array('USINT', NULL, 'auto_increment'),
+			'reason_title'			=> array('VCHAR', ''),
+			'reason_description'	=> array('MTEXT', ''),
+			'reason_order'			=> array('USINT', 0),
+		),
+		'PRIMARY_KEY'	=> 'reason_id',
+	);
+
+	$schema_data['phpbb_search_results'] = array(
+		'COLUMNS'		=> array(
+			'search_key'			=> array('VCHAR:32', ''),
+			'search_time'			=> array('TIMESTAMP', 0),
+			'search_keywords'		=> array('MTEXT', ''),
+			'search_authors'		=> array('MTEXT', ''),
+		),
+		'PRIMARY_KEY'	=> 'search_key',
+	);
+
+	$schema_data['phpbb_search_wordlist'] = array(
+		'COLUMNS'		=> array(
+			'word_id'			=> array('UINT', NULL, 'auto_increment'),
+			'word_text'			=> array('VCHAR_BIN', ''),
+			'word_common'		=> array('BOOL', 0),
+		),
+		'PRIMARY_KEY'	=> 'word_id',
+		'KEYS'			=> array(
+			'wrd_txt'			=> array('UNIQUE', 'word_text'),
+		),
+	);
+
+	$schema_data['phpbb_search_wordmatch'] = array(
+		'COLUMNS'		=> array(
+			'post_id'			=> array('UINT', 0),
+			'word_id'			=> array('UINT', 0),
+			'title_match'		=> array('BOOL', 0),
+		),
+		'KEYS'			=> array(
+			'word_id'			=> array('INDEX', 'word_id'),
+			'post_id'			=> array('INDEX', 'post_id'),
+		),
+	);
+
+	$schema_data['phpbb_sessions'] = array(
+		'COLUMNS'		=> array(
+			'session_id'			=> array('CHAR:32', ''),
+			'session_user_id'		=> array('UINT', 0),
+			'session_last_visit'	=> array('TIMESTAMP', 0),
+			'session_start'			=> array('TIMESTAMP', 0),
+			'session_time'			=> array('TIMESTAMP', 0),
+			'session_ip'			=> array('VCHAR:40', ''),
+			'session_browser'		=> array('VCHAR:150', ''),
+			'session_page'			=> array('VCHAR', ''),
+			'session_viewonline'	=> array('BOOL', 1),
+			'session_autologin'		=> array('BOOL', 0),
+			'session_admin'			=> array('BOOL', 0),
+		),
+		'PRIMARY_KEY'	=> 'session_id',
+		'KEYS'			=> array(
+			'session_time'		=> array('INDEX', 'session_time'),
+			'session_user_id'	=> array('INDEX', 'session_user_id'),
+		),
+	);
+
+	$schema_data['phpbb_sessions_keys'] = array(
+		'COLUMNS'		=> array(
+			'key_id'			=> array('CHAR:32', ''),
+			'user_id'			=> array('UINT', 0),
+			'last_ip'			=> array('VCHAR:40', ''),
+			'last_login'		=> array('TIMESTAMP', 0),
+		),
+		'PRIMARY_KEY'	=> array('key_id', 'user_id'),
+		'KEYS'			=> array(
+			'last_login'		=> array('INDEX', 'last_login'),
+		),
+	);
+
+	$schema_data['phpbb_sitelist'] = array(
+		'COLUMNS'		=> array(
+			'site_id'		=> array('UINT', NULL, 'auto_increment'),
+			'site_ip'		=> array('VCHAR:40', ''),
+			'site_hostname'	=> array('VCHAR', ''),
+			'ip_exclude'	=> array('BOOL', 0),
+		),
+		'PRIMARY_KEY'		=> 'site_id',
+	);
+
+	$schema_data['phpbb_smilies'] = array(
+		'COLUMNS'		=> array(
+			'smiley_id'			=> array('UINT', NULL, 'auto_increment'),
+			'code'				=> array('VCHAR:50', ''),
+			'emotion'			=> array('VCHAR:50', ''),
+			'smiley_url'		=> array('VCHAR:50', ''),
+			'smiley_width'		=> array('TINT:4', 0),
+			'smiley_height'		=> array('TINT:4', 0),
+			'smiley_order'		=> array('UINT', 0),
+			'display_on_posting'=> array('BOOL', 1),
+		),
+		'PRIMARY_KEY'	=> 'smiley_id',
+		'KEYS'			=> array(
+			'display_on_post'		=> array('INDEX', 'display_on_posting'),
+		),
+	);
+
+	$schema_data['phpbb_styles'] = array(
+		'COLUMNS'		=> array(
+			'style_id'				=> array('TINT:4', NULL, 'auto_increment'),
+			'style_name'			=> array('VCHAR:252', ''),
+			'style_copyright'		=> array('VCHAR', ''),
+			'style_active'			=> array('BOOL', 1),
+			'template_id'			=> array('TINT:4', 0),
+			'theme_id'				=> array('TINT:4', 0),
+			'imageset_id'			=> array('TINT:4', 0),
+		),
+		'PRIMARY_KEY'	=> 'style_id',
+		'KEYS'			=> array(
+			'style_name'		=> array('UNIQUE', 'style_name'),
+			'template_id'		=> array('INDEX', 'template_id'),
+			'theme_id'			=> array('INDEX', 'theme_id'),
+			'imageset_id'		=> array('INDEX', 'imageset_id'),
+		),
+	);
+
+	$schema_data['phpbb_styles_template'] = array(
+		'COLUMNS'		=> array(
+			'template_id'			=> array('TINT:4', NULL, 'auto_increment'),
+			'template_name'			=> array('VCHAR:252', ''),
+			'template_copyright'	=> array('VCHAR', ''),
+			'template_path'			=> array('VCHAR:100', ''),
+			'bbcode_bitfield'		=> array('VCHAR:252', 'kNg='),
+			'template_storedb'		=> array('BOOL', 0),
+		),
+		'PRIMARY_KEY'	=> 'template_id',
+		'KEYS'			=> array(
+			'tmplte_nm'				=> array('UNIQUE', 'template_name'),
+		),
+	);
+
+	$schema_data['phpbb_styles_template_data'] = array(
+		'COLUMNS'		=> array(
+			'template_id'			=> array('TINT:4', NULL, 'auto_increment'),
+			'template_filename'		=> array('VCHAR:100', ''),
+			'template_included'		=> array('TEXT', ''),
+			'template_mtime'		=> array('TIMESTAMP', 0),
+			'template_data'			=> array('MTEXT', ''),
+		),
+		'KEYS'			=> array(
+			'tid'					=> array('INDEX', 'template_id'),
+			'tfn'					=> array('INDEX', 'template_filename'),
+		),
+	);
+
+	$schema_data['phpbb_styles_theme'] = array(
+		'COLUMNS'		=> array(
+			'theme_id'				=> array('TINT:4', NULL, 'auto_increment'),
+			'theme_name'			=> array('VCHAR:252', ''),
+			'theme_copyright'		=> array('VCHAR', ''),
+			'theme_path'			=> array('VCHAR:100', ''),
+			'theme_storedb'			=> array('BOOL', 0),
+			'theme_mtime'			=> array('TIMESTAMP', 0),
+			'theme_data'			=> array('MTEXT', ''),
+		),
+		'PRIMARY_KEY'	=> 'theme_id',
+		'KEYS'			=> array(
+			'theme_name'		=> array('UNIQUE', 'theme_name'),
+		),
+	);
+
+	$schema_data['phpbb_styles_imageset'] = array(
+		'COLUMNS'		=> array(
+			'imageset_id'				=> array('TINT:4', NULL, 'auto_increment'),
+			'imageset_name'				=> array('VCHAR:252', ''),
+			'imageset_copyright'		=> array('VCHAR', ''),
+			'imageset_path'				=> array('VCHAR:100', ''),
+
+			'site_logo'					=> array('VCHAR:200', ''),
+			'upload_bar'				=> array('VCHAR:200', ''),
+			'poll_left'					=> array('VCHAR:200', ''),
+			'poll_center'				=> array('VCHAR:200', ''),
+			'poll_right'				=> array('VCHAR:200', ''),
+			'icon_friend'				=> array('VCHAR:200', ''),
+			'icon_foe'					=> array('VCHAR:200', ''),
+
+			'forum_link'				=> array('VCHAR:200', ''),
+			'forum_read'				=> array('VCHAR:200', ''),
+			'forum_read_locked'			=> array('VCHAR:200', ''),
+			'forum_read_subforum'		=> array('VCHAR:200', ''),
+			'forum_unread'				=> array('VCHAR:200', ''),
+			'forum_unread_locked'		=> array('VCHAR:200', ''),
+			'forum_unread_subforum'		=> array('VCHAR:200', ''),
+
+			'topic_moved'				=> array('VCHAR:200', ''),
+
+			'topic_read'				=> array('VCHAR:200', ''),
+			'topic_read_mine'			=> array('VCHAR:200', ''),
+			'topic_read_hot'			=> array('VCHAR:200', ''),
+			'topic_read_hot_mine'		=> array('VCHAR:200', ''),
+			'topic_read_locked'			=> array('VCHAR:200', ''),
+			'topic_read_locked_mine'	=> array('VCHAR:200', ''),
+
+			'topic_unread'				=> array('VCHAR:200', ''),
+			'topic_unread_mine'			=> array('VCHAR:200', ''),
+			'topic_unread_hot'			=> array('VCHAR:200', ''),
+			'topic_unread_hot_mine'		=> array('VCHAR:200', ''),
+			'topic_unread_locked'		=> array('VCHAR:200', ''),
+			'topic_unread_locked_mine'	=> array('VCHAR:200', ''),
+
+			'sticky_read'				=> array('VCHAR:200', ''),
+			'sticky_read_mine'			=> array('VCHAR:200', ''),
+			'sticky_read_locked'		=> array('VCHAR:200', ''),
+			'sticky_read_locked_mine'	=> array('VCHAR:200', ''),
+			'sticky_unread'				=> array('VCHAR:200', ''),
+			'sticky_unread_mine'		=> array('VCHAR:200', ''),
+			'sticky_unread_locked'		=> array('VCHAR:200', ''),
+			'sticky_unread_locked_mine'	=> array('VCHAR:200', ''),
+
+			'announce_read'				=> array('VCHAR:200', ''),
+			'announce_read_mine'		=> array('VCHAR:200', ''),
+			'announce_read_locked'		=> array('VCHAR:200', ''),
+			'announce_read_locked_mine'	=> array('VCHAR:200', ''),
+			'announce_unread'			=> array('VCHAR:200', ''),
+			'announce_unread_mine'		=> array('VCHAR:200', ''),
+			'announce_unread_locked'	=> array('VCHAR:200', ''),
+			'announce_unread_locked_mine'	=> array('VCHAR:200', ''),
+
+			'global_read'				=> array('VCHAR:200', ''),
+			'global_read_mine'			=> array('VCHAR:200', ''),
+			'global_read_locked'		=> array('VCHAR:200', ''),
+			'global_read_locked_mine'	=> array('VCHAR:200', ''),
+			'global_unread'				=> array('VCHAR:200', ''),
+			'global_unread_mine'		=> array('VCHAR:200', ''),
+			'global_unread_locked'		=> array('VCHAR:200', ''),
+			'global_unread_locked_mine'	=> array('VCHAR:200', ''),
+
+			'pm_read'					=> array('VCHAR:200', ''),
+			'pm_unread'					=> array('VCHAR:200', ''),
+
+			'icon_contact_aim'			=> array('VCHAR:200', ''),
+			'icon_contact_email'		=> array('VCHAR:200', ''),
+			'icon_contact_icq'			=> array('VCHAR:200', ''),
+			'icon_contact_jabber'		=> array('VCHAR:200', ''),
+			'icon_contact_msnm'			=> array('VCHAR:200', ''),
+			'icon_contact_pm'			=> array('VCHAR:200', ''),
+			'icon_contact_yahoo'		=> array('VCHAR:200', ''),
+			'icon_contact_www'			=> array('VCHAR:200', ''),
+
+			'icon_post_delete'			=> array('VCHAR:200', ''),
+			'icon_post_edit'			=> array('VCHAR:200', ''),
+			'icon_post_info'			=> array('VCHAR:200', ''),
+			'icon_post_quote'			=> array('VCHAR:200', ''),
+			'icon_post_report'			=> array('VCHAR:200', ''),
+			'icon_post_target'			=> array('VCHAR:200', ''),
+			'icon_post_target_unread'	=> array('VCHAR:200', ''),
+
+			'icon_topic_attach'			=> array('VCHAR:200', ''),
+			'icon_topic_latest'			=> array('VCHAR:200', ''),
+			'icon_topic_newest'			=> array('VCHAR:200', ''),
+			'icon_topic_reported'		=> array('VCHAR:200', ''),
+			'icon_topic_unapproved'		=> array('VCHAR:200', ''),
+
+			'icon_user_online'			=> array('VCHAR:200', ''),
+			'icon_user_offline'			=> array('VCHAR:200', ''),
+			'icon_user_profile'			=> array('VCHAR:200', ''),
+			'icon_user_search'			=> array('VCHAR:200', ''),
+			'icon_user_warn'			=> array('VCHAR:200', ''),
+
+			'button_pm_forward'			=> array('VCHAR:200', ''),
+			'button_pm_new'				=> array('VCHAR:200', ''),
+			'button_pm_reply'			=> array('VCHAR:200', ''),
+			'button_topic_locked'		=> array('VCHAR:200', ''),
+			'button_topic_new'			=> array('VCHAR:200', ''),
+			'button_topic_reply'		=> array('VCHAR:200', ''),
+
+			'user_icon1'				=> array('VCHAR:200', ''),
+			'user_icon2'				=> array('VCHAR:200', ''),
+			'user_icon3'				=> array('VCHAR:200', ''),
+			'user_icon4'				=> array('VCHAR:200', ''),
+			'user_icon5'				=> array('VCHAR:200', ''),
+			'user_icon6'				=> array('VCHAR:200', ''),
+			'user_icon7'				=> array('VCHAR:200', ''),
+			'user_icon8'				=> array('VCHAR:200', ''),
+			'user_icon9'				=> array('VCHAR:200', ''),
+			'user_icon10'				=> array('VCHAR:200', ''),
+		),
+		'PRIMARY_KEY'		=> 'imageset_id',
+		'KEYS'				=> array(
+			'imgset_nm'			=> array('UNIQUE', 'imageset_name'),
+		),
+	);
+
+	$schema_data['phpbb_topics'] = array(
+		'COLUMNS'		=> array(
+			'topic_id'					=> array('UINT', NULL, 'auto_increment'),
+			'forum_id'					=> array('UINT', 0),
+			'icon_id'					=> array('UINT', 0),
+			'topic_attachment'			=> array('BOOL', 0),
+			'topic_approved'			=> array('BOOL', 1),
+			'topic_reported'			=> array('BOOL', 0),
+			'topic_title'				=> array('XSTEXT', ''),
+			'topic_poster'				=> array('UINT', 0),
+			'topic_time'				=> array('TIMESTAMP', 0),
+			'topic_time_limit'			=> array('TIMESTAMP', 0),
+			'topic_views'				=> array('UINT', 0),
+			'topic_replies'				=> array('UINT', 0),
+			'topic_replies_real'		=> array('UINT', 0),
+			'topic_status'				=> array('TINT:3', 0),
+			'topic_type'				=> array('TINT:3', 0),
+			'topic_first_post_id'		=> array('UINT', 0),
+			'topic_first_poster_name'	=> array('VCHAR', ''),
+			'topic_last_post_id'		=> array('UINT', 0),
+			'topic_last_poster_id'		=> array('UINT', 0),
+			'topic_last_poster_name'	=> array('VCHAR', ''),
+			'topic_last_post_time'		=> array('TIMESTAMP', 0),
+			'topic_last_view_time'		=> array('TIMESTAMP', 0),
+			'topic_moved_id'			=> array('UINT', 0),
+			'topic_bumped'				=> array('BOOL', 0),
+			'topic_bumper'				=> array('UINT', 0),
+			'poll_title'				=> array('XSTEXT', ''),
+			'poll_start'				=> array('TIMESTAMP', 0),
+			'poll_length'				=> array('TIMESTAMP', 0),
+			'poll_max_options'			=> array('TINT:4', 1),
+			'poll_last_vote'			=> array('TIMESTAMP', 0),
+			'poll_vote_change'			=> array('BOOL', 0),
+		),
+		'PRIMARY_KEY'	=> 'topic_id',
+		'KEYS'			=> array(
+			'forum_id'			=> array('INDEX', 'forum_id'),
+			'forum_id_type'		=> array('INDEX', array('forum_id', 'topic_type')),
+			'last_post_time'	=> array('INDEX', 'topic_last_post_time'),
+			'fid_time_moved'	=> array('INDEX', array('forum_id', 'topic_last_post_time', 'topic_moved_id')),
+		),
+	);
+
+	$schema_data['phpbb_topics_track'] = array(
+		'COLUMNS'		=> array(
+			'user_id'			=> array('UINT', 0),
+			'topic_id'			=> array('UINT', 0),
+			'forum_id'			=> array('UINT', 0),
+			'mark_time'			=> array('TIMESTAMP', 0),
+		),
+		'PRIMARY_KEY'	=> array('user_id', 'topic_id'),
+		'KEYS'			=> array(
+			'forum_id'			=> array('INDEX', 'forum_id'),
+		),
+	);
+
+	$schema_data['phpbb_topics_posted'] = array(
+		'COLUMNS'		=> array(
+			'user_id'			=> array('UINT', 0),
+			'topic_id'			=> array('UINT', 0),
+			'topic_posted'		=> array('BOOL', 0),
+		),
+		'PRIMARY_KEY'	=> array('user_id', 'topic_id'),
+	);
+
+	$schema_data['phpbb_topics_watch'] = array(
+		'COLUMNS'		=> array(
+			'topic_id'			=> array('UINT', 0),
+			'user_id'			=> array('UINT', 0),
+			'notify_status'		=> array('BOOL', 0),
+		),
+		'KEYS'			=> array(
+			'topic_id'			=> array('INDEX', 'topic_id'),
+			'user_id'			=> array('INDEX', 'user_id'),
+			'notify_stat'		=> array('INDEX', 'notify_status'),
+		),
+	);
+
+	$schema_data['phpbb_user_group'] = array(
+		'COLUMNS'		=> array(
+			'group_id'			=> array('UINT', 0),
+			'user_id'			=> array('UINT', 0),
+			'group_leader'		=> array('BOOL', 0),
+			'user_pending'		=> array('BOOL', 1),
+		),
+		'KEYS'			=> array(
+			'group_id'			=> array('INDEX', 'group_id'),
+			'user_id'			=> array('INDEX', 'user_id'),
+			'group_leader'		=> array('INDEX', 'group_leader'),
+		),
+	);
+
+	$schema_data['phpbb_users'] = array(
+		'COLUMNS'		=> array(
+			'user_id'					=> array('UINT', NULL, 'auto_increment'),
+			'user_type'					=> array('TINT:2', 0),
+			'group_id'					=> array('UINT', 3),
+			'user_permissions'			=> array('MTEXT', ''),
+			'user_perm_from'			=> array('UINT', 0),
+			'user_ip'					=> array('VCHAR:40', ''),
+			'user_regdate'				=> array('TIMESTAMP', 0),
+			'username'					=> array('VCHAR_CI', ''),
+			'user_password'				=> array('VCHAR:40', ''),
+			'user_passchg'				=> array('TIMESTAMP', 0),
+			'user_email'				=> array('VCHAR:100', ''),
+			'user_email_hash'			=> array('BINT', 0),
+			'user_birthday'				=> array('VCHAR:10', ''),
+			'user_lastvisit'			=> array('TIMESTAMP', 0),
+			'user_lastmark'				=> array('TIMESTAMP', 0),
+			'user_lastpost_time'		=> array('TIMESTAMP', 0),
+			'user_lastpage'				=> array('VCHAR:200', ''),
+			'user_last_confirm_key'		=> array('VCHAR:10', ''),
+			'user_last_search'			=> array('TIMESTAMP', 0),
+			'user_warnings'				=> array('TINT:4', 0),
+			'user_last_warning'			=> array('TIMESTAMP', 0),
+			'user_login_attempts'		=> array('TINT:4', 0),
+			'user_posts'				=> array('UINT', 0),
+			'user_lang'					=> array('VCHAR:30', ''),
+			'user_timezone'				=> array('DECIMAL', 0),
+			'user_dst'					=> array('BOOL', 0),
+			'user_dateformat'			=> array('VCHAR:30', 'd M Y H:i'),
+			'user_style'				=> array('TINT:4', 0),
+			'user_rank'					=> array('UINT', 0),
+			'user_colour'				=> array('VCHAR:6', ''),
+			'user_new_privmsg'			=> array('TINT:4', 0),
+			'user_unread_privmsg'		=> array('TINT:4', 0),
+			'user_last_privmsg'			=> array('TIMESTAMP', 0),
+			'user_message_rules'		=> array('BOOL', 0),
+			'user_full_folder'			=> array('INT:11', -3),
+			'user_emailtime'			=> array('TIMESTAMP', 0),
+			'user_topic_show_days'		=> array('USINT', 0),
+			'user_topic_sortby_type'	=> array('VCHAR:1', 't'),
+			'user_topic_sortby_dir'		=> array('VCHAR:1', 'd'),
+			'user_post_show_days'		=> array('USINT', 0),
+			'user_post_sortby_type'		=> array('VCHAR:1', 't'),
+			'user_post_sortby_dir'		=> array('VCHAR:1', 'a'),
+			'user_notify'				=> array('BOOL', 0),
+			'user_notify_pm'			=> array('BOOL', 1),
+			'user_notify_type'			=> array('TINT:4', 0),
+			'user_allow_pm'				=> array('BOOL', 1),
+			'user_allow_email'			=> array('BOOL', 1),
+			'user_allow_viewonline'		=> array('BOOL', 1),
+			'user_allow_viewemail'		=> array('BOOL', 1),
+			'user_allow_massemail'		=> array('BOOL', 1),
+			'user_options'				=> array('UINT:11', 893),
+			'user_avatar'				=> array('VCHAR', ''),
+			'user_avatar_type'			=> array('TINT:2', 0),
+			'user_avatar_width'			=> array('TINT:4', 0),
+			'user_avatar_height'		=> array('TINT:4', 0),
+			'user_sig'					=> array('MTEXT', ''),
+			'user_sig_bbcode_uid'		=> array('VCHAR:5', ''),
+			'user_sig_bbcode_bitfield'	=> array('VCHAR:252', ''),
+			'user_from'					=> array('VCHAR:100', ''),
+			'user_icq'					=> array('VCHAR:15', ''),
+			'user_aim'					=> array('VCHAR', ''),
+			'user_yim'					=> array('VCHAR', ''),
+			'user_msnm'					=> array('VCHAR', ''),
+			'user_jabber'				=> array('VCHAR', ''),
+			'user_website'				=> array('VCHAR:200', ''),
+			'user_occ'					=> array('VCHAR', ''),
+			'user_interests'			=> array('TEXT', ''),
+			'user_actkey'				=> array('VCHAR:32', ''),
+			'user_newpasswd'			=> array('VCHAR:32', ''),
+		),
+		'PRIMARY_KEY'	=> 'user_id',
+		'KEYS'			=> array(
+			'user_birthday'				=> array('INDEX', 'user_birthday'),
+			'user_email_hash'			=> array('INDEX', 'user_email_hash'),
+			'user_type'					=> array('INDEX', 'user_type'),
+			'username'					=> array('INDEX', 'username'),
+		),
+	);
+
+	$schema_data['phpbb_warnings'] = array(
+		'COLUMNS'		=> array(
+			'warning_id'			=> array('UINT', NULL, 'auto_increment'),
+			'user_id'				=> array('UINT', 0),
+			'post_id'				=> array('UINT', 0),
+			'log_id'				=> array('UINT', 0),
+			'warning_time'			=> array('TIMESTAMP', 0),
+		),
+		'PRIMARY_KEY'	=> 'warning_id',
+	);
+
+	$schema_data['phpbb_words'] = array(
+		'COLUMNS'		=> array(
+			'word_id'				=> array('UINT', NULL, 'auto_increment'),
+			'word'					=> array('VCHAR', ''),
+			'replacement'			=> array('VCHAR', ''),
+		),
+		'PRIMARY_KEY'	=> 'word_id',
+	);
+
+	$schema_data['phpbb_zebra'] = array(
+		'COLUMNS'		=> array(
+			'user_id'				=> array('UINT', 0),
+			'zebra_id'				=> array('UINT', 0),
+			'friend'				=> array('BOOL', 0),
+			'foe'					=> array('BOOL', 0),
+		),
+		'KEYS'			=> array(
+			'user_id'				=> array('INDEX', 'user_id'),
+			'zebra_id'				=> array('INDEX', 'zebra_id'),
+		),
+	);
+
+	return $schema_data;
+}
+
+
+/**
+* Data put into the header for various dbms
+*/
+function custom_data($dbms)
+{
+	switch ($dbms)
+	{
+		case 'oracle':
+			return <<<EOF
+/*
+  This first section is optional, however its probably the best method
+  of running phpBB on Oracle. If you already have a tablespace and user created
+  for phpBB you can leave this section commented out!
+
+  The first set of statements create a phpBB tablespace and a phpBB user,
+  make sure you change the password of the phpBB user before you run this script!!
+*/
+
+/*
+CREATE TABLESPACE "PHPBB"
+	LOGGING 
+	DATAFILE 'E:\ORACLE\ORADATA\LOCAL\PHPBB.ora' 
+	SIZE 10M
+	AUTOEXTEND ON NEXT 10M
+	MAXSIZE 100M;
+
+CREATE USER "PHPBB" 
+	PROFILE "DEFAULT" 
+	IDENTIFIED BY "phpbb_password" 
+	DEFAULT TABLESPACE "PHPBB" 
+	QUOTA UNLIMITED ON "PHPBB" 
+	ACCOUNT UNLOCK;
+
+GRANT ANALYZE ANY TO "PHPBB";
+GRANT CREATE SEQUENCE TO "PHPBB";
+GRANT CREATE SESSION TO "PHPBB";
+GRANT CREATE TABLE TO "PHPBB";
+GRANT CREATE TRIGGER TO "PHPBB";
+GRANT CREATE VIEW TO "PHPBB";
+GRANT "CONNECT" TO "PHPBB";
+
+COMMIT;
+DISCONNECT;
+
+CONNECT phpbb/phpbb_password;
+*/
+EOF;
+
+		break;
+
+		case 'postgres':
+			return <<<EOF
+/*
+	Domain definition
+*/
+CREATE DOMAIN varchar_ci AS varchar(252) NOT NULL DEFAULT ''::character varying;
+
+/*
+	Operation Functions
+*/
+CREATE FUNCTION _varchar_ci_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) = LOWER($2)' LANGUAGE SQL STRICT;
+CREATE FUNCTION _varchar_ci_not_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) != LOWER($2)' LANGUAGE SQL STRICT;
+CREATE FUNCTION _varchar_ci_less_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) < LOWER($2)' LANGUAGE SQL STRICT;
+CREATE FUNCTION _varchar_ci_less_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) <= LOWER($2)' LANGUAGE SQL STRICT;
+CREATE FUNCTION _varchar_ci_greater_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) > LOWER($2)' LANGUAGE SQL STRICT;
+CREATE FUNCTION _varchar_ci_greater_equals(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) >= LOWER($2)' LANGUAGE SQL STRICT;
+
+/*
+	Operators
+*/
+CREATE OPERATOR <(
+  PROCEDURE = _varchar_ci_less_than,
+  LEFTARG = varchar_ci,
+  RIGHTARG = varchar_ci,
+  COMMUTATOR = >,
+  NEGATOR = >=,
+  RESTRICT = scalarltsel,
+  JOIN = scalarltjoinsel);
+
+CREATE OPERATOR <=(
+  PROCEDURE = _varchar_ci_less_equal,
+  LEFTARG = varchar_ci,
+  RIGHTARG = varchar_ci,
+  COMMUTATOR = >=,
+  NEGATOR = >,
+  RESTRICT = scalarltsel,
+  JOIN = scalarltjoinsel);
+
+CREATE OPERATOR >(
+  PROCEDURE = _varchar_ci_greater_than,
+  LEFTARG = varchar_ci,
+  RIGHTARG = varchar_ci,
+  COMMUTATOR = <,
+  NEGATOR = <=,
+  RESTRICT = scalargtsel,
+  JOIN = scalargtjoinsel);
+
+CREATE OPERATOR >=(
+  PROCEDURE = _varchar_ci_greater_equals,
+  LEFTARG = varchar_ci,
+  RIGHTARG = varchar_ci,
+  COMMUTATOR = <=,
+  NEGATOR = <,
+  RESTRICT = scalargtsel,
+  JOIN = scalargtjoinsel);
+
+CREATE OPERATOR <>(
+  PROCEDURE = _varchar_ci_not_equal,
+  LEFTARG = varchar_ci,
+  RIGHTARG = varchar_ci,
+  COMMUTATOR = <>,
+  NEGATOR = =,
+  RESTRICT = neqsel,
+  JOIN = neqjoinsel);
+
+CREATE OPERATOR =(
+  PROCEDURE = _varchar_ci_equal,
+  LEFTARG = varchar_ci,
+  RIGHTARG = varchar_ci,
+  COMMUTATOR = =,
+  NEGATOR = <>,
+  RESTRICT = eqsel,
+  JOIN = eqjoinsel,
+  HASHES,
+  MERGES,
+  SORT1= <);
+
+EOF;
+		break;
+
+		case 'firebird':
+			return <<<EOF
+
+# Emulation of STRLEN, might need to be checked out for FB 2.0
+DECLARE EXTERNAL FUNCTION STRLEN CSTRING(32767)
+RETURNS INTEGER BY VALUE
+ENTRY_POINT 'IB_UDF_strlen' MODULE_NAME 'ib_udf';;
+
+# Emulation of LOWER, might need to be checked out for FB 2.0
+DECLARE EXTERNAL FUNCTION LOWER CSTRING(80)
+RETURNS CSTRING(80) FREE_IT 
+ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf';;
+
+# Only used for insertion of binary strings as defaults
+DECLARE EXTERNAL FUNCTION ASCII_CHAR INTEGER
+RETURNS CSTRING(1) FREE_IT
+ENTRY_POINT 'IB_UDF_ascii_char' MODULE_NAME 'ib_udf';;
+
+EOF;
+		break;
+	}
+
+	return '';
+}
+
+?>
+\ No newline at end of file
diff --git a/phpBB/develop/generate_utf_tables.php b/phpBB/develop/generate_utf_tables.php
new file mode 100644
index 0000000000..1d7fbc1d67
--- /dev/null
+++ b/phpBB/develop/generate_utf_tables.php
@@ -0,0 +1,559 @@
+<?php
+/** 
+*
+* @package phpBB3
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+if (php_sapi_name() != 'cli')
+{
+	die("This program must be run from the command line.\n");
+}
+
+set_time_limit(0);
+
+define('IN_PHPBB', true);
+$phpbb_root_path = '../';
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+
+echo "Checking for required files\n";
+download('http://www.unicode.org/Public/UNIDATA/CompositionExclusions.txt');
+download('http://www.unicode.org/Public/UNIDATA/DerivedNormalizationProps.txt');
+download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt');
+echo "\n";
+
+require_once($phpbb_root_path . 'includes/utf/utf_normalizer.' . $phpEx);
+$file_contents = array();
+
+/**
+* Generate some Hangul/Jamo stuff
+*/
+echo "\nGenerating Hangul and Jamo tables\n";
+for ($i = 0; $i < UNICODE_HANGUL_LCOUNT; ++$i)
+{
+	$utf_char = cp_to_utf(UNICODE_HANGUL_LBASE + $i);
+	$file_contents['utf_normalizer_common']['utf_jamo_index'][$utf_char] = $i * UNICODE_HANGUL_VCOUNT * UNICODE_HANGUL_TCOUNT + UNICODE_HANGUL_SBASE;
+	$file_contents['utf_normalizer_common']['utf_jamo_type'][$utf_char] = UNICODE_JAMO_L;
+}
+
+for ($i = 0; $i < UNICODE_HANGUL_VCOUNT; ++$i)
+{
+	$utf_char = cp_to_utf(UNICODE_HANGUL_VBASE + $i);
+	$file_contents['utf_normalizer_common']['utf_jamo_index'][$utf_char] = $i * UNICODE_HANGUL_TCOUNT;
+	$file_contents['utf_normalizer_common']['utf_jamo_type'][$utf_char] = UNICODE_JAMO_V;
+}
+
+for ($i = 0; $i < UNICODE_HANGUL_TCOUNT; ++$i)
+{
+	$utf_char = cp_to_utf(UNICODE_HANGUL_TBASE + $i);
+	$file_contents['utf_normalizer_common']['utf_jamo_index'][$utf_char] = $i;
+	$file_contents['utf_normalizer_common']['utf_jamo_type'][$utf_char] = UNICODE_JAMO_T;
+}
+
+/**
+* Load the CompositionExclusions table
+*/
+echo "Loading CompositionExclusion\n";
+$fp = fopen('CompositionExclusions.txt', 'rt');
+
+$exclude = array();
+while (!feof($fp))
+{
+	$line = fgets($fp, 1024);
+
+	if (!strpos(' 0123456789ABCDEFabcdef', $line[0]))
+	{
+		continue;
+	}
+
+	$cp = strtok($line, ' ');
+
+	if ($pos = strpos($cp, '..'))
+	{
+		$start = hexdec(substr($cp, 0, $pos));
+		$end = hexdec(substr($cp, $pos + 2));
+
+		for ($i = $start; $i < $end; ++$i)
+		{
+			$exclude[$i] = 1;
+		}
+	}
+	else
+	{
+		$exclude[hexdec($cp)] = 1;
+	}
+}
+fclose($fp);
+
+/**
+* Load QuickCheck tables
+*/
+echo "Generating QuickCheck tables\n";
+$fp = fopen('DerivedNormalizationProps.txt', 'rt');
+
+while (!feof($fp))
+{
+	$line = fgets($fp, 1024);
+
+	if (!strpos(' 0123456789ABCDEFabcdef', $line[0]))
+	{
+		continue;
+	}
+
+	$p = array_map('trim', explode(';', strtok($line, '#')));
+
+	/**
+	* Capture only NFC_QC, NFKC_QC
+	*/
+	if (!preg_match('#^NFK?C_QC$#', $p[1]))
+	{
+		continue;
+	}
+
+	if ($pos = strpos($p[0], '..'))
+	{
+		$start = hexdec(substr($p[0], 0, $pos));
+		$end = hexdec(substr($p[0], $pos + 2));
+	}
+	else
+	{
+		$start = $end = hexdec($p[0]);
+	}
+
+	if ($start >= UTF8_HANGUL_FIRST && $end <= UTF8_HANGUL_LAST)
+	{
+		/**
+		* We do not store Hangul syllables in the array
+		*/
+		continue;
+	}
+
+	if ($p[2] == 'M')
+	{
+		$val = UNICODE_QC_MAYBE;
+	}
+	else
+	{
+		$val = UNICODE_QC_NO;
+	}
+
+	if ($p[1] == 'NFKC_QC')
+	{
+		$file = 'utf_nfkc_qc';
+	}
+	else
+	{
+		$file = 'utf_nfc_qc';
+	}
+
+	for ($i = $start; $i <= $end; ++$i)
+	{
+		/**
+		* The vars have the same name as the file: $utf_nfc_qc is in utf_nfc_qc.php
+		*/
+		$file_contents[$file][$file][cp_to_utf($i)] = $val;
+	}
+}
+fclose($fp);
+
+/**
+* Do mappings
+*/
+echo "Loading Unicode decomposition mappings\n";
+$fp = fopen($phpbb_root_path . 'develop/UnicodeData.txt', 'rt');
+
+$map = array();
+while (!feof($fp))
+{
+	$p = explode(';', fgets($fp, 1024));
+	$cp = hexdec($p[0]);
+
+	if (!empty($p[3]))
+	{
+		/**
+		* Store combining class > 0
+		*/
+		$file_contents['utf_normalizer_common']['utf_combining_class'][cp_to_utf($cp)] = (int) $p[3];
+	}
+
+	if (!isset($p[5]) || !preg_match_all('#[0-9A-F]+#', strip_tags($p[5]), $m))
+	{
+		continue;
+	}
+
+	if (strpos($p[5], '>'))
+	{
+		$map['NFKD'][$cp] = implode(' ', array_map('hexdec', $m[0]));
+	}
+	else
+	{
+		$map['NFD'][$cp] = $map['NFKD'][$cp] = implode(' ', array_map('hexdec', $m[0]));
+	}
+}
+fclose($fp);
+
+/**
+* Build the canonical composition table
+*/
+echo "Generating the Canonical Composition table\n";
+foreach ($map['NFD'] as $cp => $decomp_seq)
+{
+	if (!strpos($decomp_seq, ' ') || isset($exclude[$cp]))
+	{
+		/**
+		* Singletons are excluded from canonical composition
+		*/
+		continue;
+	}
+
+	$utf_seq = implode('', array_map('cp_to_utf', explode(' ', $decomp_seq)));
+
+	if (!isset($file_contents['utf_canonical_comp']['utf_canonical_comp'][$utf_seq]))
+	{
+		$file_contents['utf_canonical_comp']['utf_canonical_comp'][$utf_seq] = cp_to_utf($cp);
+	}
+}
+
+/**
+* Decompose the NF[K]D mappings recursively and prepare the file contents
+*/
+echo "Generating the Canonical and Compatibility Decomposition tables\n\n";
+foreach ($map as $type => $decomp_map)
+{
+	foreach ($decomp_map as $cp => $decomp_seq)
+	{
+		$decomp_map[$cp] = decompose($decomp_map, $decomp_seq);
+	}
+	unset($decomp_seq);
+
+	if ($type == 'NFKD')
+	{
+		$file = 'utf_compatibility_decomp';
+		$var = 'utf_compatibility_decomp';
+	}
+	else
+	{
+		$file = 'utf_canonical_decomp';
+		$var = 'utf_canonical_decomp';
+	}
+
+	/**
+	* Generate the corresponding file
+	*/
+	foreach ($decomp_map as $cp => $decomp_seq)
+	{
+		$file_contents[$file][$var][cp_to_utf($cp)] = implode('', array_map('cp_to_utf', explode(' ', $decomp_seq)));
+	}
+}
+
+/**
+* Generate and/or alter the files
+*/
+foreach ($file_contents as $file => $contents)
+{
+	/**
+	* Generate a new file
+	*/
+	echo "Writing to $file.$phpEx\n";
+
+	if (!$fp = fopen($phpbb_root_path . 'includes/utf/data/' . $file . '.' . $phpEx, 'wb'))
+	{
+		trigger_error('Cannot open ' . $file . ' for write');
+	}
+
+	fwrite($fp, '<?php');
+	foreach ($contents as $var => $val)
+	{
+		fwrite($fp, "\n\$GLOBALS[" . my_var_export($var) . ']=' . my_var_export($val) . ";");
+	}
+	fclose($fp);
+}
+
+echo "\n*** UTF-8 normalization tables done\n\n";
+
+/**
+* Now we'll generate the files needed by the search indexer
+*/
+echo "Generating search indexer tables\n";
+
+$fp = fopen($phpbb_root_path . 'develop/UnicodeData.txt', 'rt');
+
+$map = array();
+while ($line = fgets($fp, 1024))
+{
+	/**
+	* The current line is split, $m[0] hold the codepoint in hexadecimal and
+	* all other fields numbered as in http://www.unicode.org/Public/UNIDATA/UCD.html#UnicodeData.txt
+	*/
+	$m = explode(';', $line);
+
+	/**
+	* @var	integer	$cp			Current char codepoint
+	* @var	string	$utf_char	UTF-8 representation of current char
+	*/
+	$cp = hexdec($m[0]);
+	$utf_char = cp_to_utf($cp);
+
+	/**
+	* $m[2] holds the "General Category" of the character
+	* @link http://www.unicode.org/Public/UNIDATA/UCD.html#General_Category_Values
+	*/
+	switch ($m[2][0])
+	{
+		case 'L':
+			/**
+			* We allow all letters and map them to their lowercased counterpart on the fly
+			*/
+			$map_to_hex = (isset($m[13][0])) ? $m[13] : $m[0];
+
+			if (preg_match('#^LATIN.*(?:LETTER|LIGATURE) ([A-Z]{2}(?![A-Z]))$#', $m[1], $capture))
+			{
+				/**
+				* Special hack for some latin ligatures. Using the name of a character
+				* is bad practice, but for now it works well enough.
+				*
+				* @todo Note that ligatures with combining marks such as U+01E2 are
+				* not supported at this time
+				*/
+				$map[$cp] = strtolower($capture[1]);
+			}
+			elseif (isset($m[13][0]))
+			{
+				/**
+				* If the letter has a lowercased form, use it
+				*/
+				$map[$cp] = hex_to_utf($m[13]);
+			}
+			else
+			{
+				/**
+				* In all other cases, map the letter to itself
+				*/
+				$map[$cp] = $utf_char;
+			}
+			break;
+
+		case 'M':
+			/**
+			* We allow all marks, they are mapped to themselves
+			*/
+			$map[$cp] = $utf_char;
+			break;
+
+		case 'N':
+			/**
+			* We allow all numbers, but we map them to their numeric value whenever
+			* possible. The numeric value (field #8) is in ASCII already
+			*
+			* @todo Note that fractions such as U+00BD will be converted to something
+			* like "1/2", with a slash. However, "1/2" entered in ASCII is converted
+			* to "1 2". This will have to be fixed.
+			*/
+			$map[$cp] = (isset($m[8][0])) ? $m[8] : $utf_char;
+			break;
+
+		default:
+			/**
+			* Everything else is ignored, skip to the next line
+			*/
+			continue 2;
+	}
+}
+fclose($fp);
+
+/**
+* Add some cheating
+*/
+$cheats = array(
+	'00DF'	=>	'ss',		#	German sharp S
+	'00D6'	=>	'oe',		#	Capital O with diaeresis
+	'00F6'	=>	'oe',		#	Small O with diaeresis
+);
+
+/**
+* Add our "cheat replacements" to the map
+*/
+foreach ($cheats as $hex => $map_to)
+{
+	$map[hexdec($hex)] = $map_to;
+}
+
+/**
+* Split the map into smaller blocks
+*/
+$file_contents = array();
+foreach ($map as $cp => $map_to)
+{
+	$file_contents[$cp >> 11][cp_to_utf($cp)] = $map_to;
+}
+unset($map);
+
+foreach ($file_contents as $idx => $contents)
+{
+	echo "Writing to search_indexer_$idx.$phpEx\n";
+	$fp = fopen($phpbb_root_path . 'includes/utf/data/search_indexer_' . $idx . '.' . $phpEx, 'wb');
+	fwrite($fp, '<?php return ' . my_var_export($contents) . ';');
+	fclose($fp);
+}
+echo "\n*** Search indexer tables done\n\n";
+
+
+die("\nAll done!\n");
+
+
+////////////////////////////////////////////////////////////////////////////////
+//                             Internal functions                             //
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+* Decompose a sequence recusively
+*
+* @param	array	$decomp_map	Decomposition mapping, passed by reference
+* @param	string	$decomp_seq	Decomposition sequence as decimal codepoints separated with a space
+* @return	string				Decomposition sequence, fully decomposed
+*/
+function decompose(&$decomp_map, $decomp_seq)
+{
+	$ret = array();
+	foreach (explode(' ', $decomp_seq) as $cp)
+	{
+		if (isset($decomp_map[$cp]))
+		{
+			$ret[] = decompose($decomp_map, $decomp_map[$cp]);
+		}
+		else
+		{
+			$ret[] = $cp;
+		}
+	}
+
+	return implode(' ', $ret);
+}
+
+
+/**
+* Return a parsable string representation of a variable
+*
+* This is function is limited to array/strings/integers
+*
+* @param	mixed	$var		Variable
+* @return	string				PHP code representing the variable
+*/
+function my_var_export($var)
+{
+	if (is_array($var))
+	{
+		$lines = array();
+
+		foreach ($var as $k => $v)
+		{
+			$lines[] = my_var_export($k) . '=>' . my_var_export($v);
+		}
+
+		return 'array(' . implode(',', $lines) . ')';
+	}
+	elseif (is_string($var))
+	{
+		return "'" . str_replace(array('\\', "'"), array('\\\\', "\\'"), $var) . "'";
+	}
+	else
+	{
+		return $var;
+	}
+}
+
+/**
+* Download a file to the develop/ dir
+*
+* @param	string	$url		URL of the file to download
+* @return	void
+*/
+function download($url)
+{
+	global $phpbb_root_path;
+
+	if (file_exists($phpbb_root_path . 'develop/' . basename($url)))
+	{
+		return;
+	}
+
+	echo 'Downloading from ', $url, ' ';
+
+	if (!$fpr = fopen($url, 'rb'))
+	{
+		die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai");
+	}
+
+	if (!$fpw = fopen($phpbb_root_path . 'develop/' . basename($url), 'wb'))
+	{
+		die("Can't open develop/" . basename($url) . " for output... please check your permissions or something");
+	}
+
+	$i = 0;
+	$chunk = 32768;
+	$done = '';
+
+	while (!feof($fpr))
+	{
+		$i += fwrite($fpw, fread($fpr, $chunk));
+		echo str_repeat("\x08", strlen($done));
+
+		$done = ($i >> 10) . ' KiB';
+		echo $done;
+	}
+	fclose($fpr);
+	fclose($fpw);
+
+	echo "\n";
+}
+
+/**
+* Convert a codepoint in hexadecimal to a UTF-8 char
+*
+* @param	string	$hex		Codepoint, in hexadecimal
+* @return	string				UTF-8 char
+*/
+function hex_to_utf($hex)
+{
+	return cp_to_utf(hexdec($hex));
+}
+
+/**
+* Return a UTF string formed from a sequence of codepoints in hexadecimal
+*
+* @param	string	$seq		Sequence of codepoints, separated with a space
+* @return	string				UTF-8 string
+*/
+function hexseq_to_utf($seq)
+{
+	return implode('', array_map('hex_to_utf', explode(' ', $seq)));
+}
+
+/**
+* Convert a codepoint to a UTF-8 char
+*
+* @param	integer	$cp			Unicode codepoint
+* @return	string				UTF-8 string
+*/
+function cp_to_utf($cp)
+{
+	if ($cp > 0xFFFF)
+	{
+		return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+	}
+	elseif ($cp > 0x7FF)
+	{
+		return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+	}
+	elseif ($cp > 0x7F)
+	{
+		return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
+	}
+	else
+	{
+		return chr($cp);
+	}
+}
+\ No newline at end of file
diff --git a/phpBB/develop/utf_normalizer_test.php b/phpBB/develop/utf_normalizer_test.php
new file mode 100644
index 0000000000..63c73c05e4
--- /dev/null
+++ b/phpBB/develop/utf_normalizer_test.php
@@ -0,0 +1,380 @@
+<?php
+/** 
+*
+* @package phpBB3
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+if (php_sapi_name() != 'cli')
+{
+	die("This program must be run from the command line.\n");
+}
+
+set_time_limit(0);
+error_reporting(E_ALL);
+
+define('IN_PHPBB', true);
+$phpbb_root_path = '../';
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+
+
+/**
+* Let's download some files we need
+*/
+download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt');
+download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt');
+
+/**
+* Those are the tests we run
+*/
+$test_suite = array(
+	/**
+	* NFC
+	*   c2 ==  NFC(c1) ==  NFC(c2) ==  NFC(c3)
+	*   c4 ==  NFC(c4) ==  NFC(c5)
+	*/
+	'NFC'	=>	array(
+		'c2'	=>	array('c1', 'c2', 'c3'),
+		'c4'	=>	array('c4', 'c5')
+	),
+
+	/**
+	* NFD
+	*   c3 ==  NFD(c1) ==  NFD(c2) ==  NFD(c3)
+	*   c5 ==  NFD(c4) ==  NFD(c5)
+	*/
+	'NFD'	=>	array(
+		'c3'	=>	array('c1', 'c2', 'c3'),
+		'c5'	=>	array('c4', 'c5')
+	),
+
+	/**
+	* NFKC
+	*   c4 == NFKC(c1) == NFKC(c2) == NFKC(c3) == NFKC(c4) == NFKC(c5)
+	*/
+	'NFKC'	=>	array(
+		'c4'	=>	array('c1', 'c2', 'c3', 'c4', 'c5')
+	),
+
+	/**
+	* NFKD
+	*   c5 == NFKD(c1) == NFKD(c2) == NFKD(c3) == NFKD(c4) == NFKD(c5)
+	*/
+	'NFKD'	=>	array(
+		'c5'	=>	array('c1', 'c2', 'c3', 'c4', 'c5')
+	)
+);
+
+require_once($phpbb_root_path . 'includes/utf/utf_normalizer.' . $phpEx);
+
+$i = $n = 0;
+$failed = FALSE;
+$tested_chars = array();
+
+$fp = fopen($phpbb_root_path . 'develop/NormalizationTest.txt', 'rb');
+while (!feof($fp))
+{
+	$line = fgets($fp);
+	++$n;
+
+	if ($line[0] == '@')
+	{
+		if ($i)
+		{
+			echo "done\n";
+		}
+
+		$i = 0;
+		echo "\n", substr($line, 1), "\n\n";
+		continue;
+	}
+
+	if (!strpos(' 0123456789ABCDEF', $line[0]))
+	{
+		continue;
+	}
+
+	if (++$i % 100 == 0)
+	{
+		echo $i, ' ';
+	}
+
+	list($c1, $c2, $c3, $c4, $c5) = explode(';', $line);
+
+	if (!strpos($c1, ' '))
+	{
+		/**
+		* We are currently testing a single character, we add it to the list of
+		* characters we have processed so that we can exclude it when testing
+		* for invariants
+		*/
+		$tested_chars[$c1] = 1;
+	}
+
+	foreach ($test_suite as $form => $serie)
+	{
+		foreach ($serie as $expected => $tests)
+		{
+			$hex_expected = ${$expected};
+			$utf_expected = hexseq_to_utf($hex_expected);
+
+			foreach ($tests as $test)
+			{
+				$utf_result = call_user_func(array('utf_normalizer', $form), $utf_expected);
+
+				if (strcmp($utf_expected, $utf_result))
+				{
+					$failed = TRUE;
+					$hex_result = utf_to_hexseq($utf_result);
+
+					echo "\nFAILED $expected == $form($test) ($hex_expected != $hex_result)";
+				}
+			}
+		}
+
+		if ($failed)
+		{
+			die("\n\nFailed at line $n\n");
+		}
+	}
+}
+fclose($fp);
+
+/**
+* Test for invariants
+*/
+echo "\n\nTesting for invariants...\n\n";
+
+$fp = fopen($phpbb_root_path . 'develop/UnicodeData.txt', 'rt');
+
+$n = 0;
+while (!feof($fp))
+{
+	if (++$n % 100 == 0)
+	{
+		echo $n, ' ';
+	}
+
+	$line = fgets($fp, 1024);
+
+	if (!$pos = strpos($line, ';'))
+	{
+		continue;
+	}
+
+	$hex_tested = $hex_expected = substr($line, 0, $pos);
+
+	if (isset($tested_chars[$hex_tested]))
+	{
+		continue;
+	}
+
+	$utf_expected = hex_to_utf($hex_expected);
+
+	if ($utf_expected >= UTF8_SURROGATE_FIRST
+	 && $utf_expected <= UTF8_SURROGATE_LAST)
+	{
+		/**
+		* Surrogates are illegal on their own, we expect the normalizer
+		* to return a replacement char
+		*/
+		$utf_expected = UTF8_REPLACEMENT;
+		$hex_expected = utf_to_hexseq($utf_expected);
+	}
+
+	foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form)
+	{
+		$utf_result = utf_normalizer::$form($utf_expected);
+		$hex_result = utf_to_hexseq($utf_result);
+//		echo "$form($utf_expected) == $utf_result\n";
+
+		if (strcmp($utf_expected, $utf_result))
+		{
+			$failed = 1;
+
+			echo "\nFAILED $hex_expected == $form($hex_tested) ($hex_expected != $hex_result)";
+		}
+	}
+
+	if ($failed)
+	{
+		die("\n\nFailed at line $n\n");
+	}
+}
+fclose($fp);
+
+die("\n\nALL TESTS PASSED SUCCESSFULLY\n");
+
+/**
+* Download a file to the develop/ dir
+*
+* @param	string	$url		URL of the file to download
+* @return	void
+*/
+function download($url)
+{
+	global $phpbb_root_path;
+
+	if (file_exists($phpbb_root_path . 'develop/' . basename($url)))
+	{
+		return;
+	}
+
+	echo 'Downloading from ', $url, ' ';
+
+	if (!$fpr = fopen($url, 'rb'))
+	{
+		die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai");
+	}
+
+	if (!$fpw = fopen($phpbb_root_path . 'develop/' . basename($url), 'wb'))
+	{
+		die("Can't open develop/" . basename($url) . " for output... please check your permissions or something");
+	}
+
+	$i = 0;
+	$chunk = 32768;
+	$done = '';
+
+	while (!feof($fpr))
+	{
+		$i += fwrite($fpw, fread($fpr, $chunk));
+		echo str_repeat("\x08", strlen($done));
+
+		$done = ($i >> 10) . ' KiB';
+		echo $done;
+	}
+	fclose($fpr);
+	fclose($fpw);
+
+	echo "\n";
+}
+
+/**
+* Convert a UTF string to a sequence of codepoints in hexadecimal
+*
+* @param	string	$utf	UTF string
+* @return	integer			Unicode codepoints in hex
+*/
+function utf_to_hexseq($str)
+{
+	$pos = 0;
+	$len = strlen($str);
+	$ret = array();
+
+	while ($pos < $len)
+	{
+		$c = $str[$pos];
+		switch ($c & "\xF0")
+		{
+			case "\xC0":
+			case "\xD0":
+				$utf_char = substr($str, $pos, 2);
+				$pos += 2;
+				break;
+
+			case "\xE0":
+				$utf_char = substr($str, $pos, 3);
+				$pos += 3;
+				break;
+
+			case "\xF0":
+				$utf_char = substr($str, $pos, 4);
+				$pos += 4;
+				break;
+
+			default:
+				$utf_char = $c;
+				++$pos;
+		}
+
+		$hex = dechex(utf_to_cp($utf_char));
+
+		if (!isset($hex[3]))
+		{
+			$hex = substr('000' . $hex, -4);
+		}
+
+		$ret[] = $hex;
+	}
+
+	return strtr(implode(' ', $ret), 'abcdef', 'ABCDEF');
+}
+
+/**
+* Convert a UTF-8 char to its codepoint
+*
+* @param	string	$utf_char	UTF-8 char
+* @return	integer				Unicode codepoint
+*/
+function utf_to_cp($utf_char)
+{
+	switch (strlen($utf_char))
+	{
+		case 1:
+			return ord($utf_char);
+
+		case 2:
+			return ((ord($utf_char[0]) & 0x1F) << 6) | (ord($utf_char[1]) & 0x3F);
+
+		case 3:
+			return ((ord($utf_char[0]) & 0x0F) << 12) | ((ord($utf_char[1]) & 0x3F) << 6) | (ord($utf_char[2]) & 0x3F);
+
+		case 4:
+			return ((ord($utf_char[0]) & 0x07) << 18) | ((ord($utf_char[1]) & 0x3F) << 12) | ((ord($utf_char[2]) & 0x3F) << 6) | (ord($utf_char[3]) & 0x3F);
+
+		default:
+			die('UTF-8 chars can only be 1-4 bytes long');
+	}
+}
+
+/**
+* Return a UTF string formed from a sequence of codepoints in hexadecimal
+*
+* @param	string	$seq		Sequence of codepoints, separated with a space
+* @return	string				UTF-8 string
+*/
+function hexseq_to_utf($seq)
+{
+	return implode('', array_map('hex_to_utf', explode(' ', $seq)));
+}
+
+/**
+* Convert a codepoint in hexadecimal to a UTF-8 char
+*
+* @param	string	$hex		Codepoint, in hexadecimal
+* @return	string				UTF-8 char
+*/
+function hex_to_utf($hex)
+{
+	return cp_to_utf(hexdec($hex));
+}
+
+/**
+* Convert a codepoint to a UTF-8 char
+*
+* @param	integer	$cp			Unicode codepoint
+* @return	string				UTF-8 string
+*/
+function cp_to_utf($cp)
+{
+	if ($cp > 0xFFFF)
+	{
+		return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+	}
+	elseif ($cp > 0x7FF)
+	{
+		return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+	}
+	elseif ($cp > 0x7F)
+	{
+		return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
+	}
+	else
+	{
+		return chr($cp);
+	}
+}
+\ No newline at end of file